hoe 4.6.1 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7dba45c80f5bbddc2b84068e7c118f72a4e67c3d18f3bab129cb889928a468
-  data.tar.gz: 1a2aac15390a9b5e245d5e0eec7917c398321047cc2a4ff11cb8b1bf0e12a0f0
+  metadata.gz: 20ec1f5d237fc914227d856620a07c1b89a0fd4b9b30774cad19ac0aeaf5447f
+  data.tar.gz: e7d40ade197f7de061bf861dfb232177dccbb4bd95327d7f67690eb147df2e1e
 SHA512:
-  metadata.gz: de0cc99b4c941f729c2b4fd248354efee6cc939ce390a9c10506203d46d6afcbd3e1e89d39b45e2e7b683175077d219c5e7b3bb6f7285218bd0561cb49678423
-  data.tar.gz: ed575ecb590c942e0d61ffd11eb2fc0162f8a98fc8ad65d0e72c5410d802fab3dce0ed369d1787793e885d43f0f74146f825f45f64e9afcffe7f3b602873d318
+  metadata.gz: 33e07aa62f9cee923c51e36a39698d91752e86e1d644750a2c16d42d4413eb0bd998991730b6c33bd03b487e384a6f552ec821174318be8f40cdc010d1d2cf2d
+  data.tar.gz: 7788b5fbbb8314a5dfa05653adcef61e6399760d4ff9ace79cb5ced206f9aa0a2b72015384d927ad11b5ebe1ec23067116951f7d0ee6ba6c256571211f87b0e1

data/History.rdoc

@@ -1,3 +1,16 @@
+=== 4.7.1 / 2026-07-03
+
+* 1 bug fix:
+
+  * Remove Manifest.txt from extra_rdoc_files as latest rdoc mangles the file.
+
+=== 4.7.0 / 2026-04-22
+
+* 2 minor enhancements:
+
+  * Added cov_branches to enable branch level coverage reporting.
+  * Merged hoe/gemcutter into hoe/package. Distinction doesn't make sense.
+
 === 4.6.1 / 2026-02-23
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -14,7 +14,6 @@ lib/hoe/deps.rb
 lib/hoe/flay.rb
 lib/hoe/flog.rb
 lib/hoe/gem_prelude_sucks.rb
-lib/hoe/gemcutter.rb
 lib/hoe/git.rb
 lib/hoe/inline.rb
 lib/hoe/newb.rb
@@ -35,7 +34,6 @@ template/lib/file_name.rb.erb
 template/test/test_file_name.rb.erb
 test/test_hoe.rb
 test/test_hoe_debug.rb
-test/test_hoe_gemcutter.rb
 test/test_hoe_package.rb
 test/test_hoe_publish.rb
 test/test_hoe_test.rb

data/lib/hoe/cov.rb

@@ -9,11 +9,21 @@ module Hoe::Cov
 
   ##
   # Directories to filter out from coverage.
+  #
+  # The default = tmp:test
 
   attr_accessor :cov_filter
 
+  ##
+  # Set to true to enable branch level coverage reporting.
+  #
+  # The default = false
+
+  attr_accessor :cov_branches
+
   def initialize_cov # :nodoc:
     self.cov_filter = %w[tmp test]
+    self.cov_branches = nil
   end
 
   ##
@@ -33,8 +43,9 @@ module Hoe::Cov
 
     desc "Run tests and analyze code coverage"
     task :cov => :isolate do
+      extra = cov_branches && "; enable_coverage :branch"
       test_task.test_prelude =
-        %(require "simplecov"; SimpleCov.start { add_filter %p }) % [cov_filter]
+        %(require "simplecov"; SimpleCov.start { add_filter %p%s }) % [cov_filter, extra]
 
       Rake::Task[:test].invoke
     end

data/lib/hoe/package.rb

@@ -18,6 +18,10 @@ end
 # release::            Package and upload the release.
 
 module Hoe::Package
