git_remote_branch 0.3.0 → 0.3.1

data/Gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem 'rainbow'
+group :development do
+  gem 'rake'
+  gem 'rdoc'
+  gem 'test-unit'
+  gem 'shoulda'
+  gem 'mocha', :require => false # Must be loaded only after ActiveSupport::TestCase is defined
+end

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    json (1.6.1)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    rainbow (1.1.3)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    shoulda (2.11.3)
+    test-unit (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  rainbow
+  rake
+  rdoc
+  shoulda
+  test-unit

data/README.rdoc

@@ -3,12 +3,12 @@
 git_remote_branch is a simple command-line tool that makes it very easy to manipulate
 branches published in shared repositories.
 
-git_remote_branch achieves this goal by sticking to a few principles:
+It achieves this goal by sticking to a few principles:
 - keep grb's commands extremely regular (they all look alike)
 - support aliases for commands
 - print all commands it runs on your behalf in red, so you eventually learn them
 
-Another nice thing about git_remote_branch: it can simply explain a command 
+Another nice thing about git_remote_branch is that it can simply explain a command 
 (print out all the corresponding git commands) instead of running them on your behalf.
 
 Note: git_remote_branch assumes that the local and remote branches have the
@@ -17,20 +17,17 @@ same name. Multiple remote repositories (or origins) are supported.
 
 = Installation
 
-  sudo gem install git_remote_branch --include-dependencies
+  gem install git_remote_branch
 
-If you have an old version of Rubygems, you may have to manually install the "colored" gem.
-  sudo gem install colored
+If you're on Windows, you can optionally install the following gems, to get
+color output:
 
-If you're on Windows, you must also install "win32console" manually (before or after installing git_remote_branch doesn't matter).
-  gem install win32console colored
+  gem install windows-pr win32console
 
 
-See the "Bleeding edge and development" section the end of this document for more details about fiddling with the source of git_remote_branch or running it with Ruby 1.9 (yes, it works).
-
 = Usage
 
-Notes: 
+Notes:
 - parts between brackets are optional
 - When 'origin_server' is not specified, the name 'origin' is assumed.
 
@@ -87,13 +84,13 @@ The branch you want to rename must be checked out.
 All commands can be prepended by the word 'explain'.  Instead of executing the
 command, git_remote_branch will simply output the list of commands you need to
 run to accomplish that goal.
-Examples: 
+Examples:
 
   $ grb explain create
   git_remote_branch version 0.3.0
-  
+
   List of operations to do to create a new remote branch and track it locally:
-  
+
   git push origin master:refs/heads/branch_to_create
   git fetch origin
   git branch --track branch_to_create origin/branch_to_create
@@ -103,9 +100,9 @@ Explain your specific case:
 
   $ grb explain create my_branch github
   git_remote_branch version 0.3.0
-  
+
   List of operations to do to create a new remote branch and track it locally:
-  
+
   git push github master:refs/heads/my_branch
   git fetch github
   git branch --track my_branch github/my_branch
@@ -115,11 +112,10 @@ This, of course, works for each of the grb commands.
 
 = More on git_remote_branch
 
-- Documentation: http://grb.rubyforge.org
-- News:          http://programblings.com/category/git/git_remote_branch/
-- Bug tracker:   http://git-remote-branch.lighthouseapp.com/projects/19198-git_remote_branch/overview
-- Code:          http://github.com/webmat/git_remote_branch
-- Mailing list:  http://groups.google.com/group/git_remote_branch
+- Documentation:  https://github.com/webmat/git_remote_branch#readme
+- Code:           http://github.com/webmat/git_remote_branch
+- Bugs:           https://github.com/webmat/git_remote_branch/issues
+- News:           http://programblings.com/category/git/git_remote_branch/
 
 
 == History
@@ -139,46 +135,13 @@ git_remote_branch in its current form was inspired by a script created by Carl M
 
 git_remote_branch is licensed under the MIT License. See the file LICENSE for details.
 
