jeweler 2.1.1 → 2.1.2

data/test/jeweler/test_tasks.rb

@@ -6,8 +6,8 @@ class TestTasks < Test::Unit::TestCase
 
   context 'instantiating Jeweler::Tasks' do
     setup do
-      @gemspec_building_block = lambda {|gemspec|}
-      @tasks = Jeweler::Tasks.new &@gemspec_building_block
+      @gemspec_building_block = ->(gemspec) {}
+      @tasks = Jeweler::Tasks.new(&@gemspec_building_block)
     end
 
     teardown do
@@ -45,6 +45,5 @@ class TestTasks < Test::Unit::TestCase
       @tasks = Jeweler::Tasks.new { |s| spec = s }
       assert_not_nil @tasks.jeweler.gemspec
     end
-
   end
 end

data/test/jeweler/test_version_helper.rb

@@ -1,10 +1,9 @@
 require 'test_helper'
 
 class TestVersionHelper < Test::Unit::TestCase
-
   VERSION_TMP_DIR = File.dirname(__FILE__) + '/version_tmp'
 
-  def self.should_have_version(major, minor, patch, build=nil)
+  def self.should_have_version(major, minor, patch, build = nil)
     should "have major version #{major}" do
       assert_equal major, @version_helper.major
     end
@@ -26,14 +25,13 @@ class TestVersionHelper < Test::Unit::TestCase
       assert_equal version_s, @version_helper.to_s
     end
 
-    #version_hash = {:major => major, :minor => minor, :patch => patch}
-    #should "render hash as #{version_hash.inspect}" do
-      #assert_equal version_hash, @version_helper.to_hash
-    #end
-    
+    # version_hash = {:major => major, :minor => minor, :patch => patch}
+    # should "render hash as #{version_hash.inspect}" do
+    # assert_equal version_hash, @version_helper.to_hash
+    # end
   end
 
-  context "VERSION.yml with 3.5.4" do
+  context 'VERSION.yml with 3.5.4' do
     setup do
       FileUtils.rm_rf VERSION_TMP_DIR
       FileUtils.mkdir_p VERSION_TMP_DIR
@@ -45,23 +43,23 @@ class TestVersionHelper < Test::Unit::TestCase
 
     should_have_version 3, 5, 4
 
-    context "bumping major version" do
+    context 'bumping major version' do
       setup { @version_helper.bump_major }
       should_have_version 4, 0, 0
     end
 
-    context "bumping the minor version" do
+    context 'bumping the minor version' do
       setup { @version_helper.bump_minor }
       should_have_version 3, 6, 0
     end
 
-    context "bumping the patch version" do
+    context 'bumping the patch version' do
       setup { @version_helper.bump_patch }
       should_have_version 3, 5, 5
     end
   end
 
-  context "VERSION.yml with 3.5.4.a1" do
+  context 'VERSION.yml with 3.5.4.a1' do
     setup do
       FileUtils.rm_rf VERSION_TMP_DIR
       FileUtils.mkdir_p VERSION_TMP_DIR
@@ -73,23 +71,23 @@ class TestVersionHelper < Test::Unit::TestCase
 
     should_have_version 3, 5, 4, 'a1'
 
-    context "bumping major version" do
+    context 'bumping major version' do
       setup { @version_helper.bump_major }
       should_have_version 4, 0, 0, nil
     end
 
-    context "bumping the minor version" do
+    context 'bumping the minor version' do
       setup { @version_helper.bump_minor }
       should_have_version 3, 6, 0, nil
     end
 
-    context "bumping the patch version" do
+    context 'bumping the patch version' do
       setup { @version_helper.bump_patch }
       should_have_version 3, 5, 5, nil
     end
   end
 
-  context "VERSION with 3.5.4" do
+  context 'VERSION with 3.5.4' do
     setup do
       FileUtils.rm_rf VERSION_TMP_DIR
       FileUtils.mkdir_p VERSION_TMP_DIR
@@ -101,23 +99,23 @@ class TestVersionHelper < Test::Unit::TestCase
 
     should_have_version 3, 5, 4
 
-    context "bumping major version" do
+    context 'bumping major version' do
       setup { @version_helper.bump_major }
       should_have_version 4, 0, 0
     end
 
