hoe 4.5.2.beta.3 → 4.5.2.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f334b6714aec9b1559a887aaa5ef7ee6e1a0a0800ad9ad9a7a48791afbbc1b9
-  data.tar.gz: c07144c110953bbd7b7d8b2c51fd2a7c9780ac7d8667dd2d94c44cd437e8680c
+  metadata.gz: 332ec6e317de6d96320adac85b6f7c7997a6ea1687b8457ab7242d29f31f153c
+  data.tar.gz: acd810ce8688c8edceceaabe1e318bbe6e748434631e7e743d1f4a079bfe727f
 SHA512:
-  metadata.gz: af35eb91d47567d3e6008cdb817e35f6e489191f6de1ac515ceeb6647b91a9dde4ad017ac627a13b564075699f55cbc1833e18905914ed63670619a578ba52b5
-  data.tar.gz: '09a57daaa246a8381c7e5549d564557e99db34d885bf8182da8b82bfed91a1dcfc29584ea0e7838af95ba0ae7846dcfecea12398b5d63c4d93c5ba5121488955'
+  metadata.gz: 3550d9a52bba302dca25b51586f42699603497a9cdab675668aa161867196217660eb16882d3553162e935623c945c3cd858218d237606f69202f52a9abc6a5a
+  data.tar.gz: 145ad07b94d7539ba345fdf1b70aa35963248cad0d7a6c0e34c4664d0373e80b74305077d057acf3c36f1d25cb6c03f864923c76cd066f4fee852e670750d7b5

data/README.rdoc

@@ -3,8 +3,8 @@
 home  :: https://zenspider.com/projects/hoe.html
 code  :: https://github.com/seattlerb/hoe
 bugs  :: https://github.com/seattlerb/hoe/issues
-rdoc  :: https://docs.seattlerb.org/hoe/
-doco  :: https://docs.seattlerb.org/hoe/Hoe.pdf
+doco  :: https://docs.seattlerb.org/hoe/
+doco2 :: https://docs.seattlerb.org/hoe/Hoe.pdf
 clog  :: https://github.com/seattlerb/hoe/blob/master/History.rdoc
 other :: https://github.com/jbarnette/hoe-plugin-examples
 

data/lib/hoe.rb

@@ -87,7 +87,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "4.5.2.beta.3"
+  VERSION = "4.5.2.beta.5"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -114,12 +114,20 @@ class Hoe
   URLS_TO_META_MAP = {
     "bugs" => "bug_tracker_uri",
     "clog" => "changelog_uri",
+    "code" => "source_code_uri",
     "doco" => "documentation_uri",
     "docs" => "documentation_uri",
     "home" => "homepage_uri",
-    "code" => "source_code_uri",
-    "wiki" => "wiki_uri",
     "mail" => "mailing_list_uri",
+    "wiki" => "wiki_uri",
+
+    "changelog"     => "changelog_uri",
+    "changes"       => "changelog_uri",
+    "documentation" => "documentation_uri",
+    "history"       => "changelog_uri",
+    "issues"        => "bug_tracker_uri",
+    "rdoc"          => "documentation_uri",
+    "tickets"       => "bug_tracker_uri",
   }
 
   ##
@@ -651,7 +659,7 @@ class Hoe
     self.author               = []
     self.changes              = nil
     self.description          = nil
-    self.description_sections = %w[description]
+    self.description_sections = %w[description features/problems]
     self.description_rdoc_hack = true
     self.email                = []
     self.extra_deps           = []
