jeweler 1.8.2 → 2.3.7

data/features/step_definitions/generator_steps.rb

@@ -18,7 +18,6 @@ Given /^I do not want bundler$/ do
   @use_bundler = false
 end
 
-
 Given /^I want bundler$/ do
   @use_bundler = true
 end
@@ -40,14 +39,13 @@ And /^I want rubyforge setup$/ do
 end
 
 Given /^I want to use yard instead of rdoc$/ do
-  @documentation_framework = "yard"
+  @documentation_framework = 'yard'
 end
 
 Given /^I want to use rdoc instead of yard$/ do
-  @documentation_framework = "rdoc"
+  @documentation_framework = 'rdoc'
 end
 
-
 Given /^I intend to test with (\w+)$/ do |testing_framework|
   @testing_framework = testing_framework.to_sym
 end
@@ -56,15 +54,12 @@ Given /^I have configured git sanely$/ do
   @user_email = 'bar@example.com'
   @user_name = 'foo'
   @github_user = 'technicalpickles'
-  @github_token = 'zomgtoken'
 
   require 'git'
-  Git.stubs(:global_config).
-        returns({
-          'user.name' => @user_name,
-          'user.email' => @user_email,
-          'github.user' => @github_user,
-          'github.token' => @github_token})
+  Git.stubs(:global_config)
+     .returns('user.name' => @user_name,
+              'user.email' => @user_email,
+              'github.user' => @github_user)
 end
 
 Given /^I set JEWELER_OPTS env variable to "(.*)"$/ do |val|
@@ -81,26 +76,21 @@ When /^I generate a (.*)project named '((?:\w|-|_)+)' that is '([^']*)' and desc
   @description = description
 
   testing_framework = testing_framework.squeeze.strip
-  unless testing_framework.blank?
-    @testing_framework = testing_framework.to_sym
-  end
+  @testing_framework = testing_framework.to_sym unless testing_framework.blank?
 
-
-  arguments = [ '--summary', @summary,
+  arguments = ['--summary', @summary,
                '--description', @description,
-                @use_cucumber ? '--cucumber' : nil,
-                @testing_framework ? "--#{@testing_framework}" : nil,
-                @use_rubyforge ? '--rubyforge' : nil,
-                @use_roodi ? '--roodi' : nil,
-                @use_reek ? '--reek' : nil,
-                case @use_bundler
-                when true then '--bundler'
-                when false then '--no-bundler'
-                else nil
-                end,
-                @documentation_framework ? "--#{@documentation_framework}" : nil,
-                "#{@working_dir}/#{@name}"].compact
-
+               @use_cucumber ? '--cucumber' : nil,
+               @testing_framework ? "--#{@testing_framework}" : nil,
+               @use_rubyforge ? '--rubyforge' : nil,
+               @use_roodi ? '--roodi' : nil,
+               @use_reek ? '--reek' : nil,
+               case @use_bundler
+               when true then '--bundler'
+               when false then '--no-bundler'
+               end,
+               @documentation_framework ? "--#{@documentation_framework}" : nil,
+               "#{@working_dir}/#{@name}"].compact
 
   @stdout = OutputCatcher.catch_out do
     Jeweler::Generator::Application.run! *arguments
@@ -112,28 +102,27 @@ end
 Then /^a directory named '(.*)' is created$/ do |directory|
   directory = File.join(@working_dir, directory)
 
-  assert File.exists?(directory), "#{directory} did not exist"
+  assert File.exist?(directory), "#{directory} did not exist"
   assert File.directory?(directory), "#{directory} is not a directory"
 end
 
-Then "cucumber directories are created" do
+Then 'cucumber directories are created' do
   step "a directory named 'the-perfect-gem/features' is created"
   step "a directory named 'the-perfect-gem/features/support' is created"
   step "a directory named 'the-perfect-gem/features/step_definitions' is created"
 end
 
-
 Then /^a file named '(.*)' is created$/ do |file|
   file = File.join(@working_dir, file)
 
