jeweler 1.8.2 → 2.3.7

data/test/jeweler/commands/test_release_to_github.rb

@@ -4,9 +4,8 @@ require 'pathname'
 class Jeweler
   module Commands
     class TestReleaseGemspec < 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 }
 
@@ -24,43 +23,116 @@ 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 'regenerate gemspec' do
+            assert_received(@command, &:regenerate_gemspec!)
+          end
+
+          should 'commit gemspec' do
+            assert_received(@command, &:commit_gemspec!)
+          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(@repo).checkout(anything)
+
+            stub(@command).regenerate_gemspec!
+
+            stub(@command).gemspec_changed? { true }
+            stub(@command).commit_gemspec! { true }
+
+            stub(@repo).push
+
+            stub(@command).release_not_tagged? { true }
+
+            @command.run(remote: 'upstream', local_branch: 'branch', remote_branch: 'remote_branch')
           end
 
-          should "regenerate gemspec" do
-            assert_received(@command) {|command| command.regenerate_gemspec! }
+          should 'checkout local branch' do
+            assert_received(@repo) { |repo| repo.checkout('branch') }
           end
 
-          should "commit gemspec" do
-            assert_received(@command) {|command| command.commit_gemspec! }
+          should 'regenerate gemspec' do
+            assert_received(@command, &:regenerate_gemspec!)
           end
 
-          should "push" do
-            assert_received(@repo) {|repo| repo.push }
+          should 'commit gemspec' do
+            assert_received(@command, &:commit_gemspec!)
           end
 
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('upstream', 'branch:remote_branch') }
+          end
         end
 
-        context "with an unclean staging area" do
+        context 'happily with different branch' do
+          setup do
+            stub(@command).clean_staging_area? { true }
+
+            stub(@repo).checkout(anything)
+
+            stub(@command).regenerate_gemspec!
+
+            stub(@command).gemspec_changed? { true }
+            stub(@command).commit_gemspec! { true }
+
+            stub(@repo).push
+
+            stub(@command).release_not_tagged? { true }
+
+            @command.run(branch: 'v3')
+          end
+
+          should 'checkout local branch' do
+            assert_received(@repo) { |repo| repo.checkout('v3') }
+          end
+
+          should 'regenerate gemspec' do
+            assert_received(@command, &:regenerate_gemspec!)
+          end
+
+          should 'commit gemspec' do
+            assert_received(@command, &:commit_gemspec!)
+          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 an unchanged gemspec" do
+        context 'with an unchanged gemspec' do
           setup do
             stub(@command).clean_staging_area? { true }
 
@@ -78,21 +150,20 @@ 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 "regenerate gemspec" do
-            assert_received(@command) {|command| command.regenerate_gemspec! }
+          should 'regenerate gemspec' do
+            assert_received(@command, &:regenerate_gemspec!)
           end
 
-          should "push" do
-            assert_received(@repo) {|repo| repo.push }
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('origin', 'master:master') }
           end
-
         end
 
-        context "with a release already tagged" do
+        context 'with a release already tagged' do
           setup do
             stub(@command).clean_staging_area? { true }
 
@@ -110,59 +181,56 @@ 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 "regenerate gemspec" do
-            assert_received(@command) {|command| command.regenerate_gemspec! }
+          should 'regenerate gemspec' do
+            assert_received(@command, &:regenerate_gemspec!)
           end
 
-          should "commit gemspec" do
-            assert_received(@command) {|command| command.commit_gemspec! }
+          should 'commit gemspec' do
+            assert_received(@command, &:commit_gemspec!)
           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::ReleaseGemspec.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)
@@ -198,9 +266,9 @@ class Jeweler
 
       #    assert command.clean_staging_area?
       #  end
-      #end
+      # end
 
-      context "regenerate_gemspec!" do
+      context 'regenerate_gemspec!' do
         setup do
           @repo = Object.new
           stub(@repo) do
@@ -211,30 +279,30 @@ class Jeweler
           @gemspec_helper = Object.new
           stub(@gemspec_helper) do
             write
