Refactor version redux

michaeljoseph · Oct 16, 2013 · 9606c27 · 9606c27
1 parent b0c5204
commit 9606c27
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/changes/cli.py b/changes/cli.py
@@ -60,17 +60,6 @@
 arguments = None
 
 
-def strip_long_arguments(argument_names):
-    long_arguments = extract(arguments, argument_names)
-    return dict([
-        (key[2:], value) for key, value in long_arguments.items()
-    ])
-
-
-def extract_version_arguments():
-    return strip_long_arguments(['--major', '--minor', '--patch'])
-
-
 def common_arguments():
     """
     Return common arguments
@@ -84,8 +73,6 @@ def common_arguments():
     )
 
 
-
-
 def write_new_changelog(app_name, filename, content_lines, dry_run=True):
     heading_and_newline = (
         '# [Changelog](%s/releases)\n' %
@@ -349,8 +336,8 @@ def initialise():
 def main():
     initialise()
 
-    commands = ['release', 'changelog', 'test', 'version', 'tag', 'upload',
-                'install', 'pypi']
+    commands = ['release', 'changelog', 'test', 'bump_version', 'tag',
+                'upload', 'install', 'pypi']
     suppress_version_prompt_for = ['test', 'upload']
 
     if arguments['--new-version']:
@@ -368,6 +355,6 @@ def main():
                 arguments['new_version'] = version.get_new_version(
                     app_name,
                     version.current_version(app_name),
-                    **extract_version_arguments()
+                    **version.extract_version_arguments()
                 )
             globals()[command]()
diff --git a/changes/version.py b/changes/version.py
@@ -18,6 +18,7 @@ def strip_long_arguments(arguments, long_keys):
 def extract_version_arguments():
     return strip_long_arguments(['--major', '--minor', '--patch'])
 
+
 def increment(version, major=False, minor=False, patch=True):
     """
     Increment a semantic version

diff --git a/tests/test_version.py b/tests/test_version.py
@@ -3,6 +3,7 @@
 from changes import version
 from . import BaseTestCase
 
+
 class VersionTestCase(TestCase):
 
     def test_increment(self):
@@ -38,6 +39,7 @@ def test_strip_long_arguments(self):
             version.strip_long_arguments(arguments, long_keys)
         )
 
+
 class CurrentVersionTestCase(BaseTestCase):
 
     def test_current_version(self):