- Avoid calling parse_urls if URL metadata are already set. (flavorjones)

[git-p4: depot-paths = "//src/hoe/dev/": change = 12551]

2 files changed, 38 insertions, 2 deletions

diff --git a/lib/hoe.rb b/lib/hoe.rb
index 3d9a3cb..d448609 100644
--- a/lib/hoe.rb
+++ b/lib/hoe.rb
@@ -672,9 +672,8 @@ class Hoe
     unless readme.empty? then
       desc     = readme.values_at(*description_sections).join("\n\n")
       summ     = desc.split(/\.\s+/).first(summary_sentences).join(". ")
-      urls     = parse_urls(readme.values.first)
 
-      self.urls        ||= urls
+      self.urls        ||= parse_urls(readme.values.first)
       self.description ||= desc
       self.summary     ||= summ
     else
diff --git a/test/test_hoe.rb b/test/test_hoe.rb
index a39d479..c8d8d3a 100644
--- a/test/test_hoe.rb
+++ b/test/test_hoe.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 require "minitest/autorun"
 require "hoe"
 require "tempfile"
@@ -260,6 +261,42 @@ class TestHoe < Minitest::Test
     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",