jeweler 1.8.2 → 2.3.7

data/test/jeweler/commands/test_build_gem.rb

@@ -1,75 +1,78 @@
 require 'test_helper'
+require 'jeweler/commands/build_gem'
 
 class Jeweler
   module Commands
     class TestBuildGem < Test::Unit::TestCase
-
-      context "after running without a version" do
+      context 'after running without a version' do
         setup do
           initialize_build_gem_environment
           @command.run
         end
 
-        should "check if the gemspec helper has a version" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.has_version? }
+        should 'check if the gemspec helper has a version' do
+          assert_received(@gemspec_helper, &:has_version?)
         end
 
         should "update version of gemspec helper if the gemspec doesn't have a version" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.update_version(@version_helper)}
+          assert_received(@gemspec_helper) { |gemspec_helper| gemspec_helper.update_version(@version_helper) }
         end
 
         should "call gemspec helper's parse" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.parse }
+          assert_received(@gemspec_helper, &:parse)
         end
 
-        should "build from parsed gemspec" do
-          assert_received(Gem::Builder) {|builder_class| builder_class.new(@gemspec) }
-          assert_received(@builder) {|builder| builder.build }
+        should 'build from parsed gemspec' do
+          if Gem::Version.new(`gem -v`) >= Gem::Version.new('2.0.0.a')
+            assert_received(Gem::Package) { |builder_class| builder_class.build(@gemspec) }
+          else
+            assert_received(Gem::Builder) { |builder_class| builder_class.new(@gemspec) }
+            assert_received(@builder, &:build)
+          end
         end
 
         should 'make package directory' do
-          assert_received(@file_utils) {|file_utils| file_utils.mkdir_p './pkg'}
+          assert_received(@file_utils) { |file_utils| file_utils.mkdir_p './pkg' }
         end
 
         should 'move built gem into package directory' do
-          assert_received(@file_utils) {|file_utils| file_utils.mv './zomg-1.2.3.gem', './pkg'}
+          assert_received(@file_utils) { |file_utils| file_utils.mv './zomg-1.2.3.gem', './pkg' }
         end
       end
-      
+
       context 'after running with a version' do
         setup do
           initialize_build_gem_environment true
           @command.run
         end
-        
-        should "check if the gemspec helper has a version" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.has_version? }
+
+        should 'check if the gemspec helper has a version' do
+          assert_received(@gemspec_helper, &:has_version?)
         end
-        
+
         should "update version of gemspec helper if the gemspec doesn't have a version" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.update_version(@version_helper).never }
+          assert_received(@gemspec_helper) { |gemspec_helper| gemspec_helper.update_version(@version_helper).never }
         end
-        
       end
 
-      build_command_context "build for jeweler" do
+      build_command_context 'build for jeweler' do
         setup do
           @command = Jeweler::Commands::BuildGem.build_for(@jeweler)
         end
 
-        should "assign base_dir" do
+        should 'assign base_dir' do
           assert_same @base_dir, @jeweler.base_dir
         end
 
-        should "assign gemspec_helper" do
+        should 'assign gemspec_helper' do
           assert_same @gemspec_helper, @jeweler.gemspec_helper
         end
 
-        should "return BuildGem" do
+        should 'return BuildGem' do
           assert_kind_of Jeweler::Commands::BuildGem, @command
         end
       end
-      
+
       def initialize_build_gem_environment(has_version = false)
         @gemspec = Object.new
         stub(@gemspec).file_name { 'zomg-1.2.3.gem' }
@@ -79,11 +82,15 @@ class Jeweler
         stub(@gemspec_helper).update_version
         stub(@gemspec_helper).has_version? { has_version }
 
-        @version_helper = "Jeweler::VersionHelper"
+        @version_helper = 'Jeweler::VersionHelper'
 
         @builder = Object.new
-        stub(Gem::Builder).new { @builder }
-        stub(@builder).build { 'zomg-1.2.3.gem' }
+        if Gem::Version.new(`gem -v`) >= Gem::Version.new('2.0.0.a')
+          stub(Gem::Package).build { 'zomg-1.2.3.gem' }
+        else
+          stub(Gem::Builder).new { @builder }
+          stub(@builder).build { 'zomg-1.2.3.gem' }
+        end
 
         @file_utils = Object.new
         stub(@file_utils).mkdir_p './pkg'
@@ -97,7 +104,6 @@ class Jeweler
         @command.gemspec_helper = @gemspec_helper
         @command.version_helper = @version_helper
       end
-
     end
   end
 end

data/test/jeweler/commands/test_install_gem.rb

