git-utils 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edf67d43b4a31f657051e8a36faea3284b6ea1b
-  data.tar.gz: b547a2b6c27f3768d2e138c486e564f1662e441c
+  metadata.gz: 26672368e31366a1a0346024f6c63c6e311fa4bc
+  data.tar.gz: f508261f8d9caa3501b957dee630578442d594d7
 SHA512:
-  metadata.gz: 7cc1a1dbcdd2b1853cd596f27893ef9afb0ac27c577cafca19fa4b43a2a7805d1d0b51a68db6e3af6a5d8b8467f85bb2510d127748f4bacf4af3ede334c55790
-  data.tar.gz: e32dc6b3dacfa73f120ecab9585d3e7e4b830d01c072b1e2cca06b05abf8584e569599b74897fa80c48a35357aca41949d06f72a62b12259df8a8f3c1940a01e
+  metadata.gz: b2750cea08cf0b2cfb8cd5f8ae546b8e30aff8ae5b927caf85607450d71e23710b799077e550faa61850d6f6afc462804e3535503e5bfdfe335a449d3c6b9417
+  data.tar.gz: 4b8ffc2a46c52d6fd4d249e0846f7f8ddd4a535394f853d3568104179e14183a684b701a3fb6136e76ecef2210e6a3f8b876d6eeefaec39855b23685db7f0c55

data/lib/git-utils/command.rb

@@ -31,8 +31,6 @@ class Command
     @origin_url ||= `git config --get remote.origin.url`.strip
   end
 
-
-
   # Returns the name of the repository service.
   # It's currently GitHub, Bitbucket, or Stash.
   # We return blank for an unknown service; the command will still

data/lib/git-utils/sync.rb

@@ -4,10 +4,7 @@ class Sync < Command
 
   def parser
     OptionParser.new do |opts|
-      opts.banner = "Usage: git sync"
-      opts.on("-b", "--branch", "sync with given branch") do |opt|
-        self.options.branch = opt
-      end
+      opts.banner = "Usage: git sync [branch]"
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
       end
@@ -16,7 +13,7 @@ class Sync < Command
 
   # Returns a command appropriate for executing at the command line.
   def cmd
-    branch = options[:branch] || 'master'
+    branch = self.known_options.first || 'master'
     c = ["git checkout #{branch}"]
     c << "git pull"
     c << "git checkout #{current_branch}"

data/lib/git-utils/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Utils
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

data/spec/commands/sync_spec.rb

@@ -12,6 +12,12 @@ describe Sync do
   its(:cmd) { should match /git pull/ }
   its(:cmd) { should match /git checkout #{command.current_branch}/ }
 
+  describe "description" do
+    let(:alternate_branch) { 'alternate' }
+    before { command.stub(:known_options).and_return([alternate_branch]) }
+    its(:cmd) { should match /git checkout #{alternate_branch}/ }
+  end
+
   describe "command-line command" do
     subject { `bin/git-sync --debug` }
     it { should match /git checkout master/ }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Michael Hartl