-== Bleeding edge and development
-
-(Notice the keyword "bleeding")
-
-=== Getting the bleeding edge
-
-Installing from GitHub
-  sudo gem install webmat-git_remote_branch --source=http://gems.github.com
-
-Note that the only stable version of the gem you should trust is the one from Rubyforge. The GitHub gem is a development gem. The GitHub gem WILL be rebuilt with the same version number, and other horrible things like that. If you use the github version of the gem, children will die! You've been warned.
-
-Cloning the repo and installing from your copy
-  git clone git://github.com/webmat/git_remote_branch.git
-  rake install
-
-=== Testing dependencies
-
-Note that git_remote_branch uses a few more gems for tests. Running any rake task will try to load them due to the way Rake::TestTask works.
-
-  sudo gem install thoughtbot-shoulda --source http://gems.github.com
-  sudo gem install mocha
-
-An attempt is made to require 2 more optional gems: redgreen and ruby-debug. If they're not present, only a whiny message will be displayed.
-
 === Supported platforms
 
-git_remote_branch has been tested with the following configurations:
-
-- OS X Leopard / Ruby 1.8.6 / Git 1.5.4.3 and 1.6.0.2
-- OS X Leopard / Ruby 1.9.1 / Git 1.5.4.3 and 1.6.0.2
-- Ubuntu Intrepid Ibex / Ruby 1.8.7 / Git 1.5.6.3
-- Windows XP / Ruby 1.8.6 / Git 1.6.0.2 (the msys version)
-
-Let me know if you have problems running git_remote_branch with your platform.
-
-To run the test suite using Ruby 1.9, simply set the RUBY environment variable to point to your 1.9 interpreter and then run the 1.9 version of Rake. In my case, everything 1.9 is suffixed with 1.9:
-
-  $ RUBY=ruby1.9 rake1.9 test
+This version of git_remote_branch has been tested with
 
-Or on Windows (Ruby 1.9 not tested on Windows)
+- OS X Lion
+- past versions were known to work on Linux and Windows
+- Ruby 1.8.7, 1.9.2, 1.9.3
+- git 1.7+
 
-  > set RUBY=ruby1.9
-  > rake1.9 test
+Let me know if you encounter problems running git_remote_branch with your platform.

data/Rakefile

@@ -1,4 +1,11 @@
 require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end
 
 require 'rake'
 

data/bin/grb

@@ -7,13 +7,8 @@ require "#{File.dirname(THIS_FILE)}/../lib/git_remote_branch"
 
 include GitRemoteBranch
 
-def crap_out(message)
-  puts message
-  exit 1
-end
-
 unless git_found?
-  crap_out <<-MSG
+  abort <<-MSG
 The git executable (#{GIT}) could not be found by git_remote_branch.
 Make sure your PATH variable contains the path for git's binary.
 Your PATH:
@@ -24,10 +19,10 @@ end
 begin
   p = read_params(ARGV)
 rescue InvalidBranchError => ex
-  crap_out ex.message
+  abort ex.message
 end
 
-$SILENT = p[:silent]
+$WHISPER = p[:silent]
 
 whisper get_welcome
 

data/lib/constants.rb

@@ -1,5 +1,5 @@
 module GitRemoteBranch
-  GIT = (ENV['GRB_GIT'] || 'git').freeze
+  GIT = (ENV['GRB_GIT'] || 'git')
   
-  LOCAL_BRANCH_LISTING_COMMAND = "#{GIT} branch -l".freeze
+  LOCAL_BRANCH_LISTING_COMMAND = "#{GIT} branch -l"
 end

data/lib/git_remote_branch.rb

@@ -1,14 +1,15 @@
 require 'rubygems'
 
-if RUBY_VERSION =~ /1\.8/
-  gem 'colored', '>= 1.1'
-  require 'colored'
-else
-  class String
-    def red; self; end
-  end
+begin
+  require 'bundler/setup'
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
 end
 
+require 'rainbow'
+
 begin
   WINDOWS = !!(RUBY_PLATFORM =~ /win32|cygwin/)
 rescue Exception
@@ -20,11 +21,9 @@ $LOAD_PATH.unshift( grb_app_root + '/vendor' )
 require 'capture_fu'
 
 $LOAD_PATH.unshift( grb_app_root + '/lib' )
-require 'constants'
-require 'string_ext'
-require 'state'
-require 'param_reader'
-require 'version'
+%w(monkey_patches constants  state param_reader version).each do |f|
+  require f
+end
 
 module GitRemoteBranch
   class InvalidBranchError < RuntimeError; end
@@ -43,13 +42,12 @@ module GitRemoteBranch
     },
 
     :publish     => {
-      :description => 'publish an exiting local branch',
+      :description => 'publish an existing local branch',
       :aliases  => %w{publish remotize share},
       :commands => [
         '"#{GIT} push #{origin} #{branch_name}:refs/heads/#{branch_name}"',
         '"#{GIT} fetch #{origin}"',
-        '"#{GIT} config branch.#{branch_name}.remote #{origin}"',
-        '"#{GIT} config branch.#{branch_name}.merge refs/heads/#{branch_name}"',
+        '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"',
         '"#{GIT} checkout #{branch_name}"'
       ]
     },