-  assert File.exists?(file), "#{file} expected to exist, but did not"
+  assert File.exist?(file), "#{file} expected to exist, but did not"
   assert File.file?(file), "#{file} expected to be a file, but is not"
 end
 
 Then /^a file named '(.*)' is not created$/ do |file|
   file = File.join(@working_dir, file)
 
-  assert ! File.exists?(file), "#{file} expected to not exist, but did"
+  assert !File.exist?(file), "#{file} expected to not exist, but did"
 end
 
 Then /^a sane '.gitignore' is created$/ do
@@ -155,21 +144,21 @@ end
 Then /^Rakefile has '(.*)' for the (.*) (.*)$/ do |value, task_class, field|
   @rakefile_content ||= File.read(File.join(@working_dir, @name, 'Rakefile'))
   block_variable, task_block = yank_task_info(@rakefile_content, task_class)
-  #raise "Found in #{task_class}: #{block_variable.inspect}: #{task_block.inspect}"
+  # raise "Found in #{task_class}: #{block_variable.inspect}: #{task_block.inspect}"
 
   assert_match /#{block_variable}\.#{field} = (%Q\{|"|')#{Regexp.escape(value)}(\}|"|')/, task_block
 end
 
 Then /^Rakefile adds '(.*)' as a development dependency to Jeweler::Tasks$/ do |dependency|
   @rakefile_content ||= File.read(File.join(@working_dir, @name, 'Rakefile'))
-  block_variable, task_block = yank_task_info(@rakefile_content, "Jeweler::Tasks")
+  block_variable, task_block = yank_task_info(@rakefile_content, 'Jeweler::Tasks')
 
   assert_match /#{block_variable}\.add_development_dependency "#{dependency}"/, task_block
 end
 
 Then /^Rakefile does not add '(.*)' as a development dependency to Jeweler::Tasks$/ do |dependency|
   @rakefile_content ||= File.read(File.join(@working_dir, @name, 'Rakefile'))
-  block_variable, task_block = yank_task_info(@rakefile_content, "Jeweler::Tasks")
+  block_variable, task_block = yank_task_info(@rakefile_content, 'Jeweler::Tasks')
 
   assert_no_match /#{block_variable}\.add_development_dependency "#{dependency}"/, task_block
 end
@@ -188,7 +177,6 @@ Then /^Rakefile has '(.*)' in the Rcov::RcovTask rcov_opts$/ do |rcov_opts|
   assert_match "#{block_variable}.rcov_opts << '#{rcov_opts}'", @rakefile_content
 end
 
-
 Then /^'(.*)' contains '(.*)'$/ do |file, expected_string|
   contents = File.read(File.join(@working_dir, @name, file))
   assert_match expected_string, contents
@@ -204,7 +192,6 @@ Then /^'(.*)' mentions copyright belonging to me in the current year$/ do |file|
   step "'#{file}' mentions copyright belonging to me in #{current_year}"
 end
 
-
 Then /^LICENSE\.txt credits '(.*)'$/ do |copyright_holder|
   step "a file named 'the-perfect-gem/LICENSE.txt' is created"
   @license_content ||= File.read(File.join(@working_dir, @name, 'LICENSE.txt'))
@@ -216,36 +203,34 @@ Given /^it is the year (\d+)$/ do |year|
   Timecop.travel(time)
 end
 
-
 Then /^LICENSE\.txt has a copyright in the year (\d+)$/ do |year|
   step "a file named 'the-perfect-gem/LICENSE.txt' is created"
   @license_content ||= File.read(File.join(@working_dir, @name, 'LICENSE.txt'))
   assert_match year, @license_content
 end
 
-
 Then /^'(.*)' should define '(.*)' as a subclass of '(.*)'$/ do |file, class_name, superclass_name|
-  @test_content = File.read((File.join(@working_dir, @name, file)))
+  @test_content = File.read(File.join(@working_dir, @name, file))
 
   assert_match "class #{class_name} < #{superclass_name}", @test_content
 end
 
 Then /^'(.*)' should describe '(.*)'$/ do |file, describe_name|