-    context "bumping the minor version" do
+    context 'bumping the minor version' do
       setup { @version_helper.bump_minor }
       should_have_version 3, 6, 0
     end
 
-    context "bumping the patch version" do
+    context 'bumping the patch version' do
       setup { @version_helper.bump_patch }
       should_have_version 3, 5, 5
     end
   end
 
-  context "VERSION with 3.5.4.a1" do
+  context 'VERSION with 3.5.4.a1' do
     setup do
       FileUtils.rm_rf VERSION_TMP_DIR
       FileUtils.mkdir_p VERSION_TMP_DIR
@@ -129,23 +127,23 @@ class TestVersionHelper < Test::Unit::TestCase
 
     should_have_version 3, 5, 4, 'a1'
 
-    context "bumping major version" do
+    context 'bumping major version' do
       setup { @version_helper.bump_major }
       should_have_version 4, 0, 0, nil
     end
 
-    context "bumping the minor version" do
+    context 'bumping the minor version' do
       setup { @version_helper.bump_minor }
       should_have_version 3, 6, 0, nil
     end
 
-    context "bumping the patch version" do
+    context 'bumping the patch version' do
       setup { @version_helper.bump_patch }
       should_have_version 3, 5, 5, nil
     end
   end
 
-  context "Non-existant VERSION.yml" do
+  context 'Non-existant VERSION.yml' do
     setup do
       FileUtils.rm_rf VERSION_TMP_DIR
       FileUtils.mkdir_p VERSION_TMP_DIR
@@ -157,30 +155,30 @@ class TestVersionHelper < Test::Unit::TestCase
       end
     end
 
-    context "setting an initial version" do
+    context 'setting an initial version' do
       setup do
         @version_helper = Jeweler::VersionHelper.new(VERSION_TMP_DIR)
         @version_helper.update_to 0, 0, 1
       end
 
       should_have_version 0, 0, 1
-      should "not create VERSION.yml" do
-        assert ! File.exists?(File.join(VERSION_TMP_DIR, 'VERSION.yml'))
+      should 'not create VERSION.yml' do
+        assert !File.exist?(File.join(VERSION_TMP_DIR, 'VERSION.yml'))
       end
-      should "not create VERSION" do
-        assert ! File.exists?(File.join(VERSION_TMP_DIR, 'VERSION'))
+      should 'not create VERSION' do
+        assert !File.exist?(File.join(VERSION_TMP_DIR, 'VERSION'))
       end
 
-      context "outputting" do
+      context 'outputting' do
         setup do
           @version_helper.write
         end
 
-        should "create VERSION" do
-          assert File.exists?(File.join(VERSION_TMP_DIR, 'VERSION'))
+        should 'create VERSION' do
+          assert File.exist?(File.join(VERSION_TMP_DIR, 'VERSION'))
         end
 
-        context "re-reading VERSION" do
+        context 're-reading VERSION' do
           setup do
             @version_helper = Jeweler::VersionHelper.new(VERSION_TMP_DIR)
           end
@@ -191,7 +189,7 @@ class TestVersionHelper < Test::Unit::TestCase
     end
   end
 
-  def build_version_yml(base_dir, major, minor, patch, build=nil)
+  def build_version_yml(base_dir, major, minor, patch, build = nil)
     version_path = File.join(base_dir, 'VERSION.yml')
 
     File.open(version_path, 'w+') do |f|
@@ -205,7 +203,7 @@ class TestVersionHelper < Test::Unit::TestCase
     end
   end
 
-  def build_version_plaintext(base_dir, major, minor, patch, build=nil)
+  def build_version_plaintext(base_dir, major, minor, patch, build = nil)
     version_path = File.join(base_dir, 'VERSION')
     File.open(version_path, 'w+') do |f|
       f.puts [major, minor, patch, build].compact.join('.')

data/test/shoulda_macros/jeweler_macros.rb

@@ -1,29 +1,29 @@
 class Test::Unit::TestCase
   class << self
     def should_have_major_version(version)
-      should "have major version of #{version}" do 
+      should "have major version of #{version}" do
         assert_equal version, @jeweler.major_version
       end
     end
-    
+
     def should_have_minor_version(version)
       should "have minor version of #{version}" do
         assert_equal version, @jeweler.minor_version
       end
     end
