hoe 3.24.0 → 3.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb122a688a65479576dd094bf310d32eac67a003a402e4eedd20575a3ab125f
-  data.tar.gz: a505faf19cab47471c35529a04c57a5e5f490190783691eb060f1a699b6a56bc
+  metadata.gz: b3cc28399dd8b7e10dc915b12bc3a9aba7baf0948753f52ad292cbfecf24929a
+  data.tar.gz: 5fb0f5df02f4597b4229f685707a4e27a977c6df70be287a24698e381ac71095
 SHA512:
-  metadata.gz: 5b78311752ceff6ce02081439d4c460bce0b70fb2e0f6c3754857e924aab4de790de17cffc960bdec2827b079acc9e63dac2941403324fd850db72c048503c96
-  data.tar.gz: 495338f933baf41253f578acc106fb4a10237ae07bca733ddd110f7b15b5fdbdc23997a35ff4263b661c774aaa298b17eb2d48e55ff2bff05ecdc6271de12aa0
+  metadata.gz: 9c8fa5004607a777baff624078e9fcac387afa84c356b872970a684241314249bc6751b979662abbabe6e36301c389605544c9d7637253d81c981d21ef1a3ab2
+  data.tar.gz: 74db46687d2d171cae8a7d469f26167e878e403d27c85631b23828b6842fbe053357e965158c4deef4b78b8b5ae07f96cfba9dacffd47ff5308cd9580b5a483f

data/History.rdoc

@@ -1,3 +1,24 @@
+=== 3.26.0 / 2022-10-20
+
+* 2 minor enhancements:
+
+  * Added warning to bundled minitest/test_task.
+  * Removed dead rcov plugin and added (simple)cov plugin.
+
+* 1 bug fix:
+
+  * Fixed test task load path issue, prepend Hoe.include_dirs to ensure they come first.
+
+=== 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/Manifest.txt

@@ -8,6 +8,7 @@ bin/sow
 lib/hoe.rb
 lib/hoe/clean.rb
 lib/hoe/compiler.rb
+lib/hoe/cov.rb
 lib/hoe/debug.rb
 lib/hoe/deps.rb
 lib/hoe/flay.rb
@@ -20,7 +21,6 @@ lib/hoe/package.rb
 lib/hoe/publish.rb
 lib/hoe/racc.rb
 lib/hoe/rake.rb
-lib/hoe/rcov.rb
 lib/hoe/rdoc.rb
 lib/hoe/signing.rb
 lib/hoe/test.rb

data/Rakefile

@@ -6,6 +6,7 @@ require "./lib/hoe.rb"
 Hoe.plugin :seattlerb
 Hoe.plugin :isolate
 Hoe.plugin :rdoc
+Hoe.plugin :cov
 
 Hoe.spec "hoe" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"

data/lib/hoe/clean.rb

