Remove the 'all_in_one' option

Author: chinyeungli

about_code_tool/genabout.py

@@ -484,7 +484,7 @@ def process_dje_licenses(self, dje_license_list, dje_license_dict, output_path):
                         license_list_context.append(gen_path_context)
         return license_list_context
 
-    def pre_generation(self, gen_location, input_list, action_num, all_in_one):
+    def pre_generation(self, gen_location, input_list, action_num):
         """
         Perfom some pre-generation.
         TODO: document me
@@ -506,15 +506,6 @@ def pre_generation(self, gen_location, input_list, action_num, all_in_one):
                     file_location = join(file_location, basename(file_location))
                 file_location += '.ABOUT'
 
-            if all_in_one:
-                # This is to get the filename instead of the file path
-                # Note: The following code is the get the filename instead of 
-                # the file path because the tool is going to put ALL the 
-                # generated ABOUT file into one single directory.
-                # However, this option will be removed in the later release
-                # as putting the ALL the ABOUT files in a single directory
-                # doesn't make very much sense.
-                file_location = file_location.rpartition('/')[2]
             about_file_location = join(gen_location, file_location)
             about_file_dir = dirname(about_file_location)
             if not os.path.exists(about_file_dir):
@@ -659,11 +650,6 @@ def _exists(location):
 3 - Replace the ABOUT file with the current generation
 """
 
-ALL_IN_ONE_HELP = """\
-Generate all the ABOUT files in the [output_path] without
-any project structure
-"""
-
 COPY_FILES_HELP = """\
 Copy the '*_file' from the project to the generated location
 Project path - Project path
@@ -694,7 +680,6 @@ def _exists(location):
 def main(parser, options, args):
     verbosity = options.verbosity
     action = options.action
-    all_in_one = options.all_in_one
     copy_files_path = options.copy_files
     license_text_path = options.license_text_location
     mapping_config = options.mapping
@@ -876,8 +861,7 @@ def main(parser, options, args):
                                                 dje_license_dict)
     components_list = gen.pre_generation(output_path,
                                          input_list,
-                                         action_num,
-                                         all_in_one)
+                                         action_num)
     formatted_output = gen.format_output(components_list)
     gen.write_output(formatted_output)
 
@@ -941,8 +925,6 @@ def format_option(self, option):
                       help=VERBOSITY_HELP)
     parser.add_option('--action', type=int,
                       help=ACTION_HELP)
-    parser.add_option('--all_in_one', action='store_true',
-                      help=ALL_IN_ONE_HELP)
     parser.add_option('--copy_files', type='string',
                       help=COPY_FILES_HELP)
     parser.add_option('--license_text_location', type='string',

about_code_tool/tests/test_genabout.py

@@ -446,8 +446,7 @@ def test_pre_generation_about_is_dir_exists_action_0(self):
 
         result = gen.pre_generation(gen_location,
                                          test_fields,
-                                         action_num=0,
-                                         all_in_one=False)
+                                         action_num=0)
         self.assertEqual(expected, result)
         self.assertFalse(gen.warnings, 'No warnings should be returned.')
         self.assertFalse(gen.errors, 'No errors should be returned.')
@@ -462,8 +461,7 @@ def test_pre_generation_about_exists_action_0(self):
         expected = []
         result = gen.pre_generation(gen_location,
                                          test_fields,
-                                         action_num=0,
-                                         all_in_one=False)
+                                         action_num=0)
         self.assertEqual(expected, result)
         self.assertTrue(len(gen.warnings) == 1, 'Should return 1 warnings.')
         self.assertFalse(gen.errors, 'No errors should be returned.')
@@ -483,8 +481,7 @@ def test_pre_generation_about_exists_action_1(self):
                       'name': 'ABOUT tool'}]]
 
         result = gen.pre_generation(GEN_LOCATION, test_fields,
-                                    action_num=1,
-                                    all_in_one=False)
+                                    action_num=1)
         self.assertEqual(expected, result)
         self.assertFalse(gen.warnings, 'No warnings should be returned.')
         self.assertFalse(gen.errors, 'No errors should be returned.')
@@ -507,8 +504,7 @@ def test_pre_generation_about_exists_action_2(self):
 
         result = gen.pre_generation(GEN_LOCATION,
                                     test_input,
-                                    action_num=2,
-                                    all_in_one=False)
+                                    action_num=2)
         self.assertEqual(expected, result)
         self.assertFalse(gen.warnings, 'No warnings should be returned.')
         self.assertFalse(gen.errors, 'No errors should be returned.')
@@ -530,32 +526,12 @@ def test_pre_generation_about_exists_action_3(self):
 
         result = gen.pre_generation(GEN_LOCATION,
                                     test_fields,
-                                    action_num=3,
-                                    all_in_one=False)
+                                    action_num=3)
 
         self.assertEqual(expected, result)
         self.assertFalse(gen.warnings, 'No warnings should be returned.')
         self.assertFalse(gen.errors, 'No errors should be returned.')
 
-    def test_pre_generation_all_in_one(self):
-        gen = genabout.GenAbout()
-        test_fields = [{'about_file': 'test_generation/elasticsearch.ABOUT',
-                       'version': '0.19.8',
-                       'about_resource': 'elasticsearch-0.19.8.zip',
-                       'name': 'ElasticSearch'}]
-        expected = []
-        result = gen.pre_generation(GEN_LOCATION,
-                                    test_fields,
-                                    action_num=0,
-                                    all_in_one=True)
-
-        self.assertFalse(os.path.exists('testdata/test_files_for_genabout/test_generation'),
-                         'This directory should not be generted as the all_in_one is set to True.')
-
-        self.assertEqual(expected, result)
-        self.assertTrue(len(gen.warnings) == 1, 'Should return 1 warning.')
-        self.assertFalse(gen.errors, 'No errors should be returned.')
-
     def test_format_output(self):
         gen = genabout.GenAbout()
         test_fields = [