hoe 3.22.3 → 3.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50cf01f11def02a11b7afb9d045a0259dcff3f184177c6c87e2de0c47ca41781
-  data.tar.gz: a5bc3b90a2eba8d4e1d1536138765121da2fe61fe582b5fcd26090e47cf4834b
+  metadata.gz: 8cb122a688a65479576dd094bf310d32eac67a003a402e4eedd20575a3ab125f
+  data.tar.gz: a505faf19cab47471c35529a04c57a5e5f490190783691eb060f1a699b6a56bc
 SHA512:
-  metadata.gz: bcfd1970f18fdb52f5b234300dfe7383ebdce7b34dadf1cc3a9e6dd0579ca80a082b39b3bf774a9ffd81caefaf2818fc19e80fc39afeb26537c4fd13a8fbcd5a
-  data.tar.gz: 63d7ec780e191cf662cee19f597a67443fc363ece9bbeaf74cccf72f757612cf28e5b305634be46e4f27db32a3dded8a2d2177a9133eccb77c37df8350a929c0
+  metadata.gz: 5b78311752ceff6ce02081439d4c460bce0b70fb2e0f6c3754857e924aab4de790de17cffc960bdec2827b079acc9e63dac2941403324fd850db72c048503c96
+  data.tar.gz: 495338f933baf41253f578acc106fb4a10237ae07bca733ddd110f7b15b5fdbdc23997a35ff4263b661c774aaa298b17eb2d48e55ff2bff05ecdc6271de12aa0

data/History.rdoc

@@ -1,3 +1,24 @@
+=== 3.24.0 / 2022-06-20
+
+* 3 minor enhancements:
+
+  * Add bindir and homepage accessor methods. (dsisnero)
+  * Don't auto-intuit values if they're already set. (dsisnero)
+  * Use bindir to determine executables. (dsisnero)
+
+=== 3.23.1 / 2022-01-04
+
+* 1 bug fix:
+
+  * Fixed loading config files for ruby 3.1's now default YAML.safe_load_file.
+
+=== 3.23.0 / 2021-05-29
+
+* 2 minor enhancements:
+
+  * Bump racc (plugin) dependency.
+  * Removed ruby18! and ruby19! methods. ugh
+
 === 3.22.3 / 2021-01-10
 
 * 1 bug fix:

data/lib/hoe/racc.rb

@@ -50,7 +50,7 @@ module Hoe::Racc
   # Activate the racc dependencies
 
   def activate_racc_deps
-    dependency "racc", "~> 1.4.6", :development
+    dependency "racc", "~> 1.5", :development
   end
 
   ##

data/lib/hoe.rb

@@ -87,7 +87,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "3.22.3"
+  VERSION = "3.24.0"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -222,6 +222,18 @@ class Hoe
 
   attr_accessor :group_name
 
+  ##
+  # Optional: The name of the executables directory. [default: bin]
+
+  attr_accessor :bindir
+
+  ##
+  # Optional: The homepage of the project. Auto-populates to the home key
+  # of the urls read from the README.txt
+  #
+
+  attr_accessor :homepage
+
   ##
   # The Gem::Specification.
 
@@ -525,17 +537,18 @@ class Hoe
       s.version              = version if version
       s.summary              = summary
       s.email                = email
-      s.homepage             = urls["home"] || urls.values.first
+      s.homepage             = homepage || urls["home"] || urls.values.first
+
       s.description          = description
       s.files                = manifest
-      s.executables          = s.files.grep(/^bin/) { |f| File.basename(f) }
-      s.bindir               = "bin"
+      s.bindir               = bindir || "bin"
+      s.executables          = s.files.grep(/^#{s.bindir}/) { |f| File.basename(f) }
       s.require_paths        = dirs unless dirs.empty?
       s.rdoc_options         = ["--main", readme_file]
       s.post_install_message = post_install_message
       s.metadata             = (urls.keys & URLS_TO_META_MAP.keys).map { |name|
         [URLS_TO_META_MAP[name], urls[name]]
-      }.to_h
+      }.to_h if urls
 
       missing "Manifest.txt" if s.files.empty?
 
@@ -810,7 +823,9 @@ class Hoe
 
   def post_initialize
     activate_plugin_deps
-    intuit_values File.read_utf readme_file if readme_file
+    unless skip_intuit_values?
+      intuit_values File.read_utf readme_file if readme_file
+    end
     validate_fields
     define_spec
     load_plugin_tasks
@@ -840,20 +855,6 @@ class Hoe
     spec_extras[:required_ruby_version] = versions
   end
 
-  ##
-  # Declare that this gem requires ruby to be in the 1.8+ family.
-
-  def ruby18!
-    require_ruby_version "~> 1.8"
-  end
-
-  ##
-  # Declare that this gem requires ruby to be in the 1.9 family.
-
-  def ruby19!
-    require_ruby_version "~> 1.9"
-  end
-
   ##
   # Declare that this gem requires ruby to be in the 2.0+ family.
 
@@ -882,6 +883,9 @@ class Hoe
     require_ruby_version "~> 2.3"
   end
 
