jeweler 2.1.1 → 2.1.2

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,28 +4,28 @@ 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
+          context 'commit_version' do
             setup do
               @dir = Object.new
               stub(@repo).dir { @dir }
@@ -40,9 +40,9 @@ class Jeweler
               @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')}
+            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
@@ -50,4 +50,3 @@ class Jeweler
     end
   end
 end
-

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

@@ -4,8 +4,7 @@ class Jeweler
   module Commands
     module Version
       class TestBumpMajor < Test::Unit::TestCase
-
-        should "call bump_major on version_helper in update_version" do
+        should 'call bump_major on version_helper in update_version' do
           mock(version_helper = Object.new).bump_major
 
           command = Jeweler::Commands::Version::BumpMajor.new
@@ -14,9 +13,6 @@ class Jeweler
           command.update_version
         end
       end
-
     end
   end
 end
-
-

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

@@ -4,8 +4,7 @@ class Jeweler
   module Commands
     module Version
       class TestBumpMinor < Test::Unit::TestCase
-
-        should "call bump_minor on version_helper in update_version" do
+        should 'call bump_minor on version_helper in update_version' do
           mock(version_helper = Object.new).bump_minor
 
           command = Jeweler::Commands::Version::BumpMinor.new

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

@@ -4,8 +4,7 @@ class Jeweler
   module Commands
     module Version
       class TestBumpPatch < Test::Unit::TestCase
-
-        should "call bump_patch on version_helper in update_version" do
+        should 'call bump_patch on version_helper in update_version' do
           mock(version_helper = Object.new).bump_patch
 
           command = Jeweler::Commands::Version::BumpPatch.new
@@ -17,4 +16,3 @@ class Jeweler
     end
   end
 end
-

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

@@ -4,8 +4,7 @@ class Jeweler
   module Commands
     module Version
       class TestWrite < Test::Unit::TestCase
-
-        should "call write_version on version_helper in update_version" do
+        should 'call write_version on version_helper in update_version' do
           mock(version_helper = Object.new).update_to 1, 2, 3, nil
 
           command = Jeweler::Commands::Version::Write.new
@@ -19,4 +18,3 @@ class Jeweler
     end
   end
 end
-

data/test/jeweler/generator/test_application.rb

@@ -37,38 +37,36 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
-
-  context "when options indicate version" do
+  context 'when options indicate version' do
     setup do
       stub(Jeweler::Generator::Application).build_opts do
-        stub_options(:show_version => true)
+        stub_options(show_version: true)
       end
 
-      stub(Jeweler::Generator).new { raise "Shouldn't have made this far"}
+      stub(Jeweler::Generator).new { raise "Shouldn't have made this far" }
 
       assert_nothing_raised do
-        @result = run_application("-v")
+        @result = run_application('-v')
       end
     end
-    
+
     should_exit_with_code 1
-    
+
     should 'should puts option version' do
       assert_match 'Version:', @stderr
     end
   end
-  
 
-  context "when options indicate help usage" do
+  context 'when options indicate help usage' do
     setup do
       stub(Jeweler::Generator::Application).build_opts do
-        stub_options(:show_help => true)
+        stub_options(show_help: true)
       end
 
-      stub(Jeweler::Generator).new { raise "Shouldn't have made this far"}
+      stub(Jeweler::Generator).new { raise "Shouldn't have made this far" }
 
       assert_nothing_raised do
-        @result = run_application("-h")
+        @result = run_application('-h')
       end
     end
 
@@ -83,16 +81,16 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
-  context "when options indicate an invalid argument" do
+  context 'when options indicate an invalid argument' do
     setup do
       stub(Jeweler::Generator::Application).build_opts do
-        stub_options(:invalid_argument => '--invalid-argument')
+        stub_options(invalid_argument: '--invalid-argument')
       end
 
-      stub(Jeweler::Generator).new { raise "Shouldn't have made this far"}
+      stub(Jeweler::Generator).new { raise "Shouldn't have made this far" }
 
       assert_nothing_raised do
-        @result = run_application("--invalid-argument")
+        @result = run_application('--invalid-argument')
       end
     end
 
@@ -109,34 +107,32 @@ class TestApplication < Test::Unit::TestCase
     should 'not display anything on stdout' do
       assert_equal '', @stdout.squeeze.strip
     end
-
   end
 
-  context "when options are good" do
+  context 'when options are good' do
     setup do
-      @generator = "generator"
+      @generator = 'generator'
       stub(@generator).run
       stub(Jeweler::Generator).new { @generator }
 
-      @jeweler_options = stub_options :project_name => 'zomg'
+      @jeweler_options = stub_options project_name: 'zomg'
       stub(Jeweler::Generator::Application).build_options do
         @jeweler_options
       end
 
       assert_nothing_raised do
-        @result = run_application("zomg")
+        @result = run_application('zomg')
       end
     end
 
     should_exit_with_code 0
 