@@ -81,14 +79,8 @@ module GitRemoteBranch
       :description => 'track an existing remote branch',
       :aliases  => %w{track follow grab fetch},
       :commands => [
-        # This string programming thing is getting old. Not flexible enough anymore.
         '"#{GIT} fetch #{origin}"',
-        'if local_branches.include?(branch_name) 
-          "#{GIT} config branch.#{branch_name}.remote #{origin}\n" +
-          "#{GIT} config branch.#{branch_name}.merge refs/heads/#{branch_name}"
-        else
-          "#{GIT} branch --track #{branch_name} #{origin}/#{branch_name}"
-        end'
+        '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"'
       ]
     }
   } unless defined?(COMMANDS)
@@ -150,7 +142,7 @@ module GitRemoteBranch
   end
 
   def execute_cmds(*cmds)
-    silencer = $SILENT ? ' 2>&1' : ''
+    silencer = $WHISPER ? ' 2>&1' : ''
     cmds.flatten.each do |c|
       puts_cmd c
       `#{c}#{silencer}`
@@ -160,13 +152,7 @@ module GitRemoteBranch
 
   def puts_cmd(*cmds)
     cmds.flatten.each do |c|
-      whisper "#{c}".red
-    end
-  end
-  
-  def whisper(*msgs)
-    unless $SILENT
-      msgs.flatten ?  msgs.flatten.each{|m| puts m} : puts
+      whisper "#{c}".foreground(:red)
     end
   end
 end

data/lib/monkey_patches.rb

@@ -0,0 +1,17 @@
+# One nice thing about command-line tools is that nobody cares how 
+# much you monkey-patch :-)
+
+module Kernel
+  def whisper(*msgs)
+    unless $WHISPER
+      puts *msgs
+    end
+  end
+end
+
+class String
+  def path_for_os
+    WINDOWS ? self.gsub('/', '\\') : self
+  end
+end
+

data/lib/state.rb

@@ -1,34 +1,36 @@
 module GitRemoteBranch
   include ::CaptureFu
-  
+
   public
     def get_current_branch
       local_branch_information[0]
     end
-    
+
     def local_branches
       local_branch_information[1]
     end
-    
+
     def git_found?
       ret, msg = capture_process_output "#{GIT} --version"
+      user_version = msg.chomp.split[2]
+      warn "Some grb commands will not work with git version < 1.7 (you have #{user_version})" unless user_version >= '1.7'
       ret == 0
     end
-    
+
   private
     # Returns an array of 2 elements: [current_branch, [all local branches]]
     def local_branch_information
       #This is sensitive to checkouts of branches specified with wrong case
-      
+
       listing = capture_process_output("#{LOCAL_BRANCH_LISTING_COMMAND}")[1]
-      
+
       raise(NotOnGitRepositoryError, listing.chomp) if listing =~ /Not a git repository/i
       if listing =~ /\(no branch\)/
         raise InvalidBranchError, ["Couldn't identify the current local branch. The branch listing was:",
-          LOCAL_BRANCH_LISTING_COMMAND.red, 
+          LOCAL_BRANCH_LISTING_COMMAND.foreground(:red), 
           listing].join("\n")
       end
-      
+
       current_branch = nil
       branches = listing.split("\n").map do |line| 
         current        = line.include? '*'
