hoe 3.21.0 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdbf38f3724fc0c8008428afdfde2009cf340d6a60912a8eb2e8ad8d7ee9120b
-  data.tar.gz: 107816ce9cad15ce4dc4ff5fd94c68821ae9511c50de746bead5abe56c834d5d
+  metadata.gz: 5ae2cfa50c993889a68ef66dba42a8b5e17a4ffac2b98dfafc05c311a00e1fd2
+  data.tar.gz: 7b4b54d605a96d82705a246a106a5edab83be01569eb01a7ecee967e3e949362
 SHA512:
-  metadata.gz: d8e020648a0a3e6d76cbb2a2f18be076369607eb19fe364d5b4c895eceab91d205ea2bdb39e4165a22bab944f662d009e5dec6ab3ab47731193e461b478fb41a
-  data.tar.gz: d63cd16ac13754c3fbb7070ca03bc6d647ea86dc642466793ad5d87a8e2387edf5903017aa265b8edb127f7e235756bcc871be003d791d7c3e22462c05933ff2
+  metadata.gz: 7df4729a57c68240bb10095bbc540206e6a3d48768586f077f2a31f7bee24ab78bfe7e3dac06a349c6a6e310e2c47c7e6243ffbcdbcfc6fe6fcd9fb198d95fd3
+  data.tar.gz: 3f540d937cd32cf73607008a8d04af1613bcaa482ec265ac7e864396f4e26e0c3bdf0fa9e7f82d894bb0dde2f535d8b6f90051b72f10f53ac4f7feddb341c53c

data/History.rdoc

@@ -1,3 +1,17 @@
+=== 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/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.22.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",
@@ -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,17 +656,23 @@ 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])
+      urls     = parse_urls(readme.values.first)
 
       self.urls        ||= urls
       self.description ||= desc
@@ -808,7 +811,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

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

@@ -217,6 +217,49 @@ 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_metadata
     hash = [
             "home  :: https://github.com/seattlerb/hoe",

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
   h7iEjga8iM1LbZUfiISZ+WrB
   -----END CERTIFICATE-----
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake