git_remote_branch 0.3.1 → 0.3.2

data/bin/grb

@@ -3,7 +3,7 @@
 # Check out the README (or try 'grb help') before you screw up your repos ;-)
 
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-require "#{File.dirname(THIS_FILE)}/../lib/git_remote_branch"
+require File.expand_path('../lib/git_remote_branch', File.dirname(THIS_FILE))
 
 include GitRemoteBranch
 

data/lib/constants.rb

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

data/lib/git_remote_branch.rb

@@ -84,7 +84,7 @@ module GitRemoteBranch
       ]
     }
   } unless defined?(COMMANDS)
-  
+
   def self.get_reverse_map(commands)
     h={}
     commands.each_pair do |cmd, params|
@@ -99,7 +99,7 @@ module GitRemoteBranch
     h
   end
   ALIAS_REVERSE_MAP = get_reverse_map(COMMANDS) unless defined?(ALIAS_REVERSE_MAP)
-  
+
   def get_welcome
     "git_remote_branch version #{VERSION::STRING}\n\n"
   end
@@ -109,19 +109,19 @@ module GitRemoteBranch
   Usage:
 
 #{[:create, :publish, :rename, :delete, :track].map{|action|
-      "  grb #{action} branch_name [origin_server] \n\n"
-    }  
+      "  grb #{action} branch_name [origin_server]"
+    } * "\n"
   }
-  
+
   Notes:
   - If origin_server is not specified, the name 'origin' is assumed (git's default)
   - The rename functionality renames the current branch
-  
+
   The explain meta-command: you can also prepend any command with the keyword 'explain'. Instead of executing the command, git_remote_branch will simply output the list of commands you need to run to accomplish that goal.
-  Example: 
+  Example:
     grb explain create
     grb explain create my_branch github
-  
+
   All commands also have aliases:
   #{ COMMANDS.keys.map{|k| k.to_s}.sort.map {|cmd| 
     "#{cmd}: #{COMMANDS[cmd.to_sym][:aliases].join(', ')}" }.join("\n  ") }

data/lib/param_reader.rb

@@ -1,25 +1,25 @@
 module GitRemoteBranch
-  
-  private 
+
+  private
   HELP_PARAMS = {:action => :help}
 
   public
   def read_params(argv)
     #TODO Some validation on the params
-    
+
     p={}
     p[:silent]  = silent!(argv)
     p[:explain] = explain_mode!(argv)
-    
+
     p[:action]  = get_action(argv[0]) or return HELP_PARAMS
 
     return HELP_PARAMS if p[:action] == :help
 
     p[:branch]  = get_branch(argv[1])
     p[:origin]  = get_origin(argv[2])
-    
+
     # If in explain mode, the user doesn't have to specify a branch or be on in
-    # actual repo to get the explanation. 
+    # actual repo to get the explanation.
     # Of course if he is, the explanation will be made better by using contextual info.
     if p[:explain]
       p[:branch] ||= "branch_to_#{p[:action]}"
@@ -44,7 +44,7 @@ module GitRemoteBranch
       false
     end
   end
-  
+
   def silent!(argv)
     !!argv.delete('--silent')
   end
@@ -56,7 +56,7 @@ module GitRemoteBranch
   def get_branch(branch)
     branch
   end
-  
+
   def get_origin(origin)
     return origin || 'origin'
   end

data/lib/version.rb

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

data/tasks/gem.rake

@@ -17,14 +17,14 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc              = true
   s.extra_rdoc_files     << 'README.rdoc'
   s.rdoc_options         << '--main' << 'README.rdoc' << '--exclude' << 'lib'
-  
+
   s.test_files            = Dir['test/**/*'].reject{|f| f =~ /test_runs/}
   s.files                 = Dir['**/*'].reject{|f| f =~ /\Apkg|\Acoverage|\Ardoc|test_runs|\.gemspec\Z/}
-  
+
   s.executable            = 'grb'
   s.bindir                = "bin"
   s.require_path          = "lib"
