jeweler 1.2.1 → 1.3.0

data/test/jeweler/commands/{test_release.rb → test_release_to_github.rb}

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class Jeweler
   module Commands
-    class TestRelease < Test::Unit::TestCase
+    class TestReleaseToGithub < Test::Unit::TestCase
 
       rubyforge_command_context "running" do
         context "happily" do
@@ -19,7 +19,6 @@ class Jeweler
             stub(@repo).push
 
             stub(@command).release_not_tagged? { true }
-            stub(@command).tag_release!
 
             @command.run
           end
@@ -40,10 +39,6 @@ class Jeweler
             assert_received(@repo) {|repo| repo.push }
           end
 
-          should "tag release" do
-            assert_received(@command) {|command| command.tag_release! }
-          end
-
         end
 
         context "with an unclean staging area" do
@@ -72,7 +67,6 @@ class Jeweler
             stub(@repo).push
 
             stub(@command).release_not_tagged? { true }
-            stub(@command).tag_release!
 
             @command.run
           end
@@ -89,10 +83,6 @@ class Jeweler
             assert_received(@repo) {|repo| repo.push }
           end
 
-          should "tag release" do
-            assert_received(@command) {|command| command.tag_release! }
-          end
-
         end
 
         context "with a release already tagged" do
@@ -109,7 +99,6 @@ class Jeweler
             stub(@repo).push
 
             stub(@command).release_not_tagged? { false }
-            dont_allow(@command).tag_release!
 
             @command.run
           end
@@ -137,7 +126,7 @@ class Jeweler
 
       build_command_context "building from jeweler" do
         setup do
-          @command = Jeweler::Commands::Release.build_for(@jeweler)
+          @command = Jeweler::Commands::ReleaseToGithub.build_for(@jeweler)
         end
 
         should "assign gemspec" do
@@ -170,7 +159,7 @@ class Jeweler
         should "be false if there added files" do
           repo = build_repo :added => %w(README)
 
-          command = Jeweler::Commands::Release.new :repo => repo
+          command = Jeweler::Commands::ReleaseToGithub.new :repo => repo
 
           assert ! command.clean_staging_area?
         end
@@ -178,7 +167,7 @@ class Jeweler
         should "be false if there are changed files" do
           repo = build_repo :changed => %w(README)
 
-          command = Jeweler::Commands::Release.new
+          command = Jeweler::Commands::ReleaseToGithub.new
           command.repo = repo
 
           assert ! command.clean_staging_area?
@@ -187,7 +176,7 @@ class Jeweler
         should "be false if there are deleted files" do
           repo = build_repo :deleted => %w(README)
 
-          command = Jeweler::Commands::Release.new
+          command = Jeweler::Commands::ReleaseToGithub.new
           command.repo = repo
 
           assert ! command.clean_staging_area?
@@ -196,41 +185,13 @@ class Jeweler
         should "be true if nothing added, changed, or deleted" do
           repo = build_repo
 
-          command = Jeweler::Commands::Release.new
+          command = Jeweler::Commands::ReleaseToGithub.new
           command.repo = repo
 
           assert command.clean_staging_area?
         end
       end
 
-      context "tag_release!" do
-        setup do
-          @repo = Object.new
-          stub(@repo) do
-            add_tag(anything)
-            push(anything, anything)
-          end
-
-          @output = StringIO.new
-
-          @command                = Jeweler::Commands::Release.new
-          @command.output         = @output
-          @command.repo           = @repo
-          @command.gemspec_helper = @gemspec_helper
-          @command.version        = '1.2.3'
-
-          @command.tag_release!
-        end
-
-        should "tag release" do
-          assert_received(@repo) {|repo| repo.add_tag("v1.2.3")}
-        end
-
-        should "push tag to repository" do
-          assert_received(@repo) {|repo| repo.push('origin', 'v1.2.3')}
-        end
-      end
-
       context "regenerate_gemspec!" do
         setup do
           @repo = Object.new
@@ -248,7 +209,7 @@ class Jeweler
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::Release.new :output => @output,
+          @command                = Jeweler::Commands::ReleaseToGithub.new :output => @output,
                                                                    :repo => @repo,
                                                                    :gemspec_helper => @gemspec_helper,
                                                                    :version => '1.2.3'
@@ -281,7 +242,7 @@ class Jeweler
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::Release.new :output => @output,
+          @command                = Jeweler::Commands::ReleaseToGithub.new :output => @output,
                                                                    :repo => @repo,
                                                                    :gemspec_helper => @gemspec_helper,
                                                                    :version => '1.2.3'
@@ -306,7 +267,7 @@ class Jeweler
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::Release.new
+          @command                = Jeweler::Commands::ReleaseToGithub.new
           @command.output         = @output
           @command.repo           = @repo
           @command.version        = '1.2.3'