-  @spec_content ||= File.read((File.join(@working_dir, @name, file)))
+  @spec_content ||= File.read(File.join(@working_dir, @name, file))
 
-  assert_match %Q{describe "#{describe_name}" do}, @spec_content
+  assert_match %(describe "#{describe_name}" do), @spec_content
 end
 
 Then /^'(.*)' should contextualize '(.*)'$/ do |file, describe_name|
-  @spec_content ||= File.read((File.join(@working_dir, @name, file)))
+  @spec_content ||= File.read(File.join(@working_dir, @name, file))
 
-  assert_match %Q{context "#{describe_name}" do}, @spec_content
+  assert_match %(context "#{describe_name}" do), @spec_content
 end
 
 Then /^'(.*)' should have tests for '(.*)'$/ do |file, describe_name|
-  @tests_content ||= File.read((File.join(@working_dir, @name, file)))
+  @tests_content ||= File.read(File.join(@working_dir, @name, file))
 
-  assert_match %Q{Shindo.tests("#{describe_name}") do}, @tests_content
+  assert_match %{Shindo.tests("#{describe_name}") do}, @tests_content
 end
 
 Then /^'(.*)' requires '(.*)'$/ do |file, lib|
@@ -278,11 +263,10 @@ Then /^Rakefile instantiates a (.*)$/ do |task_name|
   assert_match /#{task_name}/, content
 end
 
-
 Then /^'(.+?)' should autorun tests$/ do |test_helper|
   content = File.read(File.join(@working_dir, @name, test_helper))
 
-  assert_match "MiniTest::Unit.autorun", content
+  assert_match "require 'minitest/autorun'", content
 end
 
 Then /^cucumber world extends "(.*)"$/ do |module_to_extend|
@@ -290,15 +274,13 @@ Then /^cucumber world extends "(.*)"$/ do |module_to_extend|
   assert_match "World(#{module_to_extend})", content
 end
 
-
 Then /^'features\/support\/env\.rb' sets up features to use test\/unit assertions$/ do
-
 end
 
 Then /^'features\/support\/env\.rb' sets up features to use minitest assertions$/ do
   content = File.read(File.join(@working_dir, @name, 'features', 'support', 'env.rb'))
 
-  assert_match "world.extend(Mini::Test::Assertions)", content
+  assert_match 'world.extend(Mini::Test::Assertions)', content
 end
 
 Then /^git repository has '(.*)' remote$/ do |remote|
@@ -307,7 +289,7 @@ Then /^git repository has '(.*)' remote$/ do |remote|
   assert_equal 'origin', remote.name
 end
 
-Then /^git repository '(.*)' remote should be '(.*)'/ do |remote, remote_url|
+Then /^git repository '(.*)' remote should be '(.*)'/ do |remote, _remote_url|
   remote = @repo.remotes.first
 
   assert_equal 'git@github.com:technicalpickles/the-perfect-gem.git', remote.url
@@ -321,7 +303,7 @@ Then /^'(.*)' was checked in$/ do |file|
   status = @repo.status[file]
 
   assert_not_nil status, "wasn't able to get status for #{file}"
-  assert ! status.untracked, "#{file} was untracked"
+  assert !status.untracked, "#{file} was untracked"
   assert_nil status.type, "#{file} had a type. it should have been nil"
 end
 
@@ -334,7 +316,6 @@ Then /^Rakefile has "(.*)" as the default task$/ do |task|
   assert_match "task :default => :#{task}", @rakefile_content
 end
 
-
 After do
   ENV['JEWELER_OPTS'] = nil
 end
@@ -358,15 +339,14 @@ end
 Then /^'Gemfile' has a development dependency on the current version of jeweler$/ do
   @gemfile_content ||= File.read(File.join(@working_dir, @name, 'Gemfile'))
   group_block = yank_group_info(@gemfile_content, 'development')
-  
-  assert_match %Q{gem "jeweler", "~> #{Jeweler::Version::STRING}"}, group_block
-end
 