@@ -692,22 +700,24 @@ class Hoe
                .chunk { |l| l[/^(?:=+|#+)/] || "" }
                .map(&:last)
                .each_slice(2)
+               .select { |k, v| k && v }
                .to_h { |k, v|
-                 raise "No body for %p section" % [k[0].strip] \
-                   unless v
-                 kp = k.map { |s|
-                   s.strip.chomp(":").sub(/(?:=+|#+)\s*/, '').downcase
-                 }.join("\n")
+                 kp = k.join.strip.chomp(":").sub(/(?:=+|#+)\s*/, '').downcase
+
+                 # keep key in value, but title case it
+                 v.prepend k.join.downcase.gsub(/\b[a-z]/, &:upcase)
 
                  [kp, v.join.strip]
                }
 
     unless readme.empty? then
-      desc     = readme.values_at(*description_sections).join("\n\n")
-      desc    += "\n\n=== To Install:\n" if description_rdoc_hack
+      desc     = readme.values_at(*description_sections).compact.join("\n\n")
+      desc     = desc.lines.drop(2).join # drop first header (eg description)
+      desc    += "\n\n==== To Install:\n" if description_rdoc_hack &&
+        desc !~ /^==+ [A-Z]/
       summ     = desc.split(/\.\s+/).first(summary_sentences).join(". ")
 
-      self.urls        ||= parse_urls(readme.values.first)
+      self.urls        ||= parse_urls(readme.values.first.lines.drop(1).join)
       self.description ||= desc
       self.summary     ||= summ
     else
@@ -742,13 +752,10 @@ class Hoe
   # should update the readme.
 
   def parse_urls text
-    lines = text.gsub(/^\* /, "").delete("<>").split(/\n/).grep(/\S+/)
+    keys  = Regexp.union Hoe::URLS_TO_META_MAP.keys
+    kv_re = /^\s*(#{keys})\s*::\s*<?([^>\s]+)>?/
 
-    if lines.first =~ /::/ then
-      Hash[lines.map { |line| line.split(/\s*::\s*/) }]
-    else
-      raise "Please switch readme to hash format for urls."
-    end
+    text.scan(kv_re).to_h
   end
 
   ##
@@ -781,11 +788,12 @@ class Hoe
   end
 
   ##
-  # Bitch about a file that is missing data or unparsable for intuiting values.
+  # Raise about a file that is missing data or unparsable for intuiting values.
 
   def missing name
-    warn "** #{name} is missing or in the wrong format for auto-intuiting."
-    warn "   run `sow blah` and look at its text files"
+    raise \
+      "** #{name} is missing or in the wrong format for auto-intuiting." \
+      "   run `sow blah` and look at its text files"
   end
 
   ##

data/test/test_hoe.rb

@@ -8,9 +8,16 @@ class Hoe
   end
 end
 
-$rakefile = nil # shuts up a warning in rdoctask.rb
-
 class TestHoe < Minitest::Test
+  def without_plugins
+    old = Hoe.plugins.dup
+    Hoe.plugins.clear
+
+    yield
+  ensure
+    Hoe.plugins.replace old
+  end
+
   def hoe *skips, &b
     @hoe ||= Hoe.spec "blah" do
       developer "author", "email"
@@ -150,6 +157,8 @@ class TestHoe < Minitest::Test
         File.write "README.rdoc", "= blah\n\nhome :: http://blah/"
         File.write "History.rdoc", "=== 1.0"
 
+        hoe = without_plugins { self.hoe }
+
         assert_equal "History.rdoc", hoe.history_file
         assert_equal "README.rdoc", hoe.readme_file
         assert_equal %w[FAQ.rdoc History.rdoc README.rdoc],
@@ -180,7 +189,7 @@ class TestHoe < Minitest::Test
           hoe
         end
 
-        assert_equal "No body for \"= blah\" section", e.message
+        assert_match(/wrong format/, e.message)
       end
     end
   end
@@ -196,30 +205,17 @@ class TestHoe < Minitest::Test
     end
   end
 
-  def test_parse_urls_ary
-    ary  = ["* https://github.com/seattlerb/hoe",
-            "* http://docs.seattlerb.org/hoe/",
-            "* http://docs.seattlerb.org/hoe/Hoe.pdf",
-            "* http://github.com/jbarnette/hoe-plugin-examples"].join "\n"
-
-    assert_raises RuntimeError do
-      hoe.parse_urls ary
-    end
-  end
-
   def test_parse_urls_hash
     hash = [
             "home  :: https://github.com/seattlerb/hoe",
-            "rdoc  :: http://docs.seattlerb.org/hoe/",
-            "doco  :: http://docs.seattlerb.org/hoe/Hoe.pdf",
-            "other :: http://github.com/jbarnette/hoe-plugin-examples",
+            "rdoc  :: https://docs.seattlerb.org/hoe/",
+            "doco2 :: https://docs.seattlerb.org/hoe/Hoe.pdf",
+            "other :: https://github.com/jbarnette/hoe-plugin-examples",
            ].join "\n"
 
     exp = {
-      "home"  => "https://github.com/seattlerb/hoe",
-      "rdoc"  => "http://docs.seattlerb.org/hoe/",
-      "doco"  => "http://docs.seattlerb.org/hoe/Hoe.pdf",
-      "other" => "http://github.com/jbarnette/hoe-plugin-examples",
+      "home" => "https://github.com/seattlerb/hoe",
+      "rdoc" => "https://docs.seattlerb.org/hoe/",
     }
 
     assert_equal exp, hoe.parse_urls(hash)
@@ -242,8 +238,6 @@ class TestHoe < Minitest::Test
       make working with file tasks cleaner, easier, and faster.
     EOM
 
-
-
     assert_silent do
       h = Hoe.spec "blah" do
         developer "author", "email"
@@ -259,7 +253,7 @@ class TestHoe < Minitest::Test
 
     desc = mrww_readme.lines[10..11].join.chomp
     summ = desc.chomp(".")
-    rdoc = "\n\n====== To Install:\n"
+    rdoc = "\n\n==== To Install:\n"
     desc += rdoc
 
     urls = {
@@ -356,6 +350,8 @@ class TestHoe < Minitest::Test
     assert_equal exp, hoe.parse_urls(hash)
   end
 
+  make_my_diffs_pretty!
+
   def test_possibly_better
     t = Gem::Specification::TODAY
 
@@ -372,10 +368,8 @@ class TestHoe < Minitest::Test
       "home"  => "https://zenspider.com/projects/hoe.html",
       "code"  => "https://github.com/seattlerb/hoe",
       "bugs"  => "https://github.com/seattlerb/hoe/issues",
-      "rdoc"  => "https://docs.seattlerb.org/hoe/",
-      "doco"  => "https://docs.seattlerb.org/hoe/Hoe.pdf",
+      "doco"  => "https://docs.seattlerb.org/hoe/",
       "clog"  => "https://github.com/seattlerb/hoe/blob/master/History.rdoc",
-      "other" => "https://github.com/jbarnette/hoe-plugin-examples",
     }
 
     assert_equal urls, hoe.urls
@@ -401,8 +395,10 @@ class TestHoe < Minitest::Test
 
     deps = spec.dependencies.sort_by(&:name)
 
+    version = Hoe::VERSION[/\d+\.\d+/]
+
     expected = [
-      ["hoe",  :development, "~> #{Hoe::VERSION.sub(/\.\d+$/, "")}"],
+      ["hoe",  :development, "~> #{version}"],
       ["rdoc", :development, "< 8", ">= 6.0"],
     ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe
 version: !ruby/object:Gem::Version
-  version: 4.5.2.beta.3
+  version: 4.5.2.beta.5
 platform: ruby
 authors:
 - Ryan Davis
@@ -78,7 +78,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-description: |
+description: |-
   Hoe is a rake/rubygems helper for project Rakefiles. It helps you
   manage, maintain, and release your project and includes a dynamic
   plug-in system allowing for easy extensibility. Hoe ships with
@@ -90,7 +90,14 @@ description: |
 
   For extra goodness, see: https://docs.seattlerb.org/hoe/Hoe.pdf
 
-  === To Install:
+  == Features/Problems:
+
+  * Includes a dynamic plug-in system allowing for easy extensibility.
+  * Auto-intuits changes, description, summary, and version.
+  * Uses a manifest for safe and secure deployment.
+  * Provides 'sow' for quick project directory creation.
+  * Sow uses a simple ERB templating system allowing you to capture your
+    project patterns.
 email:
 - ryand-ruby@zenspider.com
 executables:
@@ -149,7 +156,7 @@ metadata:
   homepage_uri: https://zenspider.com/projects/hoe.html
   source_code_uri: https://github.com/seattlerb/hoe
   bug_tracker_uri: https://github.com/seattlerb/hoe/issues
-  documentation_uri: https://docs.seattlerb.org/hoe/Hoe.pdf
+  documentation_uri: https://docs.seattlerb.org/hoe/
   changelog_uri: https://github.com/seattlerb/hoe/blob/master/History.rdoc
 rdoc_options:
 - "--main"