+ Added deprecation to parse_urls for ancient url array form.

+ Hoe#parse_urls now returns a hash no matter what
minor cleanup to new metadata code
minor cleanup to tests. damn... they're _old_.

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

1 files changed, 6 insertions, 11 deletions

diff --git a/lib/hoe.rb b/lib/hoe.rb
index 853e7c3..5e82975 100644
--- a/lib/hoe.rb
+++ b/lib/hoe.rb
@@ -544,14 +544,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) }
@@ -559,8 +552,8 @@ 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.select { |name, _| URLS_TO_META_MAP.key? name }.map { |name, link|
-        [URLS_TO_META_MAP[name], link]
+      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?
@@ -734,7 +727,9 @@ 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."
+      { "home" => lines.first }
     end
   end