@@ -3,30 +3,30 @@ require 'test_helper'
 class Jeweler
   module Commands
     class TestInstallGem < Test::Unit::TestCase
-      rubyforge_command_context "running" do
+      rubyforge_command_context 'running' do
         setup do
-          stub(@gemspec_helper).gem_path { 'pkg/zomg-1.1.1.gem' } 
+          stub(@gemspec_helper).gem_path { 'pkg/zomg-1.1.1.gem' }
           stub(@command).gem_command { 'ruby -S gem' }
           stub(@command).sh
 
           @command.run
         end
 
-        should "call sh with gem install" do
-          assert_received(@command) {|command| command.sh 'ruby -S gem install pkg/zomg-1.1.1.gem' }
+        should 'call sh with gem install' do
+          assert_received(@command) { |command| command.sh 'ruby -S gem install pkg/zomg-1.1.1.gem' }
         end
       end
 
-      build_command_context "build for jeweler" do
+      build_command_context 'build for jeweler' do
         setup do
           @command = Jeweler::Commands::InstallGem.build_for(@jeweler)
         end
 
-        should "assign gemspec helper" do
+        should 'assign gemspec helper' do
           assert_equal @gemspec_helper, @command.gemspec_helper
         end
 
-        should "assign output" do
+        should 'assign output' do
           assert_equal @output, @command.output
         end
       end

data/test/jeweler/commands/test_release_to_gemcutter.rb

@@ -7,33 +7,32 @@ class Jeweler
         Jeweler::Commands::ReleaseToRubygems.new
       end
 
-      gemcutter_command_context "rubyforge_project is defined in gemspec and package exists on rubyforge" do
+      gemcutter_command_context 'rubyforge_project is defined in gemspec and package exists on rubyforge' do
         setup do
-          stub(@gemspec_helper).gem_path {'pkg/zomg-1.2.3.gem'}
+          stub(@gemspec_helper).gem_path { 'pkg/zomg-1.2.3.gem' }
           stub(@command).sh
           @command.run
         end
 
-        should "push to rubygems" do
+        should 'push to rubygems' do
           push_command = "gem push #{@gemspec_helper.gem_path}"
           assert_received(@command) { |command| command.sh(push_command) }
         end
       end
 
-      build_command_context "build for jeweler" do
+      build_command_context 'build for jeweler' do
         setup do
           @command = Jeweler::Commands::ReleaseToRubygems.build_for(@jeweler)
         end
 
-        should "assign gemspec helper" do
+        should 'assign gemspec helper' do
           assert_equal @gemspec_helper, @command.gemspec_helper
         end
 
-        should "assign output" do
+        should 'assign output' do
           assert_equal @output, @command.output
         end
       end
-      
     end
   end
 end

data/test/jeweler/commands/test_release_to_git.rb

@@ -3,9 +3,8 @@ require 'test_helper'
 class Jeweler
   module Commands
     class TestReleaseToGit < Test::Unit::TestCase
-
-      rubyforge_command_context "running" do
-        context "happily" do
+      rubyforge_command_context 'running' do
+        context 'happily' do
           setup do
             stub(@command).clean_staging_area? { true }
 
@@ -22,35 +21,100 @@ class Jeweler
             @command.run
           end
 
-          should "checkout master" do
-            assert_received(@repo) {|repo| repo.checkout('master') }
+          should 'checkout master' do
+            assert_received(@repo) { |repo| repo.checkout('master') }
+          end
+
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('origin', 'master:master') }
+          end
+        end
+
+        context 'happily with different remote, local branch and remote branch' do
+          setup do
+            stub(@command).clean_staging_area? { true }
+            stub(@command).release_tag { 'v1.2.0' }
+
+            stub(@repo).checkout(anything)
+            stub(@repo) do
+              add_tag(anything)
+              push(anything, anything)
+            end
+
+            stub(@repo).push
+
+            stub(@command).release_not_tagged? { true }
+
+            @command.run(remote: 'upstream', local_branch: 'feature', remote_branch: 'v1')
+          end
+
+          should 'checkout master' do
+            assert_received(@repo) { |repo| repo.checkout('feature') }
           end
 
-          should "push" do
-            assert_received(@repo) {|repo| repo.push }
+          should 'tag version' do
+            assert_received(@repo) { |repo| repo.add_tag('v1.2.0') }
           end
 
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('upstream', 'feature:v1') }
+          end
         end
 
