hoe 3.18.1 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce03a7b750a6d088f8682a6cbae61a3fb0304c6f8264aabbf18911654dd3180c
-  data.tar.gz: 5de095133b1ffdb47046a03a84e1bb73dfd9fa68d18d165396f18345eefa957d
+  metadata.gz: 60448a5d7c3bd1a47db43c58f5fc6df41be8d019f4cbd42ec0422f35adc9e65c
+  data.tar.gz: c314ee93a2fb7ece4f45653b998992bb9290efdb9f48f801bf302598d27d339f
 SHA512:
-  metadata.gz: 4e9d640f0483089d2afbf68675cc24c832af75886e1acd6c8ba2984b6cdc104a984e04689af962d3f92aebcbd9f25eafff556384c7ef0ea2e3fa4883d1cbc501
-  data.tar.gz: a10fe09bc6ff92504229ff602a58aa379715ab62a6b0e52cafd3e72eefb398613fb1d05a64621d2305187680be0ad010423c32fdaaa301f0f6680777e681e024
+  metadata.gz: 427f6587c04472d4f736c07c1a5350774ea7eacde7a391af49b7f279f06dd8927d40954655668a7bb15b6273f51c2fbd13fb8d8d90b8c20871ef9f5a42247fed
+  data.tar.gz: 0a07b4c88ef15ec87eb7fe2c7be3c388aca7bf73f1e0292e6d69da7263a047b1bc30f6e468b1c3fd51225f4f7d41c578e92b8a8f1d86527351b92b332130fb33

data/History.rdoc

@@ -1,3 +1,16 @@
+=== 3.19.0 / 2019-10-29
+
+* 4 minor enhancements:
+
+  * Added deprecation to parse_urls for ancient url array form.
+  * Added support for gemspec metadata. (viraptor)
+  * Hoe#parse_urls now returns a hash no matter what
+  * Removed looong deprecated Hoe#url/url= methods.
+
+* 1 bug fix:
+
+  * Fixed sow for ruby 2.6 deprecations in ERB. (felipec)
+
 === 3.18.1 / 2019-09-14
 
 * 1 minor enhancement:

data/README.rdoc

@@ -5,6 +5,7 @@ code  :: https://github.com/seattlerb/hoe
 bugs  :: https://github.com/seattlerb/hoe/issues
 rdoc  :: http://docs.seattlerb.org/hoe/
 doco  :: http://docs.seattlerb.org/hoe/Hoe.pdf
+clog  :: https://github.com/seattlerb/hoe/blob/master/History.rdoc
 other :: http://github.com/jbarnette/hoe-plugin-examples
 
 == DESCRIPTION:

data/bin/sow

@@ -117,7 +117,11 @@ Dir.chdir project do
     warn "erb: #{path}"
 
     File.open path, "w" do |io|
-      erb = ERB.new file, nil, "<>"
+      if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+        erb = ERB.new file, trim_mode: "<>"
+      else
+        erb = ERB.new file, nil, "<>"
+      end
       erb.filename = path
       io.puts erb.result(binding)
     end

data/lib/hoe.rb

@@ -91,7 +91,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "3.18.1"
+  VERSION = "3.19.0"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -111,6 +111,18 @@ class Hoe
 
   RUBY_FLAGS = ENV["RUBY_FLAGS"] || default_ruby_flags
 
+  ##
+  # Map from the commonly used url names to gemspec's metadata keys
+  # See https://guides.rubygems.org/specification-reference/#metadata
+
+  URLS_TO_META_MAP = {
+    "bugs" => "bug_tracker_uri",
+    "clog" => "changelog_uri",
+    "doco" => "documentation_uri",
+    "home" => "homepage_uri",
+    "code" => "source_code_uri",
+  }
+
   ##
   # Default configuration values for .hoerc. Plugins should populate
   # this on load.
@@ -243,24 +255,6 @@ class Hoe
 
   attr_accessor :test_globs
 
-  ##
-  # Deprecated: Optional: The url(s) of the project. (can be array).
-  # Auto-populates to a list of urls read from the beginning of
-  # README.txt.
-  #
-
-  def url
-    warn "NOTE: Hoe#url is deprecated, use urls. It will be removed on or after 2012-06-01."
-    warn "Used from #{caller.first}"
-    @url
-  end
-
-  def url=o # :nodoc:
-    warn "NOTE: Hoe#url= is deprecated, use urls=. It will be removed on or after 2012-06-01."
-    warn "Used from #{caller.first}"
-    @url=o
-  end
-
   ##
   # Optional: The urls of the project. This can be an array or
   # (preferably) a hash. Auto-populates to the urls read from the
@@ -532,14 +526,7 @@ class Hoe
       s.version              = version if version
       s.summary              = summary
       s.email                = email
-      s.homepage             = case urls
-                               when Hash then
-                                 urls["home"] || urls.values.first
-                               when Array then
-                                 urls.first
-                               else
-                                 warn "** Unknown urls format: #{urls.inspect}"
-                               end
+      s.homepage             = urls["home"] || urls.values.first
       s.description          = description
       s.files                = manifest
       s.executables          = s.files.grep(/^bin/) { |f| File.basename(f) }
@@ -547,6 +534,9 @@ class Hoe
       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
 
       missing "Manifest.txt" if s.files.empty?
 