-            path {'zomg.gemspec'}
+            path { 'zomg.gemspec' }
             update_version('1.2.3')
           end
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::ReleaseGemspec.new :output => @output,
-                                                                   :repo => @repo,
-                                                                   :gemspec_helper => @gemspec_helper,
-                                                                   :version => '1.2.3'
+          @command = Jeweler::Commands::ReleaseGemspec.new output: @output,
+                                                           repo: @repo,
+                                                           gemspec_helper: @gemspec_helper,
+                                                           version: '1.2.3'
 
           @command.regenerate_gemspec!
         end
 
-        should "refresh gemspec version" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.update_version('1.2.3') }
+        should 'refresh gemspec version' do
+          assert_received(@gemspec_helper) { |gemspec_helper| gemspec_helper.update_version('1.2.3') }
         end
 
-        should "write gemspec" do
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.write }
+        should 'write gemspec' do
+          assert_received(@gemspec_helper, &:write)
         end
       end
 
-      context "commit_gemspec!" do
+      context 'commit_gemspec!' do
         setup do
           @repo = Object.new
           stub(@repo) do
@@ -244,32 +312,31 @@ class Jeweler
 
           @gemspec_helper = Object.new
           stub(@gemspec_helper) do
-            path {'zomg.gemspec'}
+            path { 'zomg.gemspec' }
             update_version('1.2.3')
           end
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::ReleaseGemspec.new :output => @output,
-                                                                   :repo => @repo,
-                                                                   :gemspec_helper => @gemspec_helper,
-                                                                   :version => '1.2.3'
+          @command = Jeweler::Commands::ReleaseGemspec.new output: @output,
+                                                           repo: @repo,
+                                                           gemspec_helper: @gemspec_helper,
+                                                           version: '1.2.3'
 
-          stub(@command).working_subdir { Pathname.new(".") }
+          stub(@command).working_subdir { Pathname.new('.') }
           @command.commit_gemspec!
         end
 
-        should "add gemspec to repository" do
-          assert_received(@repo) {|repo| repo.add('zomg.gemspec') }
+        should 'add gemspec to repository' do
+          assert_received(@repo) { |repo| repo.add('zomg.gemspec') }
         end
 
-        should "commit with commit message including version" do
-          assert_received(@repo) {|repo| repo.commit("Regenerate gemspec for version 1.2.3") }
+        should 'commit with commit message including version' do
+          assert_received(@repo) { |repo| repo.commit('Regenerate gemspec for version 1.2.3') }
         end
-
       end
 
-      context "commit_gemspec! in top dir" do
+      context 'commit_gemspec! in top dir' do
         setup do
           @repo = Object.new
 
@@ -280,33 +347,33 @@ class Jeweler
 
           @gemspec_helper = Object.new
           stub(@gemspec_helper) do
-            path {'zomg.gemspec'}
+            path { 'zomg.gemspec' }
             update_version('1.2.3')
           end
 
           @output = StringIO.new
 
-          @command = Jeweler::Commands::ReleaseGemspec.new :output => @output,
-            :repo => @repo,
-            :gemspec_helper => @gemspec_helper,
-            :version => '1.2.3',
-            :base_dir => '.'
+          @command = Jeweler::Commands::ReleaseGemspec.new output: @output,
+                                                           repo: @repo,
+                                                           gemspec_helper: @gemspec_helper,
+                                                           version: '1.2.3',
+                                                           base_dir: '.'
 
           @dir = Object.new
           stub(@repo).dir { @dir }
-          stub(@dir).path { "/x/y/z" }
+          stub(@dir).path { '/x/y/z' }
 
-          stub(@command).base_dir_path { Pathname.new("/x/y/z") }
+          stub(@command).base_dir_path { Pathname.new('/x/y/z') }
 
           @command.commit_gemspec!
         end
 
