Merge lp:~dholbach/click-reviewers-tools/1364449 into lp:click-reviewers-tools

[Daniel Holbach]

[Jamie Strandboge (jdstrand)]

Looks good, thanks!

review: Approve

=== modified file 'bin/click-review'
--- bin/click-review	2014-09-01 14:52:33 +0000
+++ bin/click-review	2014-09-02 16:33:39 +0000
@@ -88,15 +88,17 @@
         #
         section = module.replace('cr_', '')
         review = modules.init_main_class(module, self.click_fn)
-        review.do_checks()
-        self.results[section] = review.click_report
-        return section
+        if review:
+            review.do_checks()
+            self.results[section] = review.click_report
+        return None
 
     def run_all_checks(self):
         if self.args.sdk:
             for module in self.cr_modules:
                 section = self._run_module_checks(module)
-                self._report_module(section)
+                if section:
+                    self._report_module(section)
         else:
             for module in self.cr_modules:
                 self._run_module_checks(module)
 
=== modified file 'clickreviews/modules.py'
--- clickreviews/modules.py	2014-08-27 17:16:31 +0000
+++ clickreviews/modules.py	2014-09-02 16:33:39 +0000
@@ -48,11 +48,13 @@
                                            module_name))
 
     classes = inspect.getmembers(module, inspect.isclass)
-    find_main_class = lambda a: a[0].startswith('Click') and \
+    find_cr_class = lambda a: a[0].startswith('Click') and \
         not a[0].endswith('Exception') and \
         a[1].__module__ == module_name
-    main_class = list(filter(find_main_class, classes))
-    init_object = getattr(module, main_class[0][0])
+    cr_class = list(filter(find_cr_class, classes))
+    if not cr_class:
+        return None
+    init_object = getattr(module, cr_class[0][0])
     return init_object
 
 
@@ -64,4 +66,6 @@
     '''
 
     init_object = find_main_class(module_name)
+    if not init_object:
+        return None
     return init_object(click_file)
 
=== modified file 'clickreviews/tests/test_modules.py'
--- clickreviews/tests/test_modules.py	2014-08-27 17:18:45 +0000
+++ clickreviews/tests/test_modules.py	2014-09-02 16:33:39 +0000
@@ -26,4 +26,6 @@
             review = modules.find_main_class(module_name)
             if review:
                 count += 1
-        self.assertEqual(count, len(self.cr_modules))
+        self.assertEqual(count, len(self.cr_modules),
+                         'Not all files in clickreviews/cr_*.py contain '
+                         'classes named Click*Review.')
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-09-01 14:37:20 +0000
+++ debian/changelog	2014-09-02 16:33:39 +0000
@@ -4,8 +4,10 @@
     into its own module, add tests for it.
   * Refactor bin/click-review to make it easier to extend.
   * Add --sdk option, so the SDK can start using it. (LP: #1363857)
+  * Safeguard against broken clickreviews check modules, or modules that are
+    still in development. (LP: #1364449)
 
- -- Daniel Holbach <[e-mail]>  Wed, 27 Aug 2014 16:22:03 +0200
+ -- Daniel Holbach <[e-mail]>  Tue, 02 Sep 2014 18:31:50 +0200
 
 click-reviewers-tools (0.9) utopic; urgency=medium