git_remote_branch 0.3.2 → 0.3.3

data/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+pkg
+coverage
+test_runs
+test_runs/**/*
+rdoc
+Gemfile.lock
+*~

data/Gemfile

@@ -1,10 +1,2 @@
 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
+gemspec

data/bin/grb

@@ -2,6 +2,8 @@
 
 # Check out the README (or try 'grb help') before you screw up your repos ;-)
 
+require 'rubygems'
+
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 require File.expand_path('../lib/git_remote_branch', File.dirname(THIS_FILE))
 

data/git_remote_branch.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'version'
+
+Gem::Specification.new do |s|
+  s.name        = GitRemoteBranch::NAME
+  s.version     = GitRemoteBranch::VERSION::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Mathieu Martin", "Carl Mercier"]
+  s.email       = "webmat@gmail.com"
+  s.homepage    = "http://github.com/webmat/git_remote_branch"
+  s.summary     = %Q{git_remote_branch eases the interaction with remote branches}
+  s.description = %Q{git_remote_branch is a learning tool to ease the interaction with remote branches in simple situations.}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rdoc"
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'mocha'
+  s.add_dependency 'rainbow'
+end

data/lib/git_remote_branch.rb

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

data/lib/version.rb

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

data/tasks/gem.rake

@@ -1,87 +1,58 @@
 require 'yaml'
 
-require 'rubygems/package_task'
+gem_name  = GitRemoteBranch::NAME
+version   = GitRemoteBranch::VERSION::STRING
+gem_file  = "#{gem_name}-#{version}.gem"
 
-spec = Gem::Specification.new do |s|
-  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."
-
-  s.authors               = ['Mathieu Martin', 'Carl Mercier']
-  s.email                 = "webmat@gmail.com"
-  s.homepage              = "http://github.com/webmat/git_remote_branch"
-  s.rubyforge_project     = 'grb'
-
-  s.has_rdoc              = true
-  s.extra_rdoc_files     << 'README.rdoc'
-  s.rdoc_options         << '--main' << 'README.rdoc' << '--exclude' << 'lib'
+tag_command = "git tag -m 'Tagging version #{version}' -a v#{version}"
+push_tags_command = 'git push --tags'
 
-  s.test_files            = Dir['test/**/*'].reject{|f| f =~ /test_runs/}
-  s.files                 = Dir['**/*'].reject{|f| f =~ /\Apkg|\Acoverage|\Ardoc|test_runs|\.gemspec\Z/}
+task :tag_warn do
+  puts <<-TAG
+#{"*" * 40}
+Don't forget to tag the release:
 
-  s.executable            = 'grb'
-  s.bindir                = "bin"
-  s.require_path          = "lib"
+  #{tag_command}
+  #{push_tags_command}
+or
+  run rake tag tag:push
 
-  s.add_dependency( 'rainbow', '>= 1.0.1' )
+#{"*" * 40}
+TAG
 end
 
-#Creates clobber_package, gem, package and repackage tasks
-#Note on clobber_package: fortunately, this will clobber the CODE package
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
+task :tag do
+  sh tag_command
+  puts "Upload tags to repo with '#{push_tags_command}'"
 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:",
-        '',
-        "  " + TAG_COMMAND,
-        '',
-        "or run rake tag",
-        "*" * 40
+namespace :tag do
+  task :push do
+    sh push_tags_command
+  end
 end
-task :tag do
-  sh TAG_COMMAND
-  puts "Upload tags to repo with '#{push_tags_command}'"
+
+desc "Build gem and put it in pkg/"
+task :gem => [:test, :tag_warn] do
+  sh "gem build #{gem_name}.gemspec && mv #{gem_file} pkg/"
 end
-task :gem => :tag_warn
 
 namespace :gem do
   desc 'Upload gem to rubygems.org'
   task :publish => :gem do
-    sh "gem push pkg/#{spec.full_name}.gem"
+    sh "gem push pkg/#{gem_file}"
   end
 
-  desc 'Install the gem built locally'
-  task :install => [:clean, :gem] do
-    sh "gem install pkg/#{spec.full_name}.gem"
+  desc 'Install the last gem built locally'
+  task :install do
+    sh "gem install pkg/#{gem_file}"
   end
 
-  desc "Uninstall version #{GitRemoteBranch::VERSION::STRING} of the gem"
+  desc "Uninstall version #{version} of the gem"
   task :uninstall do
-    sh "gem uninstall -v #{GitRemoteBranch::VERSION::STRING} -x #{GitRemoteBranch::NAME}"
+    sh "gem uninstall -v #{version} -x #{gem_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|
-        p.gem_spec = win_spec
-      end
-    end
-  end
+  task :feeling_lucky => [:gem, :publish, :tag, 'tag:push']
 end

metadata

@@ -1,50 +1,131 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: git_remote_branch
-version: !ruby/object:Gem::Version
-  version: 0.3.2
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 3
+  version: 0.3.3
 platform: ruby
-authors:
+authors: 
 - Mathieu Martin
 - Carl Mercier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: &70256987240960 !ruby/object:Gem::Requirement
+
+date: 2011-12-14 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  type: :development
+  prerelease: false
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rdoc
+  type: :development
+  prerelease: false
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit
+  type: :development
+  prerelease: false
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda
+  type: :development
+  prerelease: false
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: mocha
+  type: :development
+  prerelease: false
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rainbow
   type: :runtime
   prerelease: false
-  version_requirements: *70256987240960
-description: git_remote_branch is a learning tool to ease the interaction with remote
-  branches in simple situations.
+  requirement: *id006
+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:
-- README.rdoc
-files:
-- bin/grb
+
+extra_rdoc_files: []
+
+files: 
+- .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
+- LICENSE
+- README.rdoc
+- Rakefile
+- bin/grb
+- git_remote_branch.gemspec
 - lib/constants.rb
 - lib/git_remote_branch.rb
 - lib/monkey_patches.rb
 - lib/param_reader.rb
 - lib/state.rb
 - lib/version.rb
-- LICENSE
-- Rakefile
-- README.rdoc
 - tasks/gem.rake
 - tasks/rdoc.rake
 - tasks/test.rake
@@ -64,38 +145,41 @@ 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:
-- --main
-- README.rdoc
-- --exclude
-- lib
-require_paths:
+rdoc_options: []
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -1687953634532625560
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: grb
-rubygems_version: 1.8.10
+
+rubyforge_project: 
+rubygems_version: 1.3.9.1
 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

data/Gemfile.lock

@@ -1,24 +0,0 @@
-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