-        should "add gemspec to repository" do
-          assert_received(@repo) {|repo| repo.add('zomg.gemspec') }
+        should 'add gemspec to repository' do
+          assert_received(@repo) { |repo| repo.add('zomg.gemspec') }
         end
       end
 
-      context "commit_gemspec! in sub dir" do
+      context 'commit_gemspec! in sub dir' do
         setup do
           @repo = Object.new
 
@@ -317,33 +384,33 @@ class Jeweler
 
           @gemspec_helper = Object.new
           stub(@gemspec_helper) do
-            path {'zomg.gemspec'}
+            path { 'zomg.gemspec' }
             update_version('1.2.3')
           end
 
           @output = StringIO.new
 
-          @command = Jeweler::Commands::ReleaseGemspec.new :output => @output,
-            :repo => @repo,
-            :gemspec_helper => @gemspec_helper,
-            :version => '1.2.3',
-            :base_dir => '.'
+          @command = Jeweler::Commands::ReleaseGemspec.new output: @output,
+                                                           repo: @repo,
+                                                           gemspec_helper: @gemspec_helper,
+                                                           version: '1.2.3',
+                                                           base_dir: '.'
 
           @dir = Object.new
           stub(@repo).dir { @dir }
-          stub(@dir).path { "/x/y/z" }
+          stub(@dir).path { '/x/y/z' }
 
-          stub(@command).base_dir_path { Pathname.new("/x/y/z/gem") }
+          stub(@command).base_dir_path { Pathname.new('/x/y/z/gem') }
 
           @command.commit_gemspec!
         end
 
-        should "add gemspec to repository" do
-          assert_received(@repo) {|repo| repo.add('gem/zomg.gemspec') }
+        should 'add gemspec to repository' do
+          assert_received(@repo) { |repo| repo.add('gem/zomg.gemspec') }
         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 }
@@ -356,13 +423,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
@@ -377,10 +443,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 = {})
@@ -391,7 +456,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
@@ -399,7 +464,6 @@ class Jeweler
           deleted { options[:deleted] }
           changed { options[:changed] }
         end
-        
       end
     end
   end

data/test/jeweler/commands/test_validate_gemspec.rb

@@ -3,24 +3,22 @@ require 'test_helper'
 class Jeweler
   module Commands
     class TestValidateGemspec < Test::Unit::TestCase
-
-      build_command_context "build context" do
+      build_command_context 'build context' do
         setup do
           @command = Jeweler::Commands::ValidateGemspec.build_for(@jeweler)
         end
 
-        should "assign gemspec_helper" do
+        should 'assign gemspec_helper' do
           assert_same @gemspec_helper, @command.gemspec_helper
         end
 
-        should "assign output" do
+        should 'assign output' do
           assert_same @output, @command.output
         end
 
-        should "return Jeweler::Commands::ValidateGemspec" do
+        should 'return Jeweler::Commands::ValidateGemspec' do
           assert_kind_of Jeweler::Commands::ValidateGemspec, @command
         end
-
       end
     end
   end

data/test/jeweler/commands/test_write_gemspec.rb

@@ -3,10 +3,9 @@ require 'test_helper'
 class Jeweler
   module Commands
     class TestWriteGemspec < Test::Unit::TestCase
-
-      context "after run" do
+      context 'after run' do
         setup do
-          @gemspec = Gem::Specification.new {|s| s.name = 'zomg' }
+          @gemspec = Gem::Specification.new { |s| s.name = 'zomg' }
           @gemspec_helper = Object.new
           stub(@gemspec_helper).spec { @gemspec }
           stub(@gemspec_helper).path { 'zomg.gemspec' }
@@ -15,7 +14,7 @@ class Jeweler
           @output = StringIO.new
 
           @version_helper = Object.new
-          stub(@version_helper).to_s  { '1.2.3' }
+          stub(@version_helper).to_s { '1.2.3' }
           stub(@version_helper).refresh
 
           @command = Jeweler::Commands::WriteGemspec.new