-  
+
   s.add_dependency( 'rainbow', '>= 1.0.1' )
 end
 
@@ -35,6 +35,7 @@ Gem::PackageTask.new(spec) do |p|
 end
 
 TAG_COMMAND = "git tag -m 'Tagging version #{GitRemoteBranch::VERSION::STRING}' -a v#{GitRemoteBranch::VERSION::STRING}"
+push_tags_command = 'git push --tags'
 task :tag_warn do
   puts  "*" * 40,
         "Don't forget to tag the release:",
@@ -46,39 +47,36 @@ task :tag_warn do
 end
 task :tag do
   sh TAG_COMMAND
-  puts "Upload tags to repo with 'git push --tags'"
+  puts "Upload tags to repo with '#{push_tags_command}'"
 end
 task :gem => :tag_warn
 
 namespace :gem do
-  desc "Update the gemspec for GitHub's gem server"
-  task :github do
-    File.open("#{GitRemoteBranch::NAME}.gemspec", 'w'){|f| f.puts YAML::dump(spec) }
-    puts "gemspec generated here: #{GitRemoteBranch::NAME}.gemspec"
+  desc 'Upload gem to rubygems.org'
+  task :publish => :gem do
+    sh "gem push pkg/#{spec.full_name}.gem"
   end
-  
-  desc 'Upload gem to rubyforge.org'
-  task :rubyforge => :gem do
-    sh 'rubyforge login'
-    sh "rubyforge add_release grb grb '#{GitRemoteBranch::VERSION::STRING}' pkg/#{spec.full_name}.gem"
-    sh "rubyforge add_file grb grb #{GitRemoteBranch::VERSION::STRING} pkg/#{spec.full_name}.gem"
-  end
-  
+
   desc 'Install the gem built locally'
   task :install => [:clean, :gem] do
-    sh "#{SUDO} gem install pkg/#{spec.full_name}.gem"
+    sh "gem install pkg/#{spec.full_name}.gem"
   end
-  
+
   desc "Uninstall version #{GitRemoteBranch::VERSION::STRING} of the gem"
   task :uninstall do
-    sh "#{SUDO} gem uninstall -v #{GitRemoteBranch::VERSION::STRING} -x #{GitRemoteBranch::NAME}"
+    sh "gem uninstall -v #{GitRemoteBranch::VERSION::STRING} -x #{GitRemoteBranch::NAME}"
+  end
+
+  desc "Build and publish the gem, tag the commit and push the tags in one command"
+  task :feeling_lucky => [:gem, :publish, :tag] do
+    sh push_tags_command
   end
-  
+
   if WINDOWS
     win_spec = spec.dup
     win_spec.platform = Gem::Platform::CURRENT
     win_spec.add_dependency( 'win32console', '~> 1.1' ) # Missing dependency in the 'colored' gem
-    
+
     desc "Generate the Windows version of the gem"
     namespace :windows do
       Rake::GemPackageTask.new(win_spec) do |p|

metadata

@@ -1,49 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git_remote_branch
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Mathieu Martin
 - Carl Mercier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: &70256987240960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         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.
+  prerelease: false
+  version_requirements: *70256987240960
+description: git_remote_branch is a learning tool to ease the interaction with remote
+  branches in simple situations.
 email: webmat@gmail.com
-executables: 
+executables:
 - grb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - bin/grb
 - CHANGELOG
 - Gemfile
@@ -76,44 +64,38 @@ files:
 - test/unit/param_reader_test.rb
 - test/unit/state_test.rb
 - vendor/capture_fu.rb
-has_rdoc: true
 homepage: http://github.com/webmat/git_remote_branch
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --exclude
 - lib
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1687953634532625560
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: grb
-rubygems_version: 1.3.9.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: git_remote_branch eases the interaction with remote branches
-test_files: 
+test_files:
 - test/functional/grb_test.rb
 - test/helpers/array_extensions.rb
 - test/helpers/constants.rb