-    should "create generator with options" do
-      assert_received(Jeweler::Generator) {|subject| subject.new(@jeweler_options) }
+    should 'create generator with options' do
+      assert_received(Jeweler::Generator) { |subject| subject.new(@jeweler_options) }
     end
 
-    should "run generator" do
-      assert_received(@generator) {|subject| subject.run }
+    should 'run generator' do
+      assert_received(@generator, &:run)
     end
   end
-
 end

data/test/jeweler/generator/test_options.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class TestOptions < Test::Unit::TestCase
-
   def setup
     set_default_git_config
     stub_git_config valid_git_config
@@ -21,17 +20,17 @@ class TestOptions < Test::Unit::TestCase
 
   def setup_options(*arguments)
     stub(Jeweler::Generator::Options).git_config { valid_git_config }
-    @options = Jeweler::Generator::Options.new(["project_name"] + arguments)
+    @options = Jeweler::Generator::Options.new(['project_name'] + arguments)
   end
 
   def self.for_options(*options)
     context options.join(' ') do
-      setup { setup_options *options }
+      setup { setup_options(*options) }
       yield
     end
   end
 
-  context "default options" do
+  context 'default options' do
     setup { setup_options }
     should_have_testing_framework :shoulda
     should_have_docmentation_framework :rdoc
@@ -40,27 +39,27 @@ class TestOptions < Test::Unit::TestCase
       assert ! @options[:create_repo]
     end
 
-    should "have project name" do
-      assert_equal "project_name", @options[:project_name]
+    should 'have project name' do
+      assert_equal 'project_name', @options[:project_name]
     end
 
-    should "use github username from git config" do
+    should 'use github username from git config' do
       assert_equal @github_user, @options[:github_username]
     end
-    should "use user name from git config" do
+    should 'use user name from git config' do
       assert_equal @git_name, @options[:user_name]
     end
 
-    should "use user email from git config" do
+    should 'use user email from git config' do
       assert_equal @git_email, @options[:user_email]
     end
 
-    should "use bundler" do
+    should 'use bundler' do
       assert @options[:use_bundler]
     end
   end
 
-  for_options "--bacon" do
+  for_options '--bacon' do
     should_have_testing_framework :bacon
   end
 
@@ -80,11 +79,11 @@ class TestOptions < Test::Unit::TestCase
     should_have_testing_framework :shoulda
   end
 
-  for_options "--testunit" do
+  for_options '--testunit' do
     should_have_testing_framework :testunit
   end
 
-  for_options "--testspec" do
+  for_options '--testspec' do
     should_have_testing_framework :testspec
   end
 
@@ -137,13 +136,13 @@ class TestOptions < Test::Unit::TestCase
       assert_equal 'foo', @options[:directory]
     end
   end
-  
+
   for_options '--version' do
     should 'show version' do
       assert @options[:show_version]
     end
   end
-  
+
   for_options '-v' do
     should 'show version' do
       assert @options[:show_version]
@@ -169,13 +168,13 @@ class TestOptions < Test::Unit::TestCase
   end
 
   for_options '--user-name', 'myname' do
-    should "set user name" do
+    should 'set user name' do
       assert_equal 'myname', @options[:user_name]
     end
   end
 
   for_options '--user-email', 'myname@mydomain.com' do
-    should "set user email" do
+    should 'set user email' do
       assert_equal 'myname@mydomain.com', @options[:user_email]
     end
   end
@@ -193,34 +192,34 @@ class TestOptions < Test::Unit::TestCase
   end
 
   for_options '--github-username', 'mygithub' do
-    should "set github username" do
+    should 'set github username' do
       assert_equal 'mygithub', @options[:github_username]
     end
   end
 
   for_options '--bundler' do
-    should "use bundler" do
+    should 'use bundler' do
       assert @options[:use_bundler]
     end
   end
 
   for_options '--no-bundler' do
-    should "not use bundler" do
+    should 'not use bundler' do
       assert !@options[:use_bundler]
     end
   end
 
-  context "merging options" do
-    should "take options from each" do
-      options = Jeweler::Generator::Options.new(["--rspec"]).
-        merge Jeweler::Generator::Options.new(["--create-repo"])
+  context 'merging options' do
+    should 'take options from each' do
+      options = Jeweler::Generator::Options.new(['--rspec'])
+                                           .merge Jeweler::Generator::Options.new(['--create-repo'])
       assert_equal :rspec, options[:testing_framework]
       assert options[:create_repo]
     end
 
-    should "shadow options" do
-      options = Jeweler::Generator::Options.new(["--bacon"]).
-        merge Jeweler::Generator::Options.new(["--rspec"])
+    should 'shadow options' do
+      options = Jeweler::Generator::Options.new(['--bacon'])
+                                           .merge Jeweler::Generator::Options.new(['--rspec'])
       assert_equal :rspec, options[:testing_framework]
     end
   end