@@ -719,7 +709,10 @@ class Hoe
     if lines.first =~ /::/ then
       Hash[lines.map { |line| line.split(/\s*::\s*/) }]
     else
-      lines
+      warn "DEPRECATED: Please switch readme to hash format for urls."
+      warn "  Only defining 'home' url."
+      warn "  This will be removed on or after 2020-10-28."
+      { "home" => lines.first }
     end
   end
 

data/test/test_hoe.rb

@@ -146,14 +146,9 @@ class TestHoe < Minitest::Test
   def test_initialize_intuit
     Dir.mktmpdir do |path|
       Dir.chdir path do
-        open "Manifest.txt", "w" do |io| # sorted
-          io.puts "FAQ.rdoc"
-          io.puts "History.rdoc"
-          io.puts "README.rdoc"
-        end
-
-        open "README.rdoc",  "w" do |io| io.puts "= blah" end
-        open "History.rdoc", "w" do |io| io.puts "=== 1.0" end
+        File.write "Manifest.txt", "FAQ.rdoc\nHistory.rdoc\nREADME.rdoc\n"
+        File.write "README.rdoc", "= blah\n\nhome :: http://blah/"
+        File.write "History.rdoc", "=== 1.0"
 
         assert_equal "History.rdoc", hoe.history_file
         assert_equal "README.rdoc", hoe.readme_file
@@ -166,15 +161,10 @@ class TestHoe < Minitest::Test
   def test_initialize_intuit_ambiguous
     Dir.mktmpdir do |path|
       Dir.chdir path do
-        open "Manifest.txt", "w" do |io|
-          io.puts "History.rdoc" # sorted
-          io.puts "README.ja.rdoc"
-          io.puts "README.rdoc"
-        end
-
-        open "README.rdoc",    "w" do |io| io.puts "= blah" end
-        open "README.ja.rdoc", "w" do |io| io.puts "= blah" end
-        open "History.rdoc",   "w" do |io| io.puts "=== 1.0" end
+        File.write "Manifest.txt", "History.rdoc\nREADME.ja.rdoc\nREADME.rdoc\n"
+        File.write "README.rdoc", "= blah\n\nhome :: http://blah/"
+        File.write "README.ja.rdoc", "= blah\n\nhome :: http://blah/"
+        File.write "History.rdoc", "=== 1.0"
 
         assert_equal "README.ja.rdoc", hoe(:skip_files).readme_file
       end
@@ -201,12 +191,12 @@ class TestHoe < Minitest::Test
             "* http://docs.seattlerb.org/hoe/Hoe.pdf",
             "* http://github.com/jbarnette/hoe-plugin-examples"].join "\n"
 
-    exp = ["https://github.com/seattlerb/hoe",
-           "http://docs.seattlerb.org/hoe/",
-           "http://docs.seattlerb.org/hoe/Hoe.pdf",
-           "http://github.com/jbarnette/hoe-plugin-examples"]
+    exp = { "home" => "https://github.com/seattlerb/hoe" }
+    err = /DEPRECATED: Please switch readme to hash format/
 
-    assert_equal exp, hoe.parse_urls(ary)
+    assert_output "", err do
+      assert_equal exp, hoe.parse_urls(ary)
+    end
   end
 
   def test_parse_urls_hash
@@ -244,6 +234,7 @@ class TestHoe < Minitest::Test
       "bugs"  => "https://github.com/seattlerb/hoe/issues",
       "rdoc"  => "http://docs.seattlerb.org/hoe/",
       "doco"  => "http://docs.seattlerb.org/hoe/Hoe.pdf",
+      "clog"  => "https://github.com/seattlerb/hoe/blob/master/History.rdoc",
       "other" => "http://github.com/jbarnette/hoe-plugin-examples",
     }
 
@@ -272,11 +263,12 @@ class TestHoe < Minitest::Test
 
     expected = [
       ["hoe",  :development, "~> #{Hoe::VERSION.sub(/\.\d+$/, "")}"],
-      ["rdoc", :development, ">= 4.0, < 7"],
+      ["rdoc", :development, "< 7", ">= 4.0"],
     ]
 
     assert_equal expected, deps.map { |dep|
-      [dep.name, dep.type, dep.requirement.to_s]
+      dep_reqs = dep.requirement.to_s.split(/, /).sort
+      [dep.name, dep.type, *dep_reqs]
     }
   end
 

data/test/test_hoe_debug.rb

@@ -51,8 +51,6 @@ class TestHoeDebug < Minitest::Test
   end
 
   def test_check_manifest_missing
-    skip "https://github.com/MagLev/maglev/issues/224" if maglev?
-
     in_tmpdir do
       manifest
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 3.18.1
+  version: 3.19.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,7 +136,12 @@ files:
 homepage: http://www.zenspider.com/projects/hoe.html
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: http://www.zenspider.com/projects/hoe.html
+  source_code_uri: https://github.com/seattlerb/hoe
+  bug_tracker_uri: https://github.com/seattlerb/hoe/issues
+  documentation_uri: http://docs.seattlerb.org/hoe/Hoe.pdf
+  changelog_uri: https://github.com/seattlerb/hoe/blob/master/History.rdoc
 post_install_message: 
 rdoc_options:
 - "--main"