ggem 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 9bb7a69fa7315e7512e780ebe935557f2e4b2664
-  data.tar.gz: 8aadfede4196531dc4af409a5856805818065ba3
+  metadata.gz: 78af14258ae315c8ee616b840770779d1084d591
+  data.tar.gz: 227aff8e65f1aca57f6a9b18e30fd67da6c967f2
 SHA512: 
-  metadata.gz: 7f6fe5a9353e8dcc1fb53ab4f3d6115c0d0d53d64f5bd79e4fe47fc85368ba1256916a91d6877ff2f16e62aaa1d4b14038ab98169f4662c3995bcec8ef05421b
-  data.tar.gz: f9dd50efd68643021c9a6ea8780c9f3547c5355905917f54ac66c472bec450627fdb559c3ecc5ad75ad6d1d04604d5913eb5a12ae0a074f2ab6de2a3f1b8a7d6
+  metadata.gz: 9652f4d234a556ce6259f83aad0208b1b6ab175ef07b1a426408873ec01d669c55463daf7e91e8d50d840ad0fcc552eafe5934489a2db1320e3af518975d6ff9
+  data.tar.gz: adbb62ae9184ec3ddf508b7a80a6633154de627c41ed60b212567ab026d28642ed6a8827a9ecff82995466e6fc32fb6077711b7a0fec070df65ac168d1fd2d24

data/Gemfile

@@ -2,5 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake', "~> 10.4.0"
-gem 'pry',  "~> 0.9.0"
+gem 'pry', "~> 0.9.0"

data/ggem.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version     = GGem::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{"Juh Gem", baby! (a gem utility CLI)}
   gem.summary     = %q{"Juh Gem", baby! (a gem utility CLI)}
+  gem.description = %q{"Juh Gem", baby! (a gem utility CLI)}
   gem.homepage    = "http://github.com/redding/ggem"
   gem.license     = 'MIT'
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.15.0"])
+  gem.add_development_dependency("assert", ["~> 2.16.1"])
 
   gem.add_dependency("much-plugin", ["~> 0.1.0"])
   gem.add_dependency("scmd",        ["~> 3.0.1"])

data/lib/ggem/cli/commands.rb

@@ -42,8 +42,8 @@ class GGem::CLI
 
     module InstanceMethods
 
-      def initialize
-        @clirb  = CLIRB.new
+      def initialize(&clirb_build)
+        @clirb = CLIRB.new(&clirb_build)
       end
 
       def clirb; @clirb; end
@@ -275,9 +275,32 @@ class GGem::CLI
 
   end
 
+  module ForceTagOptionCommand
+    include MuchPlugin
+
+    plugin_included do
+      include ValidCommand
+      include InstanceMethods
+    end
+
+    module InstanceMethods
+
+      def initialize
+        super do
+          option 'force-tag', 'force tagging even with uncommitted files', {
+            :abbrev => 'f'
+          }
+        end
+      end
+
+    end
+
+  end
+
   class TagCommand
     include GitRepoCommand
     include GemspecCommand
+    include ForceTagOptionCommand
 
     def run(argv, *args)
       super
@@ -287,7 +310,11 @@ class GGem::CLI
         cmd{ @repo.run_validate_committed_cmd }
       rescue GGem::GitRepo::CmdError => err
         @stderr.puts "There are files that need to be committed first."
-        raise CommandExitError
+        if self.clirb.opts['force-tag']
+          @stderr.puts "Forcing tag anyway..."
+        else
+          raise CommandExitError
+        end
       end
 
       cmd{ @repo.run_add_version_tag_cmd(@spec.version, @spec.version_tag) }
@@ -322,6 +349,7 @@ class GGem::CLI
 
   class ReleaseCommand
     include GemspecCommand
+    include ForceTagOptionCommand
 
     def initialize(*args)
       super

data/lib/ggem/template_file/gemspec.erb

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.15.0"])
+  gem.add_development_dependency("assert", ["~> 2.16.1"])
   # TODO: gem.add_dependency("gem-name", ["~> 0.0.0"])
 
 end

data/lib/ggem/template_file/test_helper.rb.erb

@@ -9,4 +9,13 @@ require 'pry'
 
 require 'test/support/factory'
 
+# 1.8.7 backfills
+
+# Array#sample
+if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
+  class Array
+    alias_method :sample, :choice
+  end
+end
+
 # TODO: put test helpers here...

data/lib/ggem/version.rb

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

data/test/helper.rb

@@ -12,3 +12,12 @@ TEST_SUPPORT_PATH = ROOT_PATH.join('test/support')
 require 'pry'
 
 require 'test/support/factory'
+
+# 1.8.7 backfills
+
+# Array#sample
+if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
+  class Array
+    alias_method :sample, :choice
+  end
+end

data/test/support/cmd_tests_helpers.rb

@@ -32,7 +32,7 @@ module GGem
       end
 
       def assert_exp_cmds_error(cmd_error_class, &run_cmd_block)
-        err_cmd_str = @exp_cmds_run.choice
+        err_cmd_str = @exp_cmds_run.sample
         Scmd.add_command(err_cmd_str) do |cmd|
           cmd.exitstatus = 1
           cmd.stderr     = Factory.string

data/test/unit/cli_tests.rb

@@ -231,7 +231,7 @@ class GGem::CLI
     end
 
     should "raise a help exit if its name is empty" do
-      cmd = @command_class.new([nil, ''].choice)
+      cmd = @command_class.new([nil, ''].sample)
       argv = [Factory.string, Factory.string]
       assert_raises(CLIRB::HelpExit){ cmd.new.run(argv) }
     end
@@ -277,6 +277,14 @@ class GGem::CLI
       assert_equal argv, subject.clirb.args
     end
 
+    should "take custom CLIRB build procs" do
+      cmd = @command_class.new do
+        option 'test', 'testing', :abbrev => 't'
+      end
+      cmd.run(['-t'], @stdout, @stderr)
+      assert_true cmd.clirb.opts['test']
+    end
+
     should "default its summary" do
       assert_equal '', subject.summary
     end
@@ -485,7 +493,7 @@ class GGem::CLI
     end
 
     should "call the spec's run build cmd when run" do
-      ENV['DEBUG'] = [nil, '1'].choice
+      ENV['DEBUG'] = [nil, '1'].sample
       subject.run([], @stdout, @stderr)
 
       assert_true @spec_spy.run_build_cmd_called
@@ -542,7 +550,7 @@ class GGem::CLI
     end
 
     should "run the build command and call the spec's run install cmds when run" do
-      ENV['DEBUG'] = [nil, '1'].choice
+      ENV['DEBUG'] = [nil, '1'].sample
       subject.run(@argv, @stdout, @stderr)
 
       assert_true @build_spy.run_called
@@ -601,7 +609,7 @@ class GGem::CLI
     end
 
     should "run the build command and call the spec's run push cmds when run" do
-      ENV['DEBUG'] = [nil, '1'].choice
+      ENV['DEBUG'] = [nil, '1'].sample
       subject.run(@argv, @stdout, @stderr)
 
       assert_true @build_spy.run_called
@@ -626,6 +634,24 @@ class GGem::CLI
 
   end
 
+  class ForceTagOptionCommandTests < IOCommandTests
+    desc "ForceTagOptionCommand"
+    setup do
+      @command_class = Class.new{ include ForceTagOptionCommand }
+      @cmd = @command_class.new
+    end
+
+    should "be a valid command" do
+      assert_kind_of ValidCommand, subject
+    end
+
+    should "add a force-tag CLIRB option" do
+      subject.run(['-f'], @stdout, @stderr)
+      assert_true subject.clirb.opts['force-tag']
+    end
+
+  end
+
   class TagCommandTests < IOCommandTests
     include GitRepoSpyTests
     include GemspecSpyTests
@@ -636,8 +662,10 @@ class GGem::CLI
       @cmd = @command_class.new
     end
 
-    should "be a gemspec command" do
+    should "be a git repo, gemspec, force tag option command" do
+      assert_kind_of GitRepoCommand, subject
       assert_kind_of GemspecCommand, subject
+      assert_kind_of ForceTagOptionCommand, subject
     end
 
     should "know its summary" do
@@ -654,7 +682,7 @@ class GGem::CLI
     end
 
     should "call the repo's run build/push cmds when run" do
-      ENV['DEBUG'] = [nil, '1'].choice
+      ENV['DEBUG'] = [nil, '1'].sample
       subject.run([], @stdout, @stderr)
 
       assert_true @repo_spy.run_validate_clean_cmd_called