+  include Rake::DSL if defined?(Rake::DSL)
+
+  Hoe::DEFAULT_CONFIG["otp_command"] = false
+
   ##
   # Optional: Should package create a tarball? [default: true]
 
@@ -80,6 +84,16 @@ module Hoe::Package
       abort "Versions don't match: %s vs %s" % [v, version] if v != version
       abort "Versions don't match %s: %s vs %s" % [history_file, v, c] if v != c
     end
+
+    desc "Push gem to package."
+    task :release_to_rubygems => [:clean, :package, :release_sanity] do
+      pkg   = "pkg/#{spec.name}-#{spec.version}"
+      gems  = Dir["#{pkg}*.gem"]
+
+      gem_push gems
+    end
+
+    task :release_to => :release_to_rubygems
   end
 
   ##
@@ -121,4 +135,19 @@ module Hoe::Package
       (Gem::VERSION < "1.4"  and pre !~ /^[a-z]+(\.\d+)?$/) or
       (Gem::VERSION >= "1.4" and pre !~ /^[a-z]+(\.?\d+)?$/)
   end
+
+  ##
+  # Push gems to server.
+
+  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
 end

data/lib/hoe.rb

@@ -87,10 +87,10 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "4.6.1"
+  VERSION = "4.7.1"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
-               :publish, :gemcutter, :signing, :test]
+               :publish, :signing, :test]
 
   @bad_plugins = []
 
@@ -580,9 +580,15 @@ class Hoe
         s.author  = author
       end
 