@@ -16,7 +16,7 @@ module Hoe::Clean
 
   def initialize_clean
     self.clean_globs ||= %w[diff diff.txt TAGS ri deps .source_index
-                            *.gem **/*~ **/.*~ **/*.rbc coverage*]
+                            *.gem **/*~ **/.*~ **/*.rbc]
   end
 
   ##

data/lib/hoe/cov.rb

@@ -0,0 +1,34 @@
+##
+# Coverage plugin for hoe. Uses simplecov.
+#
+# === Tasks Provided:
+#
+# cov:: Analyze code coverage with tests using simplecov.
+
+module Hoe::Cov
+
+  ##
+  # Activate the cov dependencies.
+
+  def activate_cov_deps
+    dependency "simplecov", "~> 0.21", :development
+  end
+
+  ##
+  # Define tasks for plugin.
+
+  def define_cov_tasks
+    task :isolate # ensure it exists
+
+    self.clean_globs << "coverage"
+
+    desc "Run tests and analyze code coverage"
+    task :cov => :isolate do
+      test_task.test_prelude = "require \"simplecov\"; SimpleCov.start"
+
+      Rake::Task[:test].invoke
+    end
+  rescue LoadError
+    warn "simplecov not found"
+  end
+end

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/test.rb

@@ -56,6 +56,11 @@ module Hoe::Test
 
   attr_accessor :rspec_options
 
+  ##
+  # The test task created for this plugin.
+
+  attr_accessor :test_task
+
   ##
   # Initialize variables for plugin.
 
@@ -81,9 +86,9 @@ module Hoe::Test
         require "minitest/test_task" # currently in hoe, but will move
 
         test_prelude = self.test_prelude
-        Minitest::TestTask.create :test do |t|
+        self.test_task = Minitest::TestTask.create :test do |t|
           t.test_prelude = test_prelude
-          t.libs += Hoe.include_dirs.uniq
+          t.libs.prepend Hoe.include_dirs.uniq
         end
       when :testunit then
         desc "Run the test suite. Use FILTER or TESTOPTS to add flags/args."

data/lib/hoe.rb

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

data/lib/minitest/test_task.rb

@@ -2,6 +2,15 @@ require "shellwords"
 require "rbconfig"
 require "rake/tasklib"
 
+warn <<~EOM
+    minitest/test_task.rb is now packaged with minitest. If you see
+    this, you are getting it from hoe instead. If you're NOT able to
+    upgrade minitest to pick this up, please drop an issue on
+    seattlerb/hoe and let me know.
+
+    Required from #{caller[2]}
+EOM
+
 module Minitest # :nodoc:
 
   ##

data/test/test_hoe.rb

@@ -265,7 +265,7 @@ class TestHoe < Minitest::Test
     h = nil
     nokogiri_readme = <<~EOM
       ## Links
-      
+
       * https://nokogiri.org
       * [Installation Help](https://nokogiri.org/tutorials/installing_nokogiri.html)
       * [Tutorials](https://nokogiri.org/tutorials/toc.html)
@@ -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_debug.rb

@@ -1,8 +1,7 @@
+require "minitest/autorun"
 require "hoe"
-require File.expand_path "lib/hoe/debug.rb" # ugh. avoid dupe warnings
+require_relative "../lib/hoe/debug"
 require "tmpdir"
-require "tempfile"
-require "minitest/autorun"
 
 class TestHoeDebug < Minitest::Test
 

data/test/test_hoe_gemcutter.rb

@@ -1,6 +1,6 @@
-require "hoe"
-require "hoe/gemcutter" unless defined? Hoe::Gemcutter
 require "minitest/autorun"
+require "hoe"
+require_relative "../lib/hoe/gemcutter"
 
 class TestHoeGemcutter < Minitest::Test
   include Hoe::Gemcutter
@@ -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

data/test/test_hoe_package.rb

@@ -1,5 +1,5 @@
-require "hoe"
 require "minitest/autorun"
+require "hoe"
 
 Hoe.load_plugins
 

data/test/test_hoe_publish.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "minitest/autorun"
 require "hoe"
 

data/test/test_hoe_test.rb

@@ -1,5 +1,6 @@
 require "minitest/autorun"
 require "hoe"
+require "minitest/test_task" # currently in hoe, but will move
 
 Hoe.load_plugins # make sure Hoe::Test is loaded
 
@@ -60,11 +61,9 @@ class TestHoeTest < Minitest::Test
   def test_make_test_cmd_for_minitest
     skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
 
-    require "minitest/test_task" # currently in hoe, but will move
-
     framework = %(require "minitest/autorun"; )
 
-    @tester = Minitest::TestTask.create :test do |t|
+    @tester = Minitest::TestTask.create :testtest do |t|
       t.libs += Hoe.include_dirs.uniq
       t.test_globs = ["test/test_hoe_test.rb"]
     end
@@ -75,8 +74,6 @@ class TestHoeTest < Minitest::Test
   def test_make_test_cmd_for_minitest_prelude
     skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
 
-    require "minitest/test_task" # currently in hoe, but will move
-
     prelude = %(require "other/file")
     framework = %(require "minitest/autorun"; )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.26.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-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,6 +71,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 description: |-
   Hoe is a rake/rubygems helper for project Rakefiles. It helps you
   manage, maintain, and release your project and includes a dynamic
@@ -102,6 +116,7 @@ files:
 - lib/hoe.rb
 - lib/hoe/clean.rb
 - lib/hoe/compiler.rb
+- lib/hoe/cov.rb
 - lib/hoe/debug.rb
 - lib/hoe/deps.rb
 - lib/hoe/flay.rb
@@ -114,7 +129,6 @@ files:
 - lib/hoe/publish.rb
 - lib/hoe/racc.rb
 - lib/hoe/rake.rb
-- lib/hoe/rcov.rb
 - lib/hoe/rdoc.rb
 - lib/hoe/signing.rb
 - lib/hoe/test.rb

data/lib/hoe/rcov.rb

@@ -1,68 +0,0 @@
-##
-# RCov plugin for hoe.
-#
-# === Tasks Provided:
-#
-# rcov::               Analyze code coverage with tests
-
-module Hoe::RCov
-
-  ##
-  # Activate the rcov dependencies.
-
-  def activate_rcov_deps
-    dependency "rcov", "~> 0.9", :development
-  end
-
-  ##
-  # Define tasks for plugin.
-
-  def define_rcov_tasks
-    task :isolate # ensure it exists
-
-    task :rcov => :isolate do
-      sh(*make_rcov_cmd)
-    end
-
-    task :clobber_rcov do
-      rm_rf "coverage"
-    end
-
-    task :clobber => :clobber_rcov
-
-    # this is for my emacs rcov overlay stuff on emacswiki.
-    task :rcov_overlay do
-      path = ENV["FILE"]
-      rcov, eol = Marshal.load(File.read("coverage.info")).last[path], 1
-      puts rcov[:lines].zip(rcov[:coverage]).map { |line, coverage|
-        bol, eol = eol, eol + line.length
-        [bol, eol, "#ffcccc"] unless coverage
-      }.compact.inspect
-    end
-  rescue LoadError
-    # skip
-    task :clobber_rcov # in case rcov didn't load
-    # TODO: didn't load? this must be terribly historical
-  end
-
-  def make_rcov_cmd # :nodoc:
-    rcov  = Gem.bin_wrapper "rcov"
-    tests = test_globs.sort.map { |g| Dir.glob(g) }.flatten.map(&:inspect)
-
-    cmd = %W[#{rcov}
-             #{Hoe::RUBY_FLAGS}
-             --text-report
-             --no-color
-             --save coverage.info
-             -x ^/
-             -x tmp/isolate
-             --sort coverage
-             --sort-reverse
-             -o coverage
-            ] + tests
-
-    cmd
-  end
-end
-
-task :clean => :clobber_rcov