hoe 3.21.0 → 3.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdbf38f3724fc0c8008428afdfde2009cf340d6a60912a8eb2e8ad8d7ee9120b
-  data.tar.gz: 107816ce9cad15ce4dc4ff5fd94c68821ae9511c50de746bead5abe56c834d5d
+  metadata.gz: 2f90d13b22bd588098e637d7483771414ad1d1ba91a7666b1ae133d766e0a952
+  data.tar.gz: a55cdbcb633138edb9de2b072dd1f905c47cf59c12cf6f70e6932a135df84057
 SHA512:
-  metadata.gz: d8e020648a0a3e6d76cbb2a2f18be076369607eb19fe364d5b4c895eceab91d205ea2bdb39e4165a22bab944f662d009e5dec6ab3ab47731193e461b478fb41a
-  data.tar.gz: d63cd16ac13754c3fbb7070ca03bc6d647ea86dc642466793ad5d87a8e2387edf5903017aa265b8edb127f7e235756bcc871be003d791d7c3e22462c05933ff2
+  metadata.gz: 7f4898f76969fafe15e7072e4c0160c05601883d6f36021fa685b6593f92fa2950a525d69f2f740875b00ed21d8e2386a125cefc0317f81469c9f82597d8b880
+  data.tar.gz: 0b70ef2ebf6b85a9370c942c763eadb27082ac926e05ee239c72625b875b2dd7d86b23b8a96abd6ba4380cb5f94de063ab1cdd9586dd9e774dcffa1405a060e7

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-Y�JR���P��c|������!~}s���J�"3w
-�����Q��θ�����ix>���~�	5���H*�^���pS�ʘin�k�2B�D]R�1Q��3��>�^��{�mq�zrQ��#tZGd�@
-�|�o؀�P�1,��A_���&��^��Dρ�S�K���.
+��z¢��{s|���u��|v�
�q�yw��YJ *����[�Ա1���п7�>��+�{&l�p�Q���B𚞙K��yo�Ʉq
+�H02�T~�>#Kd%��
-����E�@�<�

data/History.rdoc

@@ -1,3 +1,42 @@
+=== 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:
+
+  * Bumped ruby version to include < 4 (trunk).
+
+=== 3.22.2 / 2020-08-31
+
+* 1 bug fix:
+
+  * Bumped ruby version to include 3.0 (trunk).
+
+=== 3.22.1 / 2020-02-12
+
+* 1 bug fix:
+
+  * Avoid calling parse_urls if URL metadata are already set. (flavorjones)
+
+=== 2.22.0 / 2020-02-09
+
+* 4 minor enhancements:
+
+  * Added metadate mapping for 'docs'.
+  * Added rdoc extension to the history and readme file finder globs.
+  * Extended readme parsing to more intelligently deal with markup sections.
+  * Refactored intuit_values to take the file content as an arg.
+
+* 2 bug fixes:
+
+  * Fixed ordering of test_prelude vs framework in Minitest::TestTask. (flavorjones)
+  * Fixed wiring of test_prelude into Minitest::TestTask.create. (flavorjones)
+
 === 3.21.0 / 2020-01-11
 
 * 2 minor enhancements:

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec "hoe" do
 
   pluggable!
   require_rubygems_version ">= 1.4"
-  require_ruby_version "~> 2.1"
+  require_ruby_version [">= 2.1", "< 4"]
 
   dependency "rake", [">= 0.8", "< 15.0"] # FIX: to force it to exist pre-isolate
 end

data/lib/hoe.rb

@@ -1,7 +1,3 @@
-# -*- mode: ruby; coding: us-ascii; -*-
-
-require "rubygems"
-
 begin
   gem "rake"
 rescue Gem::LoadError
@@ -91,7 +87,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "3.21.0"
+  VERSION = "3.23.0"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -119,6 +115,7 @@ class Hoe
     "bugs" => "bug_tracker_uri",
     "clog" => "changelog_uri",
     "doco" => "documentation_uri",
+    "docs" => "documentation_uri",
     "home" => "homepage_uri",
     "code" => "source_code_uri",
     "wiki" => "wiki_uri",
@@ -478,7 +475,7 @@ class Hoe
 
     case name
     when "hoe" then
-      dependency "rake", [">= 0.8", "< 13.0"]
+      # do nothing? these deps are already in the hoe spec in the Rakefile
     else
       version = VERSION.split(/\./).first(2).join(".")
       dependency "hoe", "~> #{version}", :development
@@ -650,8 +647,8 @@ class Hoe
       self.history_file = manifest.grep(/^History\./).first
     end
 
-    self.history_file ||= Dir.glob("History.{txt,md}").first || "History.txt"
-    self.readme_file  ||= Dir.glob("README.{txt,md}").first || "README.txt"
+    self.history_file ||= Dir.glob("History.{rdoc,txt,md}").first || "History.txt"
+    self.readme_file  ||= Dir.glob("README.{rdoc,txt,md}").first || "README.txt"
 
     abort "Hoe.new {...} removed. Switch to Hoe.spec." if block_given?
   end
@@ -659,19 +656,24 @@ class Hoe
   ##
   # Intuit values from the readme and history files.
 
-  def intuit_values
-    header_re = /^((?:=+|#+) .*)$/
-    readme    = File.read_utf(readme_file).split(header_re)[1..-1] rescue ""
+  def intuit_values input
+    readme = input
+               .lines
+               .chunk { |l| l[/^(?:=+|#+)/] || "" }
+               .map(&:last)
+               .each_slice(2)
+               .map { |k, v|
+                  kp = k.join
+                  kp = kp.strip.chomp(":").split.last.downcase if k.size == 1
+                  [kp, v.join.strip]
+                }
+               .to_h
 
     unless readme.empty? then
-      sections = Hash[*readme.map { |s|
-        s =~ /^[=#]/ ? s.strip.downcase.chomp(":").split.last : s.strip
-      }]
-      desc     = sections.values_at(*description_sections).join("\n\n")
+      desc     = readme.values_at(*description_sections).join("\n\n")
       summ     = desc.split(/\.\s+/).first(summary_sentences).join(". ")
-      urls     = parse_urls(readme[1])
 
-      self.urls        ||= urls
+      self.urls        ||= parse_urls(readme.values.first)
       self.description ||= desc
       self.summary     ||= summ
     else
@@ -808,7 +810,7 @@ class Hoe
 
   def post_initialize
     activate_plugin_deps
-    intuit_values
+    intuit_values File.read_utf readme_file if readme_file
     validate_fields
     define_spec
     load_plugin_tasks
@@ -838,20 +840,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.
 
@@ -880,6 +868,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

data/lib/hoe/publish.rb

@@ -145,7 +145,7 @@ module Hoe::Publish
 
     desc "Generate email announcement file."
     task :debug_email do
-      puts generate_email
+      puts generate_email ENV["FULL"]
     end
 
     desc 'Post announcement to blog. Uses the "blogs" array in your hoerc.'

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

@@ -80,8 +80,9 @@ module Hoe::Test
       when :minitest then
         require "minitest/test_task" # currently in hoe, but will move
 
+        test_prelude = self.test_prelude
         Minitest::TestTask.create :test do |t|
-          t.test_prelude = self.test_prelude
+          t.test_prelude = test_prelude
           t.libs += Hoe.include_dirs.uniq
         end
       when :testunit then

data/lib/minitest/test_task.rb

@@ -259,8 +259,8 @@ module Minitest # :nodoc:
       tests.map! { |f| %(require "#{f}") }
 
       runner = []
-      runner << framework
       runner << test_prelude if test_prelude
+      runner << framework
       runner.concat tests
       runner = runner.join "; "
 

data/test/test_hoe.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "minitest/autorun"
 require "hoe"
 require "tempfile"
@@ -217,6 +218,85 @@ class TestHoe < Minitest::Test
     assert_equal exp, hoe.parse_urls(hash)
   end
 
+  def test_parse_mrww
+    h = nil
+    mrww_readme = <<~EOM
+      = make
+      = rake
+      = work
+      = well
+
+      home :: https://github.com/seattlerb/makerakeworkwell
+      rdoc :: http://docs.seattlerb.org/makerakeworkwell
+
+      == DESCRIPTION:
+
+      make/rake/work/well provides two simple modifications to rake that
+      make working with file tasks cleaner, easier, and faster.
+    EOM
+
+
+
+    assert_silent do
+      h = Hoe.spec "blah" do
+        developer "author", "email"
+        license "MIT"
+        self.version      = "1.0"
+        self.readme_file  = nil
+        self.history_file = nil
+        self.changes = true
+
+        self.intuit_values mrww_readme
+      end
+    end
+
+    desc = mrww_readme.lines[10..11].join.chomp
+    urls = {
+      "home" => "https://github.com/seattlerb/makerakeworkwell",
+      "rdoc" => "http://docs.seattlerb.org/makerakeworkwell"
+    }
+
+    assert_equal desc, h.description
+    assert_equal desc, h.summary
+    assert_equal urls, h.urls
+  end
+
+  def test_intuit_values_should_be_silent_if_urls_are_already_set
+    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)
+      * [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet)
+      * [GitHub](https://github.com/sparklemotion/nokogiri)
+      * [Mailing List](https://groups.google.com/group/nokogiri-talk)
+      * [Chat/Gitter](https://gitter.im/sparklemotion/nokogiri)
+
+    EOM
+
+    exp = {
+      "home" => "https://nokogiri.org",
+      "bugs" => "https://github.com/sparklemotion/nokogiri/issues",
+      "doco" => "https://nokogiri.org/rdoc/index.html",
+      "clog" => "https://nokogiri.org/CHANGELOG.html",
+      "code" => "https://github.com/sparklemotion/nokogiri",
+    }
+
+    assert_silent do
+      h = Hoe.spec "blah" do
+        developer "author", "email"
+        license "MIT"
+
+        self.urls = exp
+        self.intuit_values nokogiri_readme
+      end
+    end
+
+    assert_equal exp, h.urls
+  end
+
   def test_metadata
     hash = [
             "home  :: https://github.com/seattlerb/hoe",

data/test/test_hoe_publish.rb

@@ -14,6 +14,10 @@ class TestHoePublish < Minitest::Test
 
   make_my_diffs_pretty!
 
+  def linux? platform = RUBY_PLATFORM # TODO: push up to minitest?
+    /linux/ =~ platform
+  end
+
   def test_make_rdoc_cmd
     expected = %W[
                 #{Gem.ruby}
@@ -25,6 +29,7 @@ class TestHoePublish < Minitest::Test
                 History.rdoc Manifest.txt README.rdoc
                ]
 
+    skip if linux?
     assert_equal expected, @hoe.make_rdoc_cmd
   end
 end

data/test/test_hoe_test.rb

@@ -26,36 +26,77 @@ class TestHoeTest < Minitest::Test
     end
   end
 
-  def test_make_test_cmd_with_different_testlibs
-    skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
+  EXPECTED = %W[-w -Ilib:bin:test:.
+                -e 'require "rubygems"; %srequire "test/test_hoe_test.rb"'
+                --].join(" ") + " "
+
+  MT_EXPECTED = %W[-Ilib:test:. -w
+                   -e '%srequire "test/test_hoe_test.rb"'
+                   --].join(" ") + " "
 
-    expected = ['-w -Ilib:bin:test:. -e \'require "rubygems"; %s',
-                'require "test/test_hoe_test.rb"',
-                "' -- ",
-               ].join
+  def test_make_test_cmd_defaults_to_minitest
+    skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
 
     # default
     assert_deprecated do
       autorun = %(require "minitest/autorun"; )
-      assert_equal expected % autorun, @tester.make_test_cmd
+      assert_equal EXPECTED % autorun, @tester.make_test_cmd
     end
+  end
+
+  def test_make_test_cmd_for_testunit
+    skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
 
     assert_deprecated do
       @tester.testlib = :testunit
       testunit = %(require "test/unit"; )
-      assert_equal expected % testunit, @tester.make_test_cmd
+      assert_equal EXPECTED % testunit, @tester.make_test_cmd
     end
+  end
 
-    assert_deprecated do
-      @tester.testlib = :minitest
-      autorun = %(require "minitest/autorun"; )
-      assert_equal expected % autorun, @tester.make_test_cmd
+  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|
+      t.libs += Hoe.include_dirs.uniq
+      t.test_globs = ["test/test_hoe_test.rb"]
+    end
+
+    assert_equal MT_EXPECTED % [framework].join("; "), @tester.make_test_cmd
+  end
+
+  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"; )
+
+    @tester = Minitest::TestTask.create :test do |t|
+      t.test_prelude = prelude
+      t.libs += Hoe.include_dirs.uniq
+      t.test_globs = ["test/test_hoe_test.rb"]
     end
 
+    assert_equal MT_EXPECTED % [prelude, framework].join("; "), @tester.make_test_cmd
+  end
+
+  def test_make_test_cmd_for_no_framework
+    skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
+
     assert_deprecated do
       @tester.testlib = :none
-      assert_equal expected % "", @tester.make_test_cmd
+      assert_equal EXPECTED % "", @tester.make_test_cmd
     end
+  end
+
+  def test_make_test_cmd_for_faketestlib
+    skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
 
     @tester.testlib = :faketestlib
     e = assert_raises(RuntimeError) do

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.23.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIwMTIyMjIwMzgzMFoXDTIxMTIyMjIwMzgzMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
-  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
-  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
-  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
-  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
-  h7iEjga8iM1LbZUfiISZ+WrB
+  AQAE3XRm1YZcCVjAJy5yMZvTOFrS7B2SYErc+0QwmKYbHztTTDY2m5Bii+jhpuxh
+  H+ETcU1z8TUKLpsBUP4kUpIRowkVN1p/jKapV8T3Rbwq+VuYFe+GMKsf8wGZSecG
+  oMQ8DzzauZfbvhe2kDg7G9BBPU0wLQlY25rDcCy9bLnD7R0UK3ONqpwvsI5I7x5X
+  ZIMXR0a9/DG+55mawwdGzCQobDKiSNLK89KK7OcNTALKU0DfgdTkktdgKchzKHqZ
+  d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
+  KToW560QIey7SPfHWduzFJnV
   -----END CERTIFICATE-----
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,7 +142,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -150,17 +150,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '1.4'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: Hoe is a rake/rubygems helper for project Rakefiles
 test_files: []