@@ -36,7 +38,7 @@ module GitRemoteBranch
         current_branch = clean_line if current
         clean_line
       end
-      
+
       return current_branch, branches
     end
 end

data/lib/version.rb

@@ -2,13 +2,13 @@ module GitRemoteBranch
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 3
-    TINY     = 0
+    TINY     = 1
     
-    STRING   = [MAJOR, MINOR, TINY].join('.').freeze
+    STRING   = [MAJOR, MINOR, TINY].join('.')
   end
   
-  NAME          = 'git_remote_branch'.freeze
-  COMPLETE_NAME = "#{NAME} #{VERSION::STRING}".freeze  
-  COMMAND_NAME  = 'grb'.freeze
+  NAME          = 'git_remote_branch'
+  COMPLETE_NAME = "#{NAME} #{VERSION::STRING}"
+  COMMAND_NAME  = 'grb'
   SHORT_NAME    = COMMAND_NAME
 end

data/tasks/gem.rake

@@ -1,10 +1,10 @@
 require 'yaml'
 
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 spec = Gem::Specification.new do |s|
-  s.name                  = GitRemoteBranch::NAME
-  s.version               = GitRemoteBranch::VERSION::STRING
+  s.name                  = GitRemoteBranch::NAME.dup
+  s.version               = GitRemoteBranch::VERSION::STRING.dup
   s.summary               = "git_remote_branch eases the interaction with remote branches"
   s.description           = "git_remote_branch is a learning tool to ease the interaction with " +
                             "remote branches in simple situations."
@@ -25,12 +25,12 @@ spec = Gem::Specification.new do |s|
   s.bindir                = "bin"
   s.require_path          = "lib"
   
-  s.add_dependency( 'colored', '>= 1.1' )
+  s.add_dependency( 'rainbow', '>= 1.0.1' )
 end
 
 #Creates clobber_package, gem, package and repackage tasks
 #Note on clobber_package: fortunately, this will clobber the CODE package
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
@@ -46,6 +46,7 @@ task :tag_warn do
 end
 task :tag do
   sh TAG_COMMAND
+  puts "Upload tags to repo with 'git push --tags'"
 end
 task :gem => :tag_warn
 

data/tasks/rdoc.rake

@@ -1,4 +1,4 @@
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Generate rdoc documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|

data/test/functional/grb_test.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path('../../test_helper', __FILE__)
 
 class GRBTest < Test::Unit::TestCase
   include ShouldaFunctionalHelpers
@@ -32,8 +32,8 @@ class GRBTest < Test::Unit::TestCase
           
           should_have_branch 'new_branch', :local, :remote
           
-          should "use the branch --track command" do
-            assert_match %r{branch --track}, @output
+          should "use the branch --set-upstream command" do
+            assert_match %r{branch --set-upstream}, @output
           end
         end
         
@@ -45,8 +45,8 @@ class GRBTest < Test::Unit::TestCase
           
           should_have_branch 'new_branch', :local, :remote
           
-          should "use git config to connect the branches" do
-            assert_match %r{git\sconfig}, @output
+          should "use the branch --set-upstream command" do
+            assert_match %r{branch --set-upstream}, @output
           end
         end
       end

data/test/test_helper.rb

@@ -1,30 +1,22 @@
 require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end
 require 'test/unit'
 
-TEST_DIR = File.dirname(__FILE__)
-
-# Install version 2 the shoulda gem with 
-#   gem install thoughtbot-shoulda --source http://gems.github.com
-# Shoulda depends on ActiveSupport 2.0, so if you don't have Rails 2.x installed, install ActiveSupport before Shoulda:
-#   gem install activesupport
-gem 'thoughtbot-shoulda', '~> 2.0'
 require 'shoulda'
-gem 'mocha', '~> 0.5'
 require 'mocha'
 
-# Just load redgreen if not running tests from TextMate
-IN_TM = !ENV['TM_DIRECTORY'].nil? unless defined?(IN_TM)
-begin
-  require 'redgreen' unless IN_TM
-  require 'ruby-debug'
-rescue LoadError => ex
-  puts "Couldn't load optional test dependencies.\n  #{ex.inspect}"
-end
+TEST_DIR = File.dirname(__FILE__)
 
 require File.join( [TEST_DIR] + %w{ .. lib git_remote_branch} )
 
 require "#{TEST_DIR}/helpers/in_dir"
