ggem 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 78af14258ae315c8ee616b840770779d1084d591
-  data.tar.gz: 227aff8e65f1aca57f6a9b18e30fd67da6c967f2
+  metadata.gz: 47b788c7af22b10dae04d58149767be30d8ff7fb
+  data.tar.gz: 60b3328e31c1ec8f17622281805a6ca824b0c8e8
 SHA512: 
-  metadata.gz: 9652f4d234a556ce6259f83aad0208b1b6ab175ef07b1a426408873ec01d669c55463daf7e91e8d50d840ad0fcc552eafe5934489a2db1320e3af518975d6ff9
-  data.tar.gz: adbb62ae9184ec3ddf508b7a80a6633154de627c41ed60b212567ab026d28642ed6a8827a9ecff82995466e6fc32fb6077711b7a0fec070df65ac168d1fd2d24
+  metadata.gz: e18f2ed64b8a280b01106864e3f098e0828f95ac39994d204214a6e161009ce35d875205bb551ef46dcfefc15e6cbdce9bf1b1c92c3821540e68d42fa4deb3b6
+  data.tar.gz: d55e6b25e1bb96baa96eaa08e6d132661f2469804d973af8b9978cfc6998038d2665df5903935e00d865270da3677c76043e498ed68ab1e1ebf91c3cae6458e4

data/lib/ggem/cli/commands.rb

@@ -225,7 +225,8 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @build_command.run(argv)
+      @build_command.run([])
+
       notify("#{@spec.name} #{@spec.version} installed to system gems") do
         @spec.run_install_cmd
       end
@@ -254,7 +255,7 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @build_command.run(argv)
+      @build_command.run([])
 
       @stdout.puts "Pushing #{@spec.gem_file_name} to #{@spec.push_host}..."
       notify("#{@spec.gem_file_name} received.") do
@@ -359,8 +360,8 @@ class GGem::CLI
 
     def run(argv, *args)
       super
-      @tag_command.run(argv)
-      @push_command.run(argv)
+      @tag_command.run(self.clirb.opts['force-tag'] ? ['--force-tag'] : [])
+      @push_command.run([])
     end
 
     def summary

data/lib/ggem/version.rb

@@ -1,3 +1,3 @@
 module GGem
-  VERSION = "1.8.1"
+  VERSION = "1.8.3"
 end

data/test/unit/cli_tests.rb

@@ -252,6 +252,7 @@ class GGem::CLI
 
   class IOCommandTests < UnitTests
     setup do
+      @argv = [Factory.string]
       @stdout, @stderr = IOSpy.new, IOSpy.new
     end
     subject{ @cmd }
@@ -524,7 +525,6 @@ class GGem::CLI
       Assert.stub(BuildCommand, :new){ |*args| @build_spy = CommandSpy.new(*args) }
 
       @command_class = InstallCommand
-      @argv = []
       @cmd = @command_class.new
     end
 
@@ -545,7 +545,7 @@ class GGem::CLI
       assert_equal exp, subject.help
     end
 
-    should "build a build command using its argv" do
+    should "build a build command" do
       assert @build_spy
     end
 
@@ -554,7 +554,7 @@ class GGem::CLI
       subject.run(@argv, @stdout, @stderr)
 
       assert_true @build_spy.run_called
-      assert_equal @argv, @build_spy.argv
+      assert_equal [], @build_spy.argv
       assert_true @spec_spy.run_install_cmd_called
 
       exp = ENV['DEBUG'] == '1' ? "install\ninstall cmd was run\n" : ''
@@ -583,7 +583,6 @@ class GGem::CLI
       Assert.stub(BuildCommand, :new){ |*args| @build_spy = CommandSpy.new(*args) }
 
       @command_class = PushCommand
-      @argv = []
       @cmd = @command_class.new
     end
 
@@ -604,7 +603,7 @@ class GGem::CLI
       assert_equal exp, subject.help
     end
 
-    should "build a build command using its argv" do
+    should "build a build command" do
       assert @build_spy
     end
 
@@ -613,7 +612,7 @@ class GGem::CLI
       subject.run(@argv, @stdout, @stderr)
 
       assert_true @build_spy.run_called
-      assert_equal @argv, @build_spy.argv
+      assert_equal [], @build_spy.argv
       assert_true @spec_spy.run_push_cmd_called
 
       exp = "Pushing #{@spec_spy.gem_file_name} to #{@spec_spy.push_host}...\n"
@@ -663,8 +662,8 @@ class GGem::CLI
     end
 
     should "be a git repo, gemspec, force tag option command" do
-      assert_kind_of GitRepoCommand, subject
-      assert_kind_of GemspecCommand, subject
+      assert_kind_of GitRepoCommand,        subject
+      assert_kind_of GemspecCommand,        subject
       assert_kind_of ForceTagOptionCommand, subject
     end
 
@@ -724,7 +723,7 @@ class GGem::CLI
       err_on = [:run_validate_clean_cmd, :run_validate_committed_cmd].sample
       Assert.stub(@repo_spy, err_on){ raise GGem::GitRepo::CmdError, err_msg }
 
-      subject.run(['-f'], @stdout, @stderr)
+      subject.run([['--force-tag', '-f'].sample], @stdout, @stderr)
       exp = "There are files that need to be committed first.\n" \
             "Forcing tag anyway...\n"
       assert_equal exp, @stderr.read
@@ -773,12 +772,11 @@ class GGem::CLI
       Assert.stub(PushCommand, :new){ |*args| @push_spy = CommandSpy.new(*args) }
 
       @command_class = ReleaseCommand
-      @argv = []
       @cmd = @command_class.new
     end
 
     should "be a gemspec, force tag option command" do
-      assert_kind_of GemspecCommand, subject
+      assert_kind_of GemspecCommand,        subject
       assert_kind_of ForceTagOptionCommand, subject
     end
 
@@ -797,7 +795,7 @@ class GGem::CLI
       assert_equal exp, subject.help
     end
 
-    should "build a tag and push command using its argv" do
+    should "build a tag and push command" do
       [@tag_spy, @push_spy].each do |spy|
         assert spy
       end
@@ -806,10 +804,22 @@ class GGem::CLI
     should "run the tag and push command when run" do
       subject.run(@argv, @stdout, @stderr)
 
-      [@tag_spy, @push_spy].each do |spy|
-        assert_true spy.run_called
-        assert_equal @argv, spy.argv
-      end
+      assert_true @tag_spy.run_called
+      assert_equal [], @tag_spy.argv
+
+      assert_true @push_spy.run_called
+      assert_equal [], @push_spy.argv
+    end
+
+    should "pass any force-tag option to the tag cmd but not the release cmd" do
+      force_tag_argv = [['--force-tag', '-f'].sample]
+      subject.run(force_tag_argv, @stdout, @stderr)
+
+      assert_true @tag_spy.run_called
+      assert_equal ['--force-tag'], @tag_spy.argv
+
+      assert_true @push_spy.run_called
+      assert_equal [], @push_spy.argv
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ggem
 version: !ruby/object:Gem::Version 
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors: 
 - Kelly Redding