@@ -327,7 +288,7 @@ class Jeweler
 
           @output = StringIO.new
 
-          @command                = Jeweler::Commands::Release.new
+          @command                = Jeweler::Commands::ReleaseToGithub.new
           @command.output         = @output
           @command.repo           = @repo
           @command.version        = '1.2.3'

data/test/jeweler/commands/test_release_to_rubyforge.rb

@@ -146,10 +146,6 @@ class Jeweler
         should "assign output" do
           assert_equal @output, @command.output
         end
-
-        should "assign rubyforge" do
-          assert_equal @rubyforge, @command.rubyforge
-        end
       end
       
     end

data/test/jeweler/commands/test_setup_rubyforge.rb

@@ -171,10 +171,6 @@ class Jeweler
         should "assign output" do
           assert_equal @output, @command.output
         end
-
-        should "assign rubyforge" do
-          assert_equal @rubyforge, @command.rubyforge
-        end
       end
 
     end

data/test/jeweler/commands/test_write_gemspec.rb

@@ -27,27 +27,36 @@ class Jeweler
 
           @now = Time.now
           stub(Time.now).now { @now }
-
-          @command.run
         end
 
         should "refresh version" do
+          @command.run
           assert_received(@version_helper) {|version_helper| version_helper.refresh }
         end
 
         should "update gemspec version" do
+          @command.run
           assert_equal '1.2.3', @gemspec.version.to_s
         end
 
+        should "not refresh version neither update version if it's set on the gemspec" do
+          @gemspec.version = '2.3.4'
+          @command.run
+          assert_equal '2.3.4', @gemspec.version.to_s
+        end
+
         should "update gemspec date to the beginning of today" do
+          @command.run
           assert_equal Time.mktime(@now.year, @now.month, @now.day, 0, 0), @gemspec.date
         end
 
         should "write gemspec" do
+          @command.run
           assert_received(@gemspec_helper) {|gemspec_helper| gemspec_helper.write }
         end
 
         should_eventually "output that the gemspec was written" do
+          @command.run
           assert_equal @output.string, "Generated: tmp/zomg.gemspec"
         end
 

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

@@ -6,14 +6,13 @@ class Jeweler
       class TestWrite < Test::Unit::TestCase
 
         should "call write_version on version_helper in update_version" do
-          mock(version_helper = Object.new).update_to 1, 2, 3
+          mock(version_helper = Object.new).update_to 1, 2, 3, nil
 
           command = Jeweler::Commands::Version::Write.new
           command.version_helper = version_helper
           command.major = 1
           command.minor = 2
           command.patch = 3
-
           command.update_version
         end
       end

data/test/{test_application.rb → jeweler/generator/test_application.rb}

@@ -25,40 +25,23 @@ class TestApplication < Test::Unit::TestCase
     result
   end
 
-  def self.should_exit_with_code(code)
-    should "exit with code #{code}" do
-      assert_equal code, @result
-    end
-  end
-
-  context "called without any args" do
-    setup do
-      @result = run_application
-    end
+  def stub_options(options)
+    stub(options).opts { 'Usage:' }
 
-    should_exit_with_code 1
-
-    should 'display usage on stderr' do
-      assert_match 'Usage:', @stderr
-    end
+    stub(Jeweler::Generator::Options).new { options }
 
-    should 'not display anything on stdout' do
-      assert_equal '', @stdout.squeeze.strip
-    end
+    options
   end
 
-  def build_generator(name = 'zomg', options = {:testing_framework => :shoulda})
-    stub(Git).global_config() do
-      {'user.name' => 'John Doe', 'user.email' => 'john@example.com', 'github.user' => 'johndoe', 'github.token' => 'yyz'}
+  def self.should_exit_with_code(code)
+    should "exit with code #{code}" do
+      assert_equal code, @result
     end
-
-    Jeweler::Generator.new(name, options)
   end
 
-  context "called with -h" do
+  context "when options indicate help usage" do
     setup do
-      @generator = build_generator
-      stub(@generator).run
+      stub_options :show_help => true
       stub(Jeweler::Generator).new { raise "Shouldn't have made this far"}
 
       assert_nothing_raised do
@@ -68,7 +51,7 @@ class TestApplication < Test::Unit::TestCase
 
     should_exit_with_code 1
 
-    should 'display usage on stderr' do
+    should 'should puts option usage' do
       assert_match 'Usage:', @stderr
     end
 
@@ -77,10 +60,9 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
-  context "called with --invalid-argument" do
+  context "when options indicate an invalid argument" do
     setup do
-      @generator = build_generator
-      stub(@generator).run
+      stub_options :invalid_argument => '--invalid-argument'
       stub(Jeweler::Generator).new { raise "Shouldn't have made this far"}
 
       assert_nothing_raised do
