Move more stuff into lib.py from YarnHelper

1 files changed, 9 insertions, 9 deletions

diff --git a/000.yarn b/000.yarn
index 1657eca..adf3780 100644
--- a/000.yarn
+++ b/000.yarn
@@ -276,7 +276,7 @@ WHEN admin creates user
         None, 
         'user add {} {}@example.com Test {}'.format(
             username, username, username))
-    pubkey = helper.ssh_keygen(username)
+    pubkey = ssh_keygen(username)
     gitano(None,
         'as {} sshkey add default'.format(username), stdin=pubkey)
 
@@ -314,14 +314,14 @@ WHEN admin created repository
     user = 'admin'
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
-    helper.git_as_checked(None, ['clone', url, dirname])
+    git_as_checked(None, ['clone', url, dirname])
     cliapp.runcmd(['git', 'config', 'user.email', user], cwd=dirname)
     cliapp.runcmd(['git', 'config', 'user.name', user], cwd=dirname)
     with open(os.path.join(dirname, 'foo.txt'), 'a') as f:
         f.write('')
     cliapp.runcmd(['git', 'add', 'foo.txt'], cwd=dirname)
     cliapp.runcmd(['git', 'commit', '-mfoo'], cwd=dirname)
-    helper.git_as_checked(None, ['push', '--all'], cwd=dirname)
+    git_as_checked(None, ['push', '--all'], cwd=dirname)
 
 WHEN admin sets repository config
 -----------------------------------------------------------------------------
@@ -340,7 +340,7 @@ THEN a user can clone a repository
     repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
-    helper.git_as_checked(user, ['clone', url, dirname])
+    git_as_checked(user, ['clone', url, dirname])
     cliapp.runcmd(['git', 'config', 'user.email', user], cwd=dirname)
     cliapp.runcmd(['git', 'config', 'user.name', user], cwd=dirname)
 
@@ -352,7 +352,7 @@ THEN a user can't clone a repository
     repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
-    exit, out, err = helper.git_as(user, ['clone', url, dirname])
+    exit, out, err = git_as(user, ['clone', url, dirname])
     helper.assertNotEqual(exit, 0)
 
 THEN a repository can be cloned over the git protocol
@@ -396,7 +396,7 @@ THEN a user can push all local branches
     repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
-    helper.git_as_checked(user, ['push', '--all', 'origin'], cwd=dirname)
+    git_as_checked(user, ['push', '--all', 'origin'], cwd=dirname)
 
 THEN a user can push all local tags
 -----------------------------------------------------------------------------
@@ -406,7 +406,7 @@ THEN a user can push all local tags
     repo = get_next_match()
     url = helper.repo_ssh_url(repo)
     dirname = helper.local_checkout_dirname(user, repo)
-    helper.git_as_checked(user, ['push', '--tags', 'origin'], cwd=dirname)
+    git_as_checked(user, ['push', '--tags', 'origin'], cwd=dirname)
 
 THEN a user can't push local branches
 -----------------------------------------------------------------------------
@@ -415,7 +415,7 @@ THEN a user can't push local branches
     user = get_next_match()
     repo = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
-    exit, out, err = helper.git_as(
+    exit, out, err = git_as(
         user,
         ['push', '--all', 'origin'], cwd=dirname)
     sys.stdout.write(out)
@@ -429,7 +429,7 @@ THEN a user can't push local tags
     user = get_next_match()
     repo = get_next_match()
     dirname = helper.local_checkout_dirname(user, repo)
-    exit, out, err = helper.git_as(
+    exit, out, err = git_as(
         user,
         ['push', '--tags', 'origin'], cwd=dirname)
     helper.assertNotEqual(exit, 0)