autowow 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 377f624b3071e863142cec2311ba2a1e258bdd06
-  data.tar.gz: b81afbe55166c43c4b9194642a3248bf37157bec
+  metadata.gz: 289ce64a634f3297f81da70a511249754e54f685
+  data.tar.gz: 38c90399124d04ec9edbb2df02dafcd2256f3fb9
 SHA512:
-  metadata.gz: 25fe454c8297af9485927b08efcaa319647558c5b7ec8da91bdfb1cf4278349876f833a21f93ae057e7a63636bb171ff86e62bdda49a67cb3800a3eee08b72b0
-  data.tar.gz: baa2dda886be3e0a45c88c692d2226f7c5b7d158ca4ba6d33251c2206b44547e21a056bda8bbeaea6182b1d0a53f1ea3462a72138be1c4325e965bb486972cb8
+  metadata.gz: f58cc3df543c4526912bd6d6b85beef61b83c373b479798ca5066199121d097a6c4f6552b85e0710784b53f11627f0df324c487ae83f21446c7d6f2c9c559d39
+  data.tar.gz: 588ce7f67c9e6b3c3d2448bb2c2a847d78c8df845b828d4989afcbf489ea14b460175bcb95e0ad487f9a55f06616d6997ed3574b19f30a03e4652ad76f292e7d

data/lib/autowow/commands/vcs.rb

@@ -5,80 +5,80 @@ module Autowow
         ['git']
       end
 
-      def default_options
+      def terminal_options
         ['--no-pager']
       end
 
       def changes_not_on_remote(branch)
-        cmd + default_options + ['log', branch, '--not', '--remotes']
+        cmd + terminal_options + ['log', branch, '--not', '--remotes']
       end
 
       def branch_list
-        cmd + default_options + ['for-each-ref', "--format=%(refname)", 'refs/heads/']
+        cmd + ['for-each-ref', "--format=%(refname)", 'refs/heads/']
       end
 
       def push(branch = nil, remote = nil)
-        cmd + default_options + ['push'] + [branch, remote].compact
+        cmd + ['push'] + [branch, remote].compact
       end
 
       def rebase(branch)
-        cmd + default_options + ['rebase', branch]
+        cmd + ['rebase', branch]
       end
 
       def git_status
-        cmd + default_options + ['status']
+        cmd + ['status']
       end
 
       def stash
-        cmd + default_options + ['stash']
+        cmd + ['stash']
       end
 
       def stash_pop
-        cmd + default_options + ['stash', 'pop']
+        cmd + ['stash', 'pop']
       end
 
       def current_branch
-        cmd + default_options + ['symbolic-ref', '--short', 'HEAD']
+        cmd + ['symbolic-ref', '--short', 'HEAD']
       end
 
       def checkout(existing_branch)
-        cmd + default_options + ['checkout', existing_branch]
+        cmd + ['checkout', existing_branch]
       end
 
       def pull
-        cmd + default_options + ['pull']
+        cmd + ['pull']
       end
 
       def branch_force_delete(branch)
-        cmd + default_options + ['branch', '-D', branch]
+        cmd + ['branch', '-D', branch]
       end
 
       def create(branch)
-        cmd + default_options + ['checkout', '-b', branch]
+        cmd + ['checkout', '-b', branch]
       end
 
       def set_upstream(remote, branch)
-        cmd + default_options + ['push', '--set-upstream', remote, branch]
+        cmd + ['push', '--set-upstream', remote, branch]
       end
 
       def remotes
-        cmd + default_options + ['remote', '-v']
+        cmd + ['remote', '-v']
       end
 
       def fetch(remote)
-        cmd + default_options + ['fetch', remote]
+        cmd + ['fetch', remote]
       end
 
       def merge(compare)
-        cmd + default_options + ['merge', compare]
+        cmd + ['merge', compare]
       end
 
       def branch
-        cmd + default_options + ['branch']
+        cmd + ['branch']
       end
 
       def add_remote(name, url)
-        cmd + default_options + ['remote', 'add', name, url]
+        cmd + ['remote', 'add', name, url]
       end
 
       include ReflectionUtils::CreateModuleFunctions

data/lib/autowow/features/vcs.rb

@@ -136,7 +136,7 @@ module Autowow
         end
 
         on_branch('master') do
-          has_upstream? ? pull_upstream : pretty.run(pull)
+          has_upstream? ? pull_upstream : pretty_with_output.run(pull)
         end
       end
 
@@ -144,9 +144,9 @@ module Autowow
         upstream_remote = 'upstream'
         remote = 'origin'
         branch = 'master'
-        pretty.run(fetch(upstream_remote)).out
-        pretty.run(merge("#{upstream_remote}/#{branch}")).out
-        pretty.run(push(remote, branch))
+        pretty_with_output.run(fetch(upstream_remote)).out
+        pretty_with_output.run(merge("#{upstream_remote}/#{branch}")).out
+        pretty_with_output.run(push(remote, branch))
       end
 
       def has_upstream?
@@ -176,10 +176,10 @@ module Autowow
         logger.error("Nothing to do.") and return if branch.eql?('master')
 
         keep_changes do
-          pretty.run(checkout('master'))
-          pretty.run(pull)
+          pretty_with_output.run(checkout('master'))
+          pretty_with_output.run(pull)
         end
-        pretty.run(branch_force_delete(branch))
+        pretty_with_output.run(branch_force_delete(branch))
 
         pretty_with_output.run(git_status)
       end

data/lib/autowow/version.rb

@@ -1,3 +1,3 @@
 module Autowow
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autowow
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - thisismydesign