@@ -101,38 +83,29 @@ class TestApplication < Test::Unit::TestCase
     should 'not display anything on stdout' do
       assert_equal '', @stdout.squeeze.strip
     end
+
   end
 
-  context "when called with repo name" do
+  context "when options are good" do
     setup do
-      @options = {:testing_framework => :shoulda, :documentation_framework => :rdoc}
-      @generator = build_generator('zomg', @options)
-
+      @options   = stub_options :project_name => 'zomg'
+      @generator = "generator"
       stub(@generator).run
       stub(Jeweler::Generator).new { @generator }
-    end
-
-    should 'return exit code 0' do
-      result = run_application("zomg")
-      assert_equal 0, result
-    end
-    
-    should 'create generator with repo name and no options' do
-      run_application("zomg")
 
-      assert_received Jeweler::Generator do |subject|
-        subject.new('zomg', @options)
+      assert_nothing_raised do
+        @result = run_application("zomg")
       end
     end
 
-    should 'run generator' do
-      run_application("zomg")
+    should_exit_with_code 0
 
-      assert_received(@generator) {|subject| subject.run }
+    should "create generator with options" do
+      assert_received(Jeweler::Generator) {|subject| subject.new(@options) }
     end
 
-    should 'not display usage on stderr' do
-      assert_no_match /Usage:/, @stderr
+    should "run generator" do
+      assert_received(@generator) {|subject| subject.run }
     end
   end
 

data/test/{test_options.rb → jeweler/generator/test_options.rb}

@@ -2,6 +2,11 @@ require 'test_helper'
 
 class TestOptions < Test::Unit::TestCase
 
+  def setup
+    set_default_git_config
+    stub_git_config valid_git_config
+  end
+
   def self.should_have_testing_framework(testing_framework)
     should "use #{testing_framework} for testing" do
       assert_equal testing_framework.to_sym, @options[:testing_framework]
@@ -15,7 +20,7 @@ class TestOptions < Test::Unit::TestCase
   end
 
   def setup_options(*arguments)
-    @options = Jeweler::Generator::Options.new(arguments)
+    @options = Jeweler::Generator::Options.new(["project_name"] + arguments)
   end
 
   def self.for_options(*options)
@@ -32,18 +37,33 @@ class TestOptions < Test::Unit::TestCase
     should 'not create repository' do
       assert ! @options[:create_repo]
     end
-  end
+    should "have project name" do
+      assert_equal "project_name", @options[:project_name]
+    end
 
-  for_options '--shoulda' do
-    should_have_testing_framework :shoulda
+    should "use github username from git config" do
+      assert_equal @github_user, @options[:github_username]
+    end
+
+    should "use github token from git config" do
+      assert_equal @github_token, @options[:github_token]
+    end
+
+    should "use user name from git config" do
+      assert_equal @git_name, @options[:user_name]
+    end
+
+    should "use user email from git config" do
+      assert_equal @git_email, @options[:user_email]
+    end
   end
 
   for_options "--bacon" do
     should_have_testing_framework :bacon
   end
 
-  for_options "--testunit" do
-    should_have_testing_framework :testunit
+  for_options '--micronaut' do
+    should_have_testing_framework :micronaut
   end
 
   for_options '--minitest' do
@@ -54,8 +74,16 @@ class TestOptions < Test::Unit::TestCase
     should_have_testing_framework :rspec
   end
 
-  for_options '--micronaut' do
-    should_have_testing_framework :micronaut
+  for_options '--shoulda' do
+    should_have_testing_framework :shoulda
+  end
+
+  for_options "--testunit" do
+    should_have_testing_framework :testunit
+  end
+
+  for_options "--testspec" do
+    should_have_testing_framework :testspec
   end
 
   for_options '--cucumber' do
@@ -132,6 +160,42 @@ class TestOptions < Test::Unit::TestCase
     end
   end
 
+  for_options '--user-name', 'myname' 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
+      assert_equal 'myname@mydomain.com', @options[:user_email]
+    end
+  end
+
+  for_options '--homepage', 'http://zomg.com' do
+    should 'set hoempage' do
+      assert_equal 'http://zomg.com', @options[:homepage]
+    end
+  end
+
+  for_options '--git-remote', 'git@my-awesome-domain.com:zomg.git' do
+    should 'set the git remote' do
+      assert_equal 'git@my-awesome-domain.com:zomg.git', @options[:git_remote]
+    end
+  end
+
+  for_options '--github-username', 'mygithub' do
+    should "set github username" do
+      assert_equal 'mygithub', @options[:github_username]
+    end
+  end
+
+  for_options '--github-token', 'mygithubtoken' do
+    should "set github token" do
+      assert_equal 'mygithubtoken', @options[:github_token]
+    end
+  end
+
   context "merging options" do
     should "take options from each" do
       options = Jeweler::Generator::Options.new(["--rspec"]).