-    
+
     def should_have_patch_version(version)
       should "have patch version of #{version}" do
         assert_equal version, @jeweler.patch_version
       end
     end
-    
+
     def should_be_version(version)
       should "be version #{version}" do
         assert_equal version, @jeweler.version
       end
     end
-    
+
     def should_bump_version(major, minor, patch)
       version = "#{major}.#{minor}.#{patch}"
       should_have_major_version major

data/test/test_helper.rb

@@ -1,23 +1,24 @@
-require 'test/unit'
 require 'rubygems'
 
 require 'bundler'
-require 'coveralls'
-Coveralls.wear!
-
 begin
   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
+require 'test/unit/rr'
+require 'coveralls'
+Coveralls.wear!
+
+# prevent GIT_* environment leakage from affecting tests
+ENV.delete_if { |name, _| name.start_with?('GIT') }
 
 require 'rake'
 require 'shoulda'
-require 'rr'
-#require 'redgreen'
-require 'construct'
+# require 'redgreen'
+require 'test_construct'
 require 'git'
 require 'time'
 
@@ -26,7 +27,7 @@ require 'jeweler'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'shoulda_macros/jeweler_macros'
 
-TMP_DIR = '/tmp/jeweler_test'
+TMP_DIR = '/tmp/jeweler_test'.freeze
 FIXTURE_DIR = File.expand_path('../fixtures', __FILE__)
 
 class RubyForgeStub
@@ -38,8 +39,7 @@ class RubyForgeStub
 end
 
 class Test::Unit::TestCase
-  include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
-  include Construct::Helpers
+  include TestConstruct::Helpers
 
   def tmp_dir
     TMP_DIR
@@ -59,12 +59,12 @@ class Test::Unit::TestCase
 
   def build_spec(*files)
     Gem::Specification.new do |s|
-      s.name = "bar"
-      s.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-      s.email = "josh@technicalpickles.com"
-      s.homepage = "http://github.com/technicalpickles/jeweler"
-      s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-      s.authors = ["Josh Nichols"]
+      s.name = 'bar'
+      s.summary = 'Simple and opinionated helper for creating Rubygem projects on GitHub'
+      s.email = 'josh@technicalpickles.com'
+      s.homepage = 'http://github.com/technicalpickles/jeweler'
+      s.description = 'Simple and opinionated helper for creating Rubygem projects on GitHub'
+      s.authors = ['Josh Nichols']
       s.files = FileList[*files] unless files.empty?
       s.version = '0.1.1'
     end
@@ -86,7 +86,7 @@ class Test::Unit::TestCase
         end
       end
 
-      context "", &block
+      context '', &block
     end
   end
 
@@ -117,18 +117,17 @@ class Test::Unit::TestCase
 
         if @command.respond_to? :repo
           @repo = Object.new
-          @command.repo = @repo 
+          @command.repo = @repo
         end
       end
 
-      context "", &block
+      context '', &block
     end
   end
 
   def self.build_command_context(description, &block)
     context description do
       setup do
-
         @repo           = Object.new
         @version_helper = Object.new
         @gemspec        = Object.new
@@ -149,16 +148,15 @@ class Test::Unit::TestCase
         stub(@jeweler).output         { @output }
         stub(@jeweler).gemspec_helper { @gemspec_helper }
         stub(@jeweler).base_dir       { @base_dir }
-        stub(@jeweler).rubyforge    { @rubyforge }
+        stub(@jeweler).rubyforge { @rubyforge }
       end
 
-      context "", &block
+      context '', &block
     end
-
   end
 
   def stub_git_config(options = {})
-    stub(Git).global_config() { options }
+    stub(Git).global_config { options }
   end
 
   def set_default_git_config

data/test/test_jeweler.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class TestJeweler < Test::Unit::TestCase
-
   def build_jeweler(base_dir = nil)
     base_dir ||= git_dir_path
     FileUtils.mkdir_p base_dir
@@ -18,7 +17,6 @@ class TestJeweler < Test::Unit::TestCase
   end
 
   def build_git_dir
-
     FileUtils.mkdir_p git_dir_path
     Dir.chdir git_dir_path do
       Git.init
@@ -29,31 +27,31 @@ class TestJeweler < Test::Unit::TestCase
     FileUtils.mkdir_p non_git_dir_path
   end
 