@@ -683,7 +711,7 @@ class GGem::CLI
 
     should "handle validation cmd errors when run" do
       err_msg = Factory.string
-      err_on = [:run_validate_clean_cmd, :run_validate_committed_cmd].choice
+      err_on = [:run_validate_clean_cmd, :run_validate_committed_cmd].sample
       Assert.stub(@repo_spy, err_on){ raise GGem::GitRepo::CmdError, err_msg }
 
       assert_raises(CommandExitError){ subject.run([], @stdout, @stderr) }
@@ -691,9 +719,20 @@ class GGem::CLI
       assert_equal exp, @stderr.read
     end
 
+    should "ignore validation cmd errors when run with the force-tag option" do
+      err_msg = Factory.string
+      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)
+      exp = "There are files that need to be committed first.\n" \
+            "Forcing tag anyway...\n"
+      assert_equal exp, @stderr.read
+    end
+
     should "handle non-validation cmd errors when run" do
       err_msg = Factory.string
-      err_on = [:run_add_version_tag_cmd, :run_push_cmd].choice
+      err_on = [:run_add_version_tag_cmd, :run_push_cmd].sample
       Assert.stub(@repo_spy, err_on){ raise GGem::GitRepo::CmdError, err_msg }
 
       assert_raises(CommandExitError){ subject.run([], @stdout, @stderr) }
@@ -738,8 +777,9 @@ class GGem::CLI
       @cmd = @command_class.new
     end
 
-    should "be a gemspec command" do
+    should "be a gemspec, force tag option command" do
       assert_kind_of GemspecCommand, subject
+      assert_kind_of ForceTagOptionCommand, subject
     end
 
     should "know its summary" do
@@ -802,14 +842,14 @@ class GGem::CLI
       exp_strs << "add1          # #{subject['add1'].summary}"
 
       @cmd_spy = CommandSpy.new
-      Assert.stub(@cmd_spy, :summary){ [nil, ''].choice }
+      Assert.stub(@cmd_spy, :summary){ [nil, ''].sample }
       Assert.stub(CommandSpy, :new){ @cmd_spy }
 
       subject.add(CommandSpy, 'add2', 'add')
       exp_strs << "add2 (add)    "
 
       subject.add(CommandSpy, 'add3')
-      Assert.stub(subject['add3'], :summary){ [nil, ''].choice }
+      Assert.stub(subject['add3'], :summary){ [nil, ''].sample }
       exp_strs << "add3          "
 
       assert_equal exp_strs.join("\n"), subject.to_s

data/test/unit/gem_tests.rb

@@ -29,7 +29,7 @@ class GGem::Gem
 
     should "complain if no name is provided" do
       assert_raises(NoNameError) do
-        @gem_class.new(TMP_PATH, [nil, ''].choice)
+        @gem_class.new(TMP_PATH, [nil, ''].sample)
       end
     end
 

data/test/unit/gemspec_tests.rb

@@ -71,7 +71,7 @@ class GGem::Gemspec
       # prefer the env push hosts over configured and default hosts
       prev_env_push_host = ENV['GGEM_PUSH_HOST']
       ENV['GGEM_PUSH_HOST'] = Factory.string
-      spec = @gemspec_class.new(TEST_SUPPORT_PATH.join(['gem1', 'gem2'].choice))
+      spec = @gemspec_class.new(TEST_SUPPORT_PATH.join(['gem1', 'gem2'].sample))
       assert_equal ENV['GGEM_PUSH_HOST'], spec.push_host
       ENV['GGEM_PUSH_HOST'] = prev_env_push_host
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ggem
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,38 +10,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-01-04 00:00:00 Z
+date: 2016-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.15.0
+        version: 2.16.1
   type: :development
-  requirement: *id001
   name: assert
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.1.0
   type: :runtime
-  requirement: *id002
   name: much-plugin
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.1
   type: :runtime
-  requirement: *id003
   name: scmd
-  prerelease: false
+  version_requirements: *id003
 description: "\"Juh Gem\", baby! (a gem utility CLI)"
 email: 
 - kelly@kellyredding.com
@@ -57,7 +57,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - bin/ggem
 - ggem.gemspec
 - lib/ggem.rb
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: "\"Juh Gem\", baby! (a gem utility CLI)"

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"