+  # I don't care for these methods (eg 3.0 is out) ... so I'm not
+  # continuing them.
+
   ##
   # Provide a linear degrading value from n to m over start to finis
   # dates. If not provided, start and finis will default to 1/1 and
@@ -907,6 +911,10 @@ class Hoe
     end
   end
 
+  def skip_intuit_values?
+    %w[summary description homepage].all? { |field| send field }
+  end
+
   ##
   # Loads ~/.hoerc, merges it with a .hoerc in the current pwd (if
   # any) and yields the configuration and its path
@@ -915,19 +923,29 @@ class Hoe
     config = Hoe::DEFAULT_CONFIG
 
     rc = File.expand_path("~/.hoerc")
-    exists = File.exist? rc
-    homeconfig = exists ? YAML.load_file(rc) : {}
+    homeconfig = maybe_load_yaml rc
 
     config = config.merge homeconfig
 
     localrc = File.join Dir.pwd, ".hoerc"
-    exists = File.exist? localrc
-    localconfig = exists ? YAML.load_file(localrc) : {}
+    localconfig = maybe_load_yaml(localrc)
 
     config = config.merge localconfig
 
     yield config, rc
   end
+
+  def maybe_load_yaml path
+    if File.exist? path then
+      if YAML.respond_to? :safe_load_file then
+        YAML.safe_load_file path, permitted_classes: [Regexp, Symbol]
+      else
+        YAML.load_file path
+      end
+    else
+      {}
+    end
+  end
 end
 
 class File

data/test/test_hoe.rb

@@ -297,6 +297,30 @@ class TestHoe < Minitest::Test
     assert_equal exp, h.urls
   end
 
+  def test_intuit_values_should_be_silent_if_summary_description_and_homepage_are_set
+    h = nil
+    _readme = <<~EOM
+      == this is readme
+
+      == description
+      this is a bogus description
+    EOM
+
+    assert_silent do
+      h = Hoe.spec "blah" do
+        developer "auther", "email"
+        license "MIT"
+        self.homepage = 'http://myhome'
+        self.description = 'this is real description'
+        self.summary = 'this is summary'
+      end
+    end
+
+    assert_equal h.homepage , 'http://myhome'
+    assert_equal h.description , 'this is real description'
+    assert_equal h.summary , 'this is summary'
+  end
+
   def test_metadata
     hash = [
             "home  :: https://github.com/seattlerb/hoe",

data/test/test_hoe_publish.rb

@@ -19,9 +19,16 @@ class TestHoePublish < Minitest::Test
   end
 
   def test_make_rdoc_cmd
+    rdoc = Gem.bin_wrapper "rdoc"
+
+    unless File.exist? rdoc then
+      extra = "-S"
+      rdoc  = "rdoc"
+    end
+
     expected = %W[
                 #{Gem.ruby}
-                #{Gem.bin_wrapper "rdoc"}
+                #{rdoc}
                 --title blah-1.0\ Documentation
                 -o doc
                 --main README.rdoc
@@ -29,7 +36,11 @@ class TestHoePublish < Minitest::Test
                 History.rdoc Manifest.txt README.rdoc
                ]
 
-    skip if linux?
-    assert_equal expected, @hoe.make_rdoc_cmd
+    expected[1, 0] = extra if extra
+
+    # skip if linux?
+    capture_io do
+      assert_equal expected, @hoe.make_rdoc_cmd
+    end
   end
 end

data/test/test_hoe_test.rb

@@ -26,11 +26,14 @@ class TestHoeTest < Minitest::Test
     end
   end
 
-  EXPECTED = %W[-w -Ilib:bin:test:.
+  path    = %w[lib bin test .].join File::PATH_SEPARATOR
+  mt_path = %w[lib test .].join File::PATH_SEPARATOR
+
+  EXPECTED = %W[-w -I#{path}
                 -e 'require "rubygems"; %srequire "test/test_hoe_test.rb"'
                 --].join(" ") + " "
 
-  MT_EXPECTED = %W[-Ilib:test:. -w
+  MT_EXPECTED = %W[-I#{mt_path} -w
                    -e '%srequire "test/test_hoe_test.rb"'
                    --].join(" ") + " "
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 3.22.3
+  version: 3.24.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIwMTIyMjIwMzgzMFoXDTIxMTIyMjIwMzgzMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAE3XRm1YZcCVjAJy5yMZvTOFrS7B2SYErc+0QwmKYbHztTTDY2m5Bii+jhpuxh
-  H+ETcU1z8TUKLpsBUP4kUpIRowkVN1p/jKapV8T3Rbwq+VuYFe+GMKsf8wGZSecG
-  oMQ8DzzauZfbvhe2kDg7G9BBPU0wLQlY25rDcCy9bLnD7R0UK3ONqpwvsI5I7x5X
-  ZIMXR0a9/DG+55mawwdGzCQobDKiSNLK89KK7OcNTALKU0DfgdTkktdgKchzKHqZ
-  d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
-  KToW560QIey7SPfHWduzFJnV
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.4'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.12
 signing_key:
 specification_version: 4
 summary: Hoe is a rake/rubygems helper for project Rakefiles