-  should "raise an error if a nil gemspec is given" do
+  should 'raise an error if a nil gemspec is given' do
     assert_raises Jeweler::GemspecError do
       Jeweler.new(nil)
     end
   end
 
-  should "know if it is in a git repo" do
+  should 'know if it is in a git repo' do
     build_git_dir
 
     assert build_jeweler(git_dir_path).in_git_repo?
   end
 
-  should "know if it is not in a git repo" do
+  should 'know if it is not in a git repo' do
     build_non_git_dir
 
     jeweler = build_jeweler(non_git_dir_path)
-    assert ! jeweler.in_git_repo?, "jeweler doesn't know that #{jeweler.base_dir} is not a git repository"
+    assert !jeweler.in_git_repo?, "jeweler doesn't know that #{jeweler.base_dir} is not a git repository"
   end
 
-  should "find the base repo" do
+  should 'find the base repo' do
     jeweler = build_jeweler(File.dirname(File.expand_path(__FILE__)))
     assert_equal File.dirname(File.dirname(File.expand_path(__FILE__))), jeweler.git_base_dir
   end
 
-  should "build and run write gemspec command when writing gemspec" do
+  should 'build and run write gemspec command when writing gemspec' do
     jeweler = build_jeweler
 
     command = Object.new
@@ -64,7 +62,7 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.write_gemspec
   end
 
-  should "build and run validate gemspec command when validating gemspec" do
+  should 'build and run validate gemspec command when validating gemspec' do
     jeweler = build_jeweler
 
     command = Object.new
@@ -75,7 +73,7 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.validate_gemspec
   end
 
-  should "build and run build gem command when building gem" do
+  should 'build and run build gem command when building gem' do
     jeweler = build_jeweler
 
     command = Object.new
@@ -86,7 +84,7 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.build_gem
   end
 
-  should "build and run build gem command when installing gem" do
+  should 'build and run build gem command when installing gem' do
     jeweler = build_jeweler
 
     command = Object.new
@@ -97,7 +95,7 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.install_gem
   end
 
-  should "build and run bump major version command when bumping major version" do
+  should 'build and run bump major version command when bumping major version' do
     jeweler = build_jeweler
 
     command = Object.new
@@ -108,7 +106,7 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.bump_major_version
   end
 
-  should "build and run bump minor version command when bumping minor version" do
+  should 'build and run bump minor version command when bumping minor version' do
     jeweler = build_jeweler
 
     command = Object.new
@@ -119,22 +117,22 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.bump_minor_version
   end
 
-  should "build and run write version command when writing version" do
+  should 'build and run write version command when writing version' do
     jeweler = build_jeweler
 
     command = Object.new
     mock(command).run
-    mock(command).major=(1)
-    mock(command).minor=(5)
-    mock(command).patch=(2)
-    mock(command).build=('a1')
+    mock(command).major = 1
+    mock(command).minor = 5
+    mock(command).patch = 2
+    mock(command).build = 'a1'
 
     mock(Jeweler::Commands::Version::Write).build_for(jeweler) { command }
 
     jeweler.write_version(1, 5, 2, 'a1')
   end
 
-  should "build and run release to github command when running release_gemspec" do
+  should 'build and run release to github command when running release_gemspec' do
     jeweler = build_jeweler
     args = {}
 
@@ -146,7 +144,7 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.release_gemspec(args)
   end
 
-  should "build and run release to git command when running release_to_git" do
+  should 'build and run release to git command when running release_to_git' do
     jeweler = build_jeweler
     args = {}
 
@@ -158,20 +156,19 @@ class TestJeweler < Test::Unit::TestCase
     jeweler.release_to_git(args)
   end
 
-  should "respond to gemspec_helper" do
+  should 'respond to gemspec_helper' do
     assert_respond_to build_jeweler, :gemspec_helper
   end
 
-  should "respond to version_helper" do
+  should 'respond to version_helper' do
     assert_respond_to build_jeweler, :version_helper
   end
 
-  should "respond to repo" do
+  should 'respond to repo' do
     assert_respond_to build_jeweler, :repo
   end
 
-  should "respond to commit" do
+  should 'respond to commit' do
     assert_respond_to build_jeweler, :commit
   end
-
 end