hoe 3.24.0 → 3.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb122a688a65479576dd094bf310d32eac67a003a402e4eedd20575a3ab125f
-  data.tar.gz: a505faf19cab47471c35529a04c57a5e5f490190783691eb060f1a699b6a56bc
+  metadata.gz: 55420e46afc4913200cd7bcb4ec75e026722a4b66471c95b3ba7e9d111782697
+  data.tar.gz: 0ef8f2b3e9703c82a3e7fa84df62a18f28b8a10131afcd7a98064c3bcd98d349
 SHA512:
-  metadata.gz: 5b78311752ceff6ce02081439d4c460bce0b70fb2e0f6c3754857e924aab4de790de17cffc960bdec2827b079acc9e63dac2941403324fd850db72c048503c96
-  data.tar.gz: 495338f933baf41253f578acc106fb4a10237ae07bca733ddd110f7b15b5fdbdc23997a35ff4263b661c774aaa298b17eb2d48e55ff2bff05ecdc6271de12aa0
+  metadata.gz: a2a1f33e796aa3a0c2f442275d4da908558d7829bedf5e72fd329b2453b1a9621287ec6605099b207ac1bca8db2c089dbeba921c1976a4e147709bf59923a147
+  data.tar.gz: 8a58eccbbb9270167a0edcd007cf0ca1278d2b1f5abae7e2c8d2846c1d4d63456976d69541806f63aa5f894f15c1e2f19506d8f8baf9aa29c43c74b9db9046d0

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 3.25.0 / 2022-08-18
+
+* 1 minor enhancement:
+
+  * Added otp_command config option for OTP auth on gem push.
+
+* 1 bug fix:
+
+  * Use sh instead of system during gem install to raise on error.
+
 === 3.24.0 / 2022-06-20
 
 * 3 minor enhancements:

data/lib/hoe/gemcutter.rb

@@ -1,8 +1,29 @@
 require "rake"
 
+##
+# Gemcutter plugin for hoe.
+#
+# === Extra Configuration Options:
+#
+# otp_command:: Shell command to run to populate GEM_HOST_OTP_CODE.
+
 module Hoe::Gemcutter
   include Rake::DSL if defined?(Rake::DSL)
 
+  Hoe::DEFAULT_CONFIG["otp_command"] = false
+
+  def gem_push gems
+    with_config do |config, _|
+      otp_command = config["otp_command"]
+
+      ENV["GEM_HOST_OTP_CODE"] = `#{otp_command}`.chomp if otp_command
+    end
+
+    gems.each do |g|
+      sh Gem.ruby, "-S", "gem", "push", g
+    end
+  end
+
   ##
   # Define release_to_gemcutter and attach it to the release task.
 
@@ -11,11 +32,8 @@ module Hoe::Gemcutter
     task :release_to_gemcutter => [:clean, :package, :release_sanity] do
       pkg   = "pkg/#{spec.name}-#{spec.version}"
       gems  = Dir["#{pkg}*.gem"]
-      gems.each do |g|
-        # TODO - once gemcutter supports command invocation, use it.
-        # We could still fail here due to --format executable
-        sh Gem.ruby, "-S", "gem", "push", g
-      end
+
+      gem_push gems
     end
 
     task :release_to => :release_to_gemcutter

data/lib/hoe/package.rb

@@ -100,8 +100,7 @@ module Hoe::Package
     cmd += " --no-document" unless rdoc
     cmd += " #{null_dev}" unless Rake.application.options.trace
 
-    puts cmd if Rake.application.options.trace
-    result = system cmd
+    result = sh cmd
     Gem::Specification.reset
     result
   end

data/lib/hoe.rb

@@ -87,7 +87,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "3.24.0"
+  VERSION = "3.25.0"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]

data/test/test_hoe.rb

@@ -465,14 +465,14 @@ class TestHoe < Minitest::Test
 
   def test_nosudo
     hoe = self.hoe do
-      def system cmd
+      def sh cmd
         cmd
       end
     end
 
-    assert_match(/^(sudo )?(j|maglev-)?gem.*/, hoe.install_gem("foo"))
+    assert_match(/^(sudo )?gem.*/, hoe.install_gem("foo"))
     ENV["NOSUDO"] = "1"
-    assert_match(/^(j|maglev-)?gem.*/, hoe.install_gem("foo"))
+    assert_match(/^gem.*/, hoe.install_gem("foo"))
   ensure
     ENV.delete "NOSUDO"
   end

data/test/test_hoe_gemcutter.rb

@@ -11,5 +11,28 @@ class TestHoeGemcutter < Minitest::Test
     assert Rake::Task[:release_to].prerequisites.include?("release_to_gemcutter")
   end
 
-  # TODO add tests for push once using Gem::Commands::Push (waiting on rubygems release)
+  def sh *cmd_args
+    @cmd_args = cmd_args
+  end
+
+  def with_config
+    yield({ "otp_command" => "echo my_otp_code"}, "~/.hoerc")
+  end
+
+  def save_env
+    orig_env = ENV.to_h
+    yield
+  ensure
+    ENV.replace orig_env
+  end
+
+  def test_gem_push
+    save_env do
+      gem_push %w[pkg/blah-123.gem]
+
+      exp = %W[#{Gem.ruby} -S gem push pkg/blah-123.gem]
+      assert_equal exp, @cmd_args
+      assert_equal "my_otp_code", ENV["GEM_HOST_OTP_CODE"]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.25.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
   YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,6 +51,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '15.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement