Rename flag name to --future-format

Renames flag to --future-format and updates help text test.
Adds future format version.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/scancode/cli.py

@@ -94,7 +94,8 @@ def print_version(ctx, param, value):
     if not value or ctx.resilient_parsing:
         return
     click.echo('ScanCode version ' + scancode_config.__version__)
-    click.echo('ScanCode Data-format version ' + scancode_config.__output_format_version__)
+    click.echo('Output Format version ' + scancode_config.__output_format_version__)
+    click.echo('Future Output Format version ' + scancode_config.__future_output_format_version__)
     ctx.exit()
 
 
@@ -250,11 +251,11 @@ def validate_depth(ctx, param, value):
         'the starting directory. Use 0 for no scan depth limit.',
     help_group=cliutils.CORE_GROUP, sort_order=301, cls=PluggableCommandLineOption)
 
-@click.option('--next-data-format',
+@click.option('--future-format',
     is_flag=True,
     help='Output the next experimental data format, for JSON and YAML output.'
          'See CHANGELOG for more details on the changes in this experimental data format.',
-    help_group=cliutils.OUTPUT_GROUP, sort_order=28, cls=PluggableCommandLineOption)
+    help_group=cliutils.OUTPUT_CONTROL_GROUP, sort_order=28, cls=PluggableCommandLineOption)
 
 
 @click.help_option('-h', '--help',
@@ -353,7 +354,7 @@ def scancode(
     verbose,
     max_depth,
     from_json,
-    next_data_format,
+    future_format,
     timing,
     max_in_memory,
     test_mode,
@@ -457,7 +458,7 @@ def scancode(
             quiet=quiet,
             verbose=verbose,
             max_depth=max_depth,
-            next_data_format=next_data_format,
+            future_format=future_format,
             timing=timing,
             max_in_memory=max_in_memory,
             test_mode=test_mode,
@@ -494,7 +495,7 @@ def scancode(
 def run_scan(
     input,  # NOQA
     from_json=False,
-    next_data_format=False,
+    future_format=False,
     strip_root=False,
     full_root=False,
     max_in_memory=10000,
@@ -601,7 +602,7 @@ def echo_func(*_args, **_kwargs):
         quiet=quiet,
         verbose=verbose,
         from_json=from_json,
-        next_data_format=next_data_format,
+        future_format=future_format,
         timing=timing,
         max_in_memory=max_in_memory,
         test_mode=test_mode,

src/scancode_config.py

@@ -79,6 +79,8 @@ def _create_dir(location):
 # See https://github.com/nexB/scancode-toolkit/issues/2653 for more information
 # on the data format version
 __output_format_version__ = '1.1'
+__future_output_format_version__ = '1.1'
+
 
 try:
     from pkg_resources import get_distribution, DistributionNotFound

tests/scancode/data/help/help.txt

@@ -70,10 +70,13 @@ Options:
                                     is not treated as findings).
 
   output control:
-    --full-root   Report full, absolute paths.
-    --strip-root  Strip the root directory segment of all paths. The default is to
-                  always include the last directory segment of the scanned path
-                  such that all paths have a common root directory.
+   --future-format  Output the next experimental data format, for JSON and YAML
+                    output.See CHANGELOG for more details on the changes in this
+                    experimental data format.
+    --full-root     Report full, absolute paths.
+    --strip-root    Strip the root directory segment of all paths. The default is to
+                    always include the last directory segment of the scanned path
+                    such that all paths have a common root directory.
 
   pre-scan:
     --ignore <pattern>         Ignore files matching <pattern>.