+  assert_match %(gem "jeweler", "~> #{Jeweler::Version::STRING}"), group_block
+end
 
 Then /^'(.*)' sets up bundler using the default and development groups$/ do |file|
   content = File.read(File.join(@working_dir, @name, file))
 
-  assert_match "Bundler.setup(:default, :development)", content
+  assert_match 'Bundler.setup(:default, :development)', content
 end
 
 Then /^'(.*)' does not setup bundler$/ do |file|
@@ -375,15 +355,13 @@ Then /^'(.*)' does not setup bundler$/ do |file|
   assert_no_match /Bundler\.setup/, content
 end
 
-Then /^'Gemfile' uses the (.*) source$/ do |source|
+Then /^'Gemfile' uses the (.*) source$/ do |_source|
   content = File.read(File.join(@working_dir, @name, 'Gemfile'))
 
-  assert_match %Q{source "http://rubygems.org"}, content
+  assert_match %(source "https://rubygems.org"), content
 end
 
-
-Then /^Rakefile has a magic comment for UTF\-(\d+)$/ do |arg1|
+Then /^Rakefile has a magic comment for UTF\-(\d+)$/ do |_arg1|
   content = File.read(File.join(@working_dir, @name, 'Rakefile'))
-  assert_match "# encoding: utf-8", content
+  assert_match '# encoding: utf-8', content
 end
-

data/features/step_definitions/task_steps.rb

@@ -1,6 +1,5 @@
 Then /^I can gem install "([^"]+)"$/ do |gem_path|
   @stdout = `cd #{@working_dir}; gem install --install-dir #{@working_dir}/gem-install-dir --no-ri --no-rdoc #{gem_path} 2>&1`
   assert_no_match /ERROR/, @stdout
-  assert $?.exited?
+  assert $CHILD_STATUS.exited?
 end
-

data/features/support/env.rb

@@ -1,25 +1,40 @@
+ENV.delete_if { |name, _| name.start_with?('GIT') }
 require 'bundler'
 begin