@@ -25,17 +24,17 @@ class Jeweler
           @command.output = @output
           @command.gemspec_helper = @gemspec_helper
 
-          # FIXME apparently rubygems doesn't use Time.now under the hood when generating a date
+          # FIXME: apparently rubygems doesn't use Time.now under the hood when generating a date
           @now = Time.local(2008, 9, 1, 12, 0, 0)
           stub(Time.now).now { @now }
         end
 
-        should "refresh version" do
+        should 'refresh version' do
           @command.run
-          assert_received(@version_helper) {|version_helper| version_helper.refresh }
+          assert_received(@version_helper, &:refresh)
         end
 
-        should "update gemspec version" do
+        should 'update gemspec version' do
           @command.run
           assert_equal '1.2.3', @gemspec.version.to_s
         end
@@ -46,58 +45,56 @@ class Jeweler
           assert_equal '2.3.4', @gemspec.version.to_s
         end
 
-        should_eventually "update gemspec date to the beginning of today" do
+        should_eventually 'update gemspec date to the beginning of today' do
           @command.run
-          # FIXME apparently rubygems doesn't use Time.now under the hood when generating a date
+          # FIXME: apparently rubygems doesn't use Time.now under the hood when generating a date
           assert_equal Time.local(@now.year, @now.month, @now.day, 0, 0), @gemspec.date
         end
 
-        should "write gemspec" do
+        should 'write gemspec' do
           @command.run
-          assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.write }
+          assert_received(@gemspec_helper, &:write)
         end
 
-        should_eventually "output that the gemspec was written" do
+        should_eventually 'output that the gemspec was written' do
           @command.run
-          assert_equal @output.string, "Generated: tmp/zomg.gemspec"
+          assert_equal @output.string, 'Generated: tmp/zomg.gemspec'
         end
-
       end
 
-      build_command_context "building for jeweler" do
+      build_command_context 'building for jeweler' do
         setup do
           @command = Jeweler::Commands::WriteGemspec.build_for(@jeweler)
         end
 
-        should "assign base_dir" do
+        should 'assign base_dir' do
           assert_same @base_dir, @command.base_dir
         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 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 version_helper" do
+        should 'assign version_helper' do
           assert_same @version_helper, @command.version_helper
         end
 
-        should "return WriteGemspec" do
+        should 'return WriteGemspec' do
           assert_kind_of Jeweler::Commands::WriteGemspec, @command
         end
       end
-
     end
   end
 end

data/test/jeweler/commands/version/test_base.rb

@@ -4,29 +4,49 @@ class Jeweler
   module Commands
     module Version
       class TestBase < Test::Unit::TestCase
-        build_command_context "build for jeweler" do
+        build_command_context 'build for jeweler' do
           setup do
             @command = Jeweler::Commands::Version::Base.build_for(@jeweler)
           end
 
-          should "assign repo" do
+          should 'assign repo' do
             assert_equal @repo, @command.repo
           end
 
-          should "assign version_helper" do
+          should 'assign version_helper' do
             assert_equal @version_helper, @command.version_helper
           end
 
-          should "assign gemspec" do
+          should 'assign gemspec' do
             assert_equal @gemspec, @command.gemspec
           end
 
-          should"assign commit" do
+          should 'assign commit' do
             assert_equal @commit, @command.commit
           end
+
+          context 'commit_version' do
+            setup do
+              @dir = Object.new
+              stub(@repo).dir { @dir }
+              stub(@dir).path { Dir.pwd }
+              stub(@version_helper).path { Pathname.new 'VERSION' }
+              stub(@version_helper).to_s { '1.0.0' }
+              stub(@repo) do
+                add(anything)
+                commit(anything)
+              end
+              @command.base_dir = Dir.pwd
+              @command.commit_version
+            end
+
+            should 'add VERSION' do
+              assert_received(@repo) { |repo| repo.add('VERSION') }
+              assert_received(@repo) { |repo| repo.commit('Version bump to 1.0.0') }
+            end
+          end
         end
       end
     end
   end
 end
-