jeweler 2.1.1 → 2.1.2

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,25 +23,24 @@ 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('origin', 'master:master') }
+          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
+        context 'happily with different remote, local branch and remote branch' do
           setup do
             stub(@command).clean_staging_area? { true }
 
@@ -57,28 +55,27 @@ class Jeweler
 
             stub(@command).release_not_tagged? { true }
 
-            @command.run({:remote => 'upstream', :local_branch => 'branch', :remote_branch => 'remote_branch'})
+            @command.run(remote: 'upstream', local_branch: 'branch', remote_branch: 'remote_branch')
           end
 
-          should "checkout local branch" do
-            assert_received(@repo) {|repo| repo.checkout('branch') }
+          should 'checkout local branch' do
+            assert_received(@repo) { |repo| repo.checkout('branch') }
           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('upstream', 'branch:remote_branch') }
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('upstream', 'branch:remote_branch') }
           end
-
         end
 
-        context "happily with different branch" do
+        context 'happily with different branch' do
           setup do
             stub(@command).clean_staging_area? { true }
 
@@ -93,45 +90,49 @@ class Jeweler
 
             stub(@command).release_not_tagged? { true }
 
-            @command.run({:branch => 'v3'})
+            @command.run(branch: 'v3')
           end
 
-          should "checkout local branch" do
-            assert_received(@repo) {|repo| repo.checkout('v3') }
+          should 'checkout local branch' do
+            assert_received(@repo) { |repo| repo.checkout('v3') }
           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('origin', 'v3:v3') }
+          should 'push' do
+            assert_received(@repo) { |repo| repo.push('origin', 'v3:v3') }
           end
         end
 
-        context "with an unclean staging area" do
+        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 }
 
@@ -149,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('origin', 'master:master') }
+          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 }
 
@@ -181,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('origin', 'master:master') }
+          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)
@@ -269,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
@@ -282,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
@@ -315,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
 
@@ -351,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
 
@@ -388,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 }
@@ -427,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
@@ -448,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 = {})
@@ -462,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
@@ -470,7 +464,6 @@ class Jeweler
           deleted { options[:deleted] }
           changed { options[:changed] }
         end
-        
       end
     end
   end