Develop

NEWS.txt

@@ -1,9 +1,19 @@
 News
 ====
 
+0.1.1
+
+*Release date: March 28, 2012*
+
+* Fix issue #1 which makes the git-sweep help menus more useful
+* Fix a minor grammar issue in the help
+* Fix issue #2 which dropped extra options when telling you to use
+  cleanup
+* Added a --force option to skip confirmation prompt
+
 0.1.0
 -----
 
-*Release date: 0.1.0*
+*Release date: n/a*
 
 * Initial release

bootstrap.py

@@ -54,9 +54,10 @@
 except ImportError:
     ez = {}
     if USE_DISTRIBUTE:
-        exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
-                         ).read() in ez
-        ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
+        ez = {}
+        #exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
+        #                 ).read() in ez
+        #ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
     else:
         exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
                              ).read() in ez

setup.py

@@ -6,7 +6,7 @@
 README = open(os.path.join(here, 'README.rst')).read()
 NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 
-version = '0.1.0'
+version = '0.1.1'
 
 install_requires = [
     'GitPython>=0.3.2RC1']
@@ -20,7 +20,17 @@
     description="Clean up branches from your Git remotes",
     long_description=README + '\n\n' + NEWS,
     classifiers=[
-      # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'License :: OSI Approved :: MIT License',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'Operating System :: POSIX',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Software Development :: Quality Assurance',
+        'Topic :: Software Development :: Version Control',
+        'Topic :: Text Processing'
     ],
     keywords='git maintenance branches',
     author='Arc90, Inc.',

src/gitsweep/cli.py

@@ -17,7 +17,7 @@ class CommandLine(object):
     """
     parser = ArgumentParser(
         description='Clean up your Git remote branches.',
-        usage='git-sweep <action> [-h]',
+        usage='git-sweep <action> [-h] --origin [remote name] --master [branch name]',
         )
 
     _sub_parsers = parser.add_subparsers(title='action',

src/gitsweep/tests/test_cli.py

@@ -16,7 +16,7 @@ def test_help(self):
         (retcode, stdout, stderr) = self.gscommand('git-sweep -h')
 
         self.assertResults('''
-            usage: git-sweep <action> [-h]
+            usage: git-sweep <action> [-h] --origin [remote name]  --master [branch name]
 
             Clean up your Git remote branches.