-        context "with an unclean staging area" do
+        context 'happily with different branch' do
+          setup do
+            stub(@command).clean_staging_area? { true }
+            stub(@command).release_tag { 'v3.2.0' }
+
+            stub(@repo).checkout(anything)
+            stub(@repo) do
+              add_tag(anything)
+              push(anything, anything)
+            end
+
+            stub(@repo).push
+
+            stub(@command).release_not_tagged? { true }
+
+            @command.run(branch: 'v3')
+          end
+
+          should 'checkout master' do
+            assert_received(@repo) { |repo| repo.checkout('v3') }
+          end
+
+          should 'tag version' do
+            assert_received(@repo) { |repo| repo.add_tag('v3.2.0') }
+          end
+
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('origin', 'v3:v3') }
+          end
+        end
+
+        context 'with an unclean staging area' do
           setup do
             stub(@command).clean_staging_area? { false }
             stub(@command).system
           end
 
           should 'raise error' do
-            assert_raises RuntimeError, /try commiting/i do
+            assert_raises RuntimeError, 'Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above.' do
               @command.run
             end
           end
 
           should 'display git status' do
-            @command.run rescue nil
-            assert_received(@command) {|command| command.system("git status") }
+            begin
+              @command.run
+            rescue
+              nil
+            end
+            assert_received(@command) { |command| command.system('git status') }
           end
         end
 
-        context "with a release already tagged" do
+        context 'with a release already tagged' do
           setup do
             stub(@command).clean_staging_area? { true }
 
@@ -63,51 +127,48 @@ class Jeweler
             @command.run
           end
 
-          should "checkout master" do
-            assert_received(@repo) {|repo| repo.checkout('master') }
+          should 'checkout master' do
+            assert_received(@repo) { |repo| repo.checkout('master') }
           end
 
-          should "push" do
-            assert_received(@repo) {|repo| repo.push }
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('origin', 'master:master') }
           end
-
         end
-
       end
 
-
-      build_command_context "building from jeweler" do
+      build_command_context 'building from jeweler' do
         setup do
           @command = Jeweler::Commands::ReleaseToGit.build_for(@jeweler)
         end
 
-        should "assign gemspec" do
+        should 'assign gemspec' do
           assert_same @gemspec, @command.gemspec
         end
 
-        should "assign version" do
+        should 'assign version' do
           assert_same @version, @command.version
         end
 
-        should "assign repo" do
+        should 'assign repo' do
           assert_same @repo, @command.repo
         end
 
-        should "assign output" do
+        should 'assign output' do
           assert_same @output, @command.output
         end
 
-        should "assign gemspec_helper" do
+        should 'assign gemspec_helper' do
           assert_same @gemspec_helper, @command.gemspec_helper
         end
 
-        should "assign base_dir" do
+        should 'assign base_dir' do
           assert_same @base_dir, @command.base_dir
         end
       end
 
-      # FIXME this code had its ruby-git stuff replaced with `` and system, which is much harder to test, so re-enable these someday
-      #context "clean_staging_area?" do
+      # FIXME: this code had its ruby-git stuff replaced with `` and system, which is much harder to test, so re-enable these someday
+      # context "clean_staging_area?" do
 
       #  should "be false if there added files" do
       #    repo = build_repo :added => %w(README)
@@ -143,9 +204,9 @@ class Jeweler
 
       #    assert command.clean_staging_area?
       #  end
-      #end
+      # end
 
-      context "release_tagged? when no tag exists" do
+      context 'release_tagged? when no tag exists' do
         setup do
           @repo = Object.new
           stub(@repo).tag('v1.2.3') { raise Git::GitTagNameDoesNotExist, tag }
@@ -158,13 +219,12 @@ class Jeweler
           @command.version        = '1.2.3'
         end
 
-        should_eventually "be true" do
+        should_eventually 'be true' do
           assert @command.release_not_tagged?
         end
-
       end
 
-      context "release_tagged? when tag exists" do
+      context 'release_tagged? when tag exists' do
         setup do
           @repo = Object.new
           stub(@repo) do
@@ -179,10 +239,9 @@ class Jeweler
           @command.version        = '1.2.3'
         end
 
-        should_eventually "be false" do
+        should_eventually 'be false' do
           assert @command.release_not_tagged?
         end
-
       end
 
       def build_repo(options = {})
@@ -193,7 +252,7 @@ class Jeweler
       end
 
       def build_status(options = {})
-        options = {:added => [], :deleted => [], :changed => []}.merge(options)
+        options = { added: [], deleted: [], changed: [] }.merge(options)
 
         status = Object.new
         stub(status) do
@@ -201,7 +260,6 @@ class Jeweler
           deleted { options[:deleted] }
           changed { options[:changed] }
         end
-        
       end
     end
   end