-  Bundler.setup(:default, :test)
+  Bundler.setup(:default, :xzibit, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'jeweler'
 require 'mocha'
+require 'mocha/api'
+World(Mocha::API)
+
+Before do
+  mocha_setup
+end
+
+After do
+  begin
+    mocha_verify
+  ensure
+    mocha_teardown
+  end
+end
+
 require 'output_catcher'
 require 'timecop'
-require 'ruby-debug'
 require 'active_support'
+require 'active_support/core_ext/object/blank'
 
 require 'test/unit/assertions'
 World(Test::Unit::Assertions)
 
-require 'construct'
-World(Construct::Helpers)
+require 'test_construct'
+World(TestConstruct::Helpers)
 
 def yank_task_info(content, task)
   if content =~ /#{Regexp.escape(task)}.new(\(.*\))? do \|(.*?)\|(.*?)^end$/m
@@ -28,9 +43,7 @@ def yank_task_info(content, task)
 end
 
 def yank_group_info(content, group)
-  if content =~ /group :#{group} do(.*?)end/m
-    $1
-  end
+  $1 if content =~ /group :#{group} do(.*?)end/m
 end
 
 def fixture_dir

data/jeweler.gemspec

@@ -2,24 +2,29 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: jeweler 2.3.7 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "jeweler"
-  s.version = "1.8.2"
+  s.name = "jeweler".freeze
+  s.version = "2.3.7"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Josh Nichols"]
-  s.date = "2012-01-25"
-  s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-  s.email = "josh@technicalpickles.com"
-  s.executables = ["jeweler"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Fred Mitchell".freeze, "Josh Nichols".freeze, "Yusuke Murata".freeze]
+  s.date = "2017-06-24"
+  s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub".freeze
+  s.email = ["fred.mitchell@gmx.de".freeze, "fred.mitchell@gmx.com".freeze, "info@muratayusuke.com".freeze]
+  s.executables = ["jeweler".freeze]
   s.extra_rdoc_files = [
     "ChangeLog.markdown",
     "LICENSE.txt",
-    "README.markdown"
+    "README.markdown",
+    "README.org"
   ]
   s.files = [
+    ".coveralls.yml",
     ".document",
+    ".semver",
     ".travis.yml",
     ".yardopts",
     "ChangeLog.markdown",
@@ -27,6 +32,7 @@ Gem::Specification.new do |s|
     "Gemfile.lock",
     "LICENSE.txt",
     "README.markdown",
+    "README.org",
     "Rakefile",
     "bin/jeweler",
     "features/generator/cucumber.feature",
@@ -114,6 +120,7 @@ Gem::Specification.new do |s|
     "lib/jeweler/templates/shindo/helper.rb",
     "lib/jeweler/templates/shoulda/flunking.rb",
     "lib/jeweler/templates/shoulda/helper.rb",
+    "lib/jeweler/templates/simplecov.erb",
     "lib/jeweler/templates/testspec/flunking.rb",
     "lib/jeweler/templates/testspec/helper.rb",
     "lib/jeweler/templates/testunit/flunking.rb",
@@ -180,49 +187,61 @@ Gem::Specification.new do |s|
     "test/test_helper.rb",
     "test/test_jeweler.rb"
   ]
-  s.homepage = "http://github.com/technicalpickles/jeweler"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Opinionated tool for creating and managing RubyGem projects"
+  s.homepage = "http://github.com/technicalpickles/jeweler".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2.0".freeze)
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "Opinionated tool for creating and managing RubyGem projects".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7.4"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, ["~> 1.1.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<git>.freeze, [">= 1.2.5"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.5.10"])
+      s.add_runtime_dependency(%q<github_api>.freeze, ["~> 0.16.0"])
+      s.add_runtime_dependency(%q<highline>.freeze, [">= 1.6.15"])
+      s.add_runtime_dependency(%q<bundler>.freeze, [">= 1"])
+      s.add_runtime_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<builder>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<semver2>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<psych>.freeze, ["~> 2.2"])
+      s.add_development_dependency(%q<yard>.freeze, [">= 0.8.5"])
+      s.add_development_dependency(%q<bluecloth>.freeze, [">= 0"])
+      s.add_development_dependency(%q<cucumber>.freeze, [">= 1.1.4"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<git>, [">= 1.2.5"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.7.4"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<cucumber>, ["~> 1.1.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<git>.freeze, [">= 1.2.5"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 1.5.10"])
+      s.add_dependency(%q<github_api>.freeze, ["~> 0.16.0"])
+      s.add_dependency(%q<highline>.freeze, [">= 1.6.15"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<builder>.freeze, [">= 0"])
+      s.add_dependency(%q<semver2>.freeze, [">= 0"])
+      s.add_dependency(%q<psych>.freeze, ["~> 2.2"])
+      s.add_dependency(%q<yard>.freeze, [">= 0.8.5"])
+      s.add_dependency(%q<bluecloth>.freeze, [">= 0"])
+      s.add_dependency(%q<cucumber>.freeze, [">= 1.1.4"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<git>, [">= 1.2.5"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.7.4"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<cucumber>, ["~> 1.1.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<git>.freeze, [">= 1.2.5"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 1.5.10"])
+    s.add_dependency(%q<github_api>.freeze, ["~> 0.16.0"])
+    s.add_dependency(%q<highline>.freeze, [">= 1.6.15"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<builder>.freeze, [">= 0"])
+    s.add_dependency(%q<semver2>.freeze, [">= 0"])
+    s.add_dependency(%q<psych>.freeze, ["~> 2.2"])
+    s.add_dependency(%q<yard>.freeze, [">= 0.8.5"])
+    s.add_dependency(%q<bluecloth>.freeze, [">= 0"])
+    s.add_dependency(%q<cucumber>.freeze, [">= 1.1.4"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

data/lib/jeweler/commands/build_gem.rb

@@ -12,8 +12,12 @@ class Jeweler
 
         gemspec = gemspec_helper.parse
 
-        require 'rubygems/builder'
-        gem_file_name = Gem::Builder.new(gemspec).build
+        if Gem::Version.new(`gem -v`) >= Gem::Version.new('2.0.0.a')
+          gem_file_name = Gem::Package.build(gemspec)
+        else
+          require 'rubygems/builder'
+          gem_file_name = Gem::Builder.new(gemspec).build
+        end
 
         pkg_dir = File.join(base_dir, 'pkg')
         file_utils.mkdir_p pkg_dir

data/lib/jeweler/commands/check_dependencies.rb

@@ -13,12 +13,12 @@ class Jeweler
         if missing_dependencies.empty?
           puts "#{type || 'All'} dependencies seem to be installed."
         else
-          puts "Missing some dependencies. Install them with the following commands:"
+          puts 'Missing some dependencies. Install them with the following commands:'
           missing_dependencies.each do |dependency|
-            puts %Q{\tgem install #{dependency.name} --version "#{dependency.requirement.to_s}"}
+            puts %(\tgem install #{dependency.name} --version "#{dependency.requirement}")
           end
 
-          abort "Run the specified gem commands before trying to run this again: #{$0} #{ARGV.join(' ')}"
+          abort "Run the specified gem commands before trying to run this again: {$PROGRAM_NAME} #{ARGV.join(' ')}"
         end
       end
 

data/lib/jeweler/commands/install_gem.rb

@@ -13,7 +13,7 @@ class Jeweler
         command = "#{gem_command} install #{gemspec_helper.gem_path}"
         output.puts "Executing #{command.inspect}:"
 
-        sh command # TODO where does sh actually come from!? - rake, apparently
+        sh command # TODO: where does sh actually come from!? - rake, apparently
       end
 
       def gem_command

data/lib/jeweler/commands/release_gemspec.rb

@@ -3,7 +3,8 @@ require 'pathname'
 class Jeweler
   module Commands
     class ReleaseGemspec
-      attr_accessor :gemspec, :version, :repo, :output, :gemspec_helper, :base_dir
+      attr_accessor :gemspec, :version, :repo, :output, :base_dir
+      attr_writer :gemspec_helper
 
       def initialize(attributes = {})
         self.output = $stdout
@@ -13,24 +14,29 @@ class Jeweler
         end
       end
 
-      def run
+      def run(args = {})
+        remote = args[:remote] || 'origin'
+        branch = args[:branch] || 'master'
+        local_branch = args[:local_branch] || branch
+        remote_branch = args[:remote_branch] || branch
+
         unless clean_staging_area?
-          system "git status"
-          raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
+          system 'git status'
+          raise 'Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above.'
         end
 
-        repo.checkout('master')
+        repo.checkout(local_branch)
 
         regenerate_gemspec!
         commit_gemspec! if gemspec_changed?
 
-        output.puts "Pushing master to origin"
-        repo.push
+        output.puts "Pushing #{local_branch} to #{remote}"
+        repo.push(remote, "#{local_branch}:#{remote_branch}")
       end
 
       def clean_staging_area?
         # surprisingly simpler than ruby-git
-        `git ls-files --deleted --modified --others --exclude-standard` == ""
+        `git ls-files --deleted --modified --others --exclude-standard` == ''
       end
 
       def commit_gemspec!
@@ -51,14 +57,11 @@ class Jeweler
       end
 
       def gemspec_helper
-        @gemspec_helper ||= Jeweler::GemSpecHelper.new(self.gemspec, self.base_dir)
+        @gemspec_helper ||= Jeweler::GemSpecHelper.new(gemspec, base_dir)
       end
 
       def working_subdir
-        return @working_subdir if @working_subdir
-        cwd = base_dir_path
-        @working_subdir = cwd.relative_path_from(Pathname.new(repo.dir.path))
-        @working_subdir
+        @working_subdir ||= base_dir_path.relative_path_from(Pathname.new(repo.dir.path))
       end
 
       def base_dir_path
@@ -66,7 +69,7 @@ class Jeweler
       end
 
       def self.build_for(jeweler)
-        command = self.new
+        command = new
 
         command.base_dir = jeweler.base_dir
         command.gemspec = jeweler.gemspec