Source

webstring / fabfile.py

Diff from to

fabfile.py

+# -*- coding: utf-8 -*-
 '''webstring fabfile'''
 
 from fabric.api import prompt, local, settings, env, lcd
 
+regup = '../setup.py register sdist --format=bztar,gztar,zip upload'
+nodist = 'rm -rf ../dist'
+sphinxup = '../setup.py upload_sphinx'
+
+
+def _promptup():
+    prompt('Enter tag: ', 'tag')
+    with settings(warn_only=True):
+        local('hg tag "%(tag)s"' % env)
+        local('hg push ssh://hg@bitbucket.org/lcrees/webstring')
+        local('hg push github')
+
 
 def _test(val):
-    truth = val in ['py26', 'py27', 'py32']
+    truth = val in ['py26', 'py27', 'py31', 'py32', 'pypy']
     if truth is False:
         raise KeyError(val)
     return val
 
 
-def tox():
-    '''test webstring'''
-    local('tox')
-
-
 def docs():
-    with lcd('./docs/'):
+    with lcd('../docs/'):
         local('make clean')
         local('make html')
         local('make linkcheck')
         local('make doctest')
 
 
+def tox():
+    '''
+    test webstring
+    '''
+    with lcd('../'):
+        local('tox')
+
+
 def update_docs():
+    '''
+    update webstring docs
+    '''
     docs()
     with settings(warn_only=True):
-        local('hg ci -m docmerge; hg push')
-    local('./setup.py upload_sphinx')
+        local('hg ci -m docmerge')
+        local('hg push ssh://hg@bitbucket.org/lcrees/webstring')
+        local('hg push github')
+    local(sphinxup)
 
 
 def tox_recreate():
-    '''recreate webstring test env'''
-    prompt(
-        'Enter testenv: [py26, py27, py31, py32]',
-        'testenv',
-        validate=_test,
-    )
-    local('tox --recreate -e %(testenv)s' % env)
+    '''
+    recreate webstring test env
+    '''
+    with lcd('../'):
+        prompt(
+            'Enter testenv: [py26, py27, py31, py32, pypy]',
+            'testenv',
+            validate=_test,
+        )
+        local('tox --recreate -e %(testenv)s' % env)
 
 
 def release():
-    '''release webstring'''
+    '''
+    release webstring
+    '''
+    docs()
     local('hg update pu')
     local('hg update next')
     local('hg merge pu; hg ci -m automerge')
     local('hg merge next; hg ci -m automerge')
     local('hg update pu')
     local('hg merge default; hg ci -m automerge')
-    prompt('Enter tag: ', 'tag')
-    with settings(warn_only=True):
-        local('hg tag "%(tag)s"' % env)
-        local('hg push ssh://hg@bitbucket.org/lcrees/webstring')
-        local('hg push git+ssh://git@github.com:kwarterthieves/webstring.git')
-    local('./setup.py register sdist --format=bztar,gztar,zip upload')
-    local('./setup.py upload_sphinx')
-    local('rm -rf dist')
+    _promptup()
+    local(regup)
+    local(sphinxup)
+    local(nodist)
+
+
+def releaser():
+    '''
+    webstring releaser
+    '''
+    docs()
+    _promptup()
+    local(regup)
+    local(sphinxup)
+    local(nodist)
 
 
 def inplace():
-    '''inplace webstring'''
-    with lcd('./docs/'):
-        local('make clean')
-        local('make html')
-        local('make linkcheck')
-        local('make doctest')
+    '''
+    in-place webstring
+    '''
+    docs()
     with settings(warn_only=True):
         local('hg push ssh://hg@bitbucket.org/lcrees/webstring')
-        local('hg push git+ssh://git@github.com:kwarterthieves/webstring.git')
-    local('./setup.py sdist --format=bztar,gztar,zip upload')
-    local('./setup.py upload_sphinx')
-    local('rm -rf dist')
+        local('hg push github')
+    local('../setup.py sdist --format=bztar,gztar,zip upload')
+    local(sphinxup)
+    local(nodist)
 
 
 def release_next():
-    '''release webstring from next branch'''
+    '''
+    release webstring from next branch
+    '''
+    docs()
     local('hg update maint')
     local('hg merge default; hg ci -m automerge')
     local('hg update default')
     local('hg merge next; hg ci -m automerge')
     local('hg update next')
     local('hg merge default; hg ci -m automerge')
-    prompt('Enter tag: ', 'tag')
-    with settings(warn_only=True):
-        local('hg tag "%(tag)s"' % env)
-        local('hg push ssh://hg@bitbucket.org/lcrees/webstring')
-        local('hg push git+ssh://git@github.com:kwarterthieves/webstring.git')
-    local('./setup.py register sdist --format=bztar,gztar,zip upload')
-    local('rm -rf dist')
+    _promptup()
+    local(regup)
+    local(sphinxup)
+    local(nodist)