-Dir[TEST_DIR+'/helpers/**/*.rb'].each{|f| require f} 
+Dir[TEST_DIR+'/helpers/**/*.rb'].each{|f| require f}
 
 class Test::Unit::TestCase
   include MoreAssertions

data/test/unit/git_helper_test.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path('../../test_helper', __FILE__)
 
 class GitHelperTest < Test::Unit::TestCase
   

data/test/unit/git_remote_branch_test.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path('../../test_helper', __FILE__)
 
 class GitRemoteBranchTest < Test::Unit::TestCase
   context 'help' do

data/test/unit/param_reader_test.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path('../../test_helper', __FILE__)
 require "#{TEST_DIR}/helpers/constants"
 
 class ParamReaderTest < Test::Unit::TestCase
@@ -194,7 +194,7 @@ class ParamReaderTest < Test::Unit::TestCase
     GitRemoteBranch::COMMANDS.each_pair do |cmd, params|
       should "recognize all #{cmd} aliases" do
         params[:aliases].each do |alias_|
-          assert cmd, grb.get_action(alias_) 
+          assert cmd, grb.get_action(alias_).to_s
         end
       end
     end

data/test/unit/state_test.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path('../../test_helper', __FILE__)
 require "#{TEST_DIR}/helpers/constants"
 
 class ParamReaderTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git_remote_branch
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Mathieu Martin
@@ -10,19 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-14 00:00:00 -05:00
+date: 2011-12-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: colored
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.1"
-    version: 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  requirement: *id001
+  prerelease: false
+  name: rainbow
+  type: :runtime
 description: git_remote_branch is a learning tool to ease the interaction with remote branches in simple situations.
 email: webmat@gmail.com
 executables: 
@@ -32,27 +44,23 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- bin
 - bin/grb
 - CHANGELOG
-- lib
+- Gemfile
+- Gemfile.lock
 - lib/constants.rb
 - lib/git_remote_branch.rb
+- lib/monkey_patches.rb
 - lib/param_reader.rb
 - lib/state.rb
-- lib/string_ext.rb
 - lib/version.rb
 - LICENSE
 - Rakefile
 - README.rdoc
-- tasks
 - tasks/gem.rake
 - tasks/rdoc.rake
 - tasks/test.rake
-- test
-- test/functional
 - test/functional/grb_test.rb
-- test/helpers
 - test/helpers/array_extensions.rb
 - test/helpers/constants.rb
 - test/helpers/extractable.rb
@@ -63,15 +71,15 @@ files:
 - test/helpers/shoulda_unit_helpers.rb
 - test/helpers/temp_dir_helper.rb
 - test/test_helper.rb
-- test/unit
 - test/unit/git_helper_test.rb
 - test/unit/git_remote_branch_test.rb
 - test/unit/param_reader_test.rb
 - test/unit/state_test.rb
-- vendor
 - vendor/capture_fu.rb
 has_rdoc: true
 homepage: http://github.com/webmat/git_remote_branch
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -81,28 +89,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: grb
-rubygems_version: 1.3.0
+rubygems_version: 1.3.9.1
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: git_remote_branch eases the interaction with remote branches
 test_files: 
-- test/functional
 - test/functional/grb_test.rb
-- test/helpers
 - test/helpers/array_extensions.rb
 - test/helpers/constants.rb
 - test/helpers/extractable.rb
@@ -113,7 +125,6 @@ test_files:
 - test/helpers/shoulda_unit_helpers.rb
 - test/helpers/temp_dir_helper.rb
 - test/test_helper.rb
-- test/unit
 - test/unit/git_helper_test.rb
 - test/unit/git_remote_branch_test.rb
 - test/unit/param_reader_test.rb

data/lib/string_ext.rb

@@ -1,5 +0,0 @@
-class String
-  def path_for_os
-    WINDOWS ? self.gsub('/', '\\') : self
-  end
-end