-      s.extra_rdoc_files += s.files.grep(/\.(txt|rdoc|md)$/)
-      s.extra_rdoc_files.reject! { |f| f =~ %r%^(test|spec|vendor|template|data|tmp)/% }
-      s.extra_rdoc_files += @extra_rdoc_files
+      # TODO: pull up to accessors?
+      bad_files = %w[ Manifest.txt ]
+      bad_dirs  = %w[ test spec vendor template data tmp ]
+
+      s.extra_rdoc_files += s.files
+        .grep(/\.(txt|rdoc|md)$/)
+        .grep_v(/^(?:#{bad_files.join "|"})/)
+        .grep_v(/^(?:#{bad_dirs.join "|"})\//)
+      s.extra_rdoc_files += self.extra_rdoc_files
     end
 
     check_for_version

data/test/test_hoe.rb

@@ -374,7 +374,7 @@ class TestHoe < Minitest::Test
 
     assert_equal urls, hoe.urls
 
-    text_files = files.grep(/(txt|rdoc)$/).reject { |f| f =~ /template/ }
+    text_files = files.grep(/(txt|rdoc)$/).reject { |f| f =~ /template|Manifest/ }
 
     assert_equal "blah", spec.name
     assert_equal "1.2.3", spec.version.to_s

data/test/test_hoe_package.rb

@@ -1,7 +1,6 @@
 require "minitest/autorun"
 require "hoe"
-
-Hoe.load_plugins
+require_relative "../lib/hoe/package.rb"
 
 class TestHoePackage < Minitest::Test
   def setup
@@ -23,6 +22,10 @@ class TestHoePackage < Minitest::Test
       end
 
       attr_reader :spec
+
+      def with_config
+        yield({ "otp_command" => "echo my_otp_code"}, "~/.hoerc")
+      end
     end
   end
 
@@ -31,6 +34,55 @@ class TestHoePackage < Minitest::Test
     ENV["PRERELEASE"] = @orig_PRERELEASE
   end
 
+  def assert_task name, *deps
+    dep = Rake::Task[name]
+    assert dep
+    prereqs = dep.prerequisites.map(&:to_sym)
+    deps.each do |dep|
+      # not asserting existence of tasks because they might be in other plugins
+      assert_includes prereqs, dep.to_sym
+    end
+  end
+
+  def test_package_tasks_defined
+    @tester.define_package_tasks
+
+    assert_task :gem, :clean
+    assert_task :install_gem, :clean, :package, :check_extra_deps
+    assert_task :postrelease
+    assert_task :prerelease
+    assert_task :release, :prerelease, :release_to, :postrelease
+    assert_task :release_sanity
+    assert_task :release_to
+    assert_task :release_to, :release_to_rubygems
+    assert_task :release_to_rubygems, :clean, :package, :release_sanity
+  end
+
+  def save_env
+    orig_env = ENV.to_h
+    yield
+  ensure
+    ENV.replace orig_env
+  end
+
+  def test_gem_push
+    def @tester.sh *cmd_args
+      @cmd_args = cmd_args
+    end
+
+    def @tester.cmd_args
+      @cmd_args
+    end
+
+    save_env do
+      @tester.gem_push %w[pkg/blah-123.gem]
+
+      exp = %W[#{Gem.ruby} -S gem push pkg/blah-123.gem]
+      assert_equal exp, @tester.cmd_args
+      assert_equal "my_otp_code", ENV["GEM_HOST_OTP_CODE"]
+    end
+  end
+
   def test_prerelease_version_pre
     ENV["PRE"] = "pre.0"
 

data/test/test_hoe_publish.rb

@@ -25,7 +25,7 @@ class TestHoePublish < Minitest::Test
                 -o doc
                 --main README.rdoc
                 lib
-                History.rdoc Manifest.txt README.rdoc
+                History.rdoc README.rdoc
                ]
 
     # skip if linux?

data.tar.gz.sig

@@ -1,4 +1 @@
-<�O����l�Nk
-C������)�3�j�z0��ë�';3P�A.B
-��	G��q���������eyr<?:c�̶A���A�
-~�)��9��G�A
+�c��^�������Z����L���5���W~9�d[Ozo�z��u͑aV�o�����&c@^��C[��j���y������
+��\��}A�#�T�9�]��5a��u{���

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.7.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -105,7 +105,6 @@ executables:
 extensions: []
 extra_rdoc_files:
 - History.rdoc
-- Manifest.txt
 - README.rdoc
 files:
 - ".autotest"
@@ -124,7 +123,6 @@ files:
 - lib/hoe/flay.rb
 - lib/hoe/flog.rb
 - lib/hoe/gem_prelude_sucks.rb
-- lib/hoe/gemcutter.rb
 - lib/hoe/git.rb
 - lib/hoe/inline.rb
 - lib/hoe/newb.rb
@@ -145,7 +143,6 @@ files:
 - template/test/test_file_name.rb.erb
 - test/test_hoe.rb
 - test/test_hoe_debug.rb
-- test/test_hoe_gemcutter.rb
 - test/test_hoe_package.rb
 - test/test_hoe_publish.rb
 - test/test_hoe_test.rb
@@ -174,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.12
 specification_version: 4
 summary: Hoe is a rake/rubygems helper for project Rakefiles
 test_files: []

data/lib/hoe/gemcutter.rb

@@ -1,44 +0,0 @@
-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
-
-  ##
-  # Push gems to server.
-
-  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.
-
-  def define_gemcutter_tasks
-    desc "Push gem to gemcutter."
-    task :release_to_gemcutter => [:clean, :package, :release_sanity] do
-      pkg   = "pkg/#{spec.name}-#{spec.version}"
-      gems  = Dir["#{pkg}*.gem"]
-
-      gem_push gems
-    end
-
-    task :release_to => :release_to_gemcutter
-  end
-end unless defined? Hoe::Gemcutter

data/test/test_hoe_gemcutter.rb

@@ -1,38 +0,0 @@
-require "minitest/autorun"
-require "hoe"
-require_relative "../lib/hoe/gemcutter"
-
-class TestHoeGemcutter < Minitest::Test
-  include Hoe::Gemcutter
-
-  def test_gemcutter_tasks_defined
-    define_gemcutter_tasks
-    assert Rake::Task[:release_to_gemcutter]
-    assert Rake::Task[:release_to].prerequisites.include?("release_to_gemcutter")
-  end
-
-  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