git_remote_branch 0.3.4 → 0.3.5

data/git_remote_branch.gemspec

@@ -22,5 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'shoulda'
   s.add_development_dependency 'mocha'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-nav'
   s.add_dependency 'rainbow'
 end

data/lib/git_remote_branch.rb

@@ -37,7 +37,7 @@ module GitRemoteBranch
       :commands => [
         '"#{GIT} push #{origin} #{branch_name}:refs/heads/#{branch_name}"',
         '"#{GIT} fetch #{origin}"',
-        '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"',
+        '"#{GIT} branch -u #{origin}/#{branch_name} #{branch_name}"',
         '"#{GIT} checkout #{branch_name}"'
       ]
     },
@@ -70,7 +70,7 @@ module GitRemoteBranch
       :aliases  => %w{track follow grab fetch},
       :commands => [
         '"#{GIT} fetch #{origin}"',
-        '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"'
+        '"#{GIT} branch --track #{branch_name} #{origin}/#{branch_name}"',
       ]
     }
   } unless defined?(COMMANDS)

data/lib/version.rb

@@ -2,7 +2,7 @@ module GitRemoteBranch
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 3
-    TINY     = 4
+    TINY     = 5
 
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/tasks/gem.rake

@@ -1,3 +1,9 @@
+# Reminder when shipping a version
+# - Bump the version in lib/version.rb
+# - Commit & push everything
+# - rake gem gem:install # then sanity check that it works
+# - rake gem:feeling_lucky # uploads the gem, then tags the commit
+
 require 'yaml'
 
 gem_name  = GitRemoteBranch::NAME

data/test/functional/grb_test.rb

@@ -32,8 +32,8 @@ class GRBTest < Test::Unit::TestCase
           
           should_have_branch 'new_branch', :local, :remote
           
-          should "use the branch --set-upstream command" do
-            assert_match %r{branch --set-upstream}, @output
+          should "use the branch --track command" do
+            assert_match %r{branch --track}, @output
           end
         end
         
@@ -45,8 +45,8 @@ class GRBTest < Test::Unit::TestCase
           
           should_have_branch 'new_branch', :local, :remote
           
-          should "use the branch --set-upstream command" do
-            assert_match %r{branch --set-upstream}, @output
+          should "use the branch --track command" do
+            assert_match %r{branch --track}, @output
           end
         end
       end

data/test/test_helper.rb

@@ -10,6 +10,7 @@ require 'test/unit'
 
 require 'shoulda'
 require 'mocha'
+require 'pry-nav'
 
 TEST_DIR = File.dirname(__FILE__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_remote_branch
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3330691997663419268
+      hash: 2627225299260456999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,10 +206,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3330691997663419268
+      hash: 2627225299260456999
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: git_remote_branch eases the interaction with remote branches