hoe 2.9.6 → 2.10.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.10.0 / 2011-06-30
+
+* 3 minor enhancements:
+
+  * Added parse_urls to deal with array and hash style url lists in README.txt.
+  * Added urls accessor.
+  * Deprecated url accessors.
+
+* 1 bug fix:
+
+  * Specified wrong version of racc in racc plugin.
+
 === 2.9.6 / 2011-06-22
 
 * 3 bug fixes:

data/README.txt

@@ -1,9 +1,9 @@
 = Hoe
 
-* http://rubyforge.org/projects/seattlerb/
-* http://seattlerb.rubyforge.org/hoe/
-* http://seattlerb.rubyforge.org/hoe/Hoe.pdf
-* http://github.com/jbarnette/hoe-plugin-examples
+home  :: https://github.com/seattlerb/hoe
+rdoc  :: http://seattlerb.rubyforge.org/hoe/
+doco  :: http://seattlerb.rubyforge.org/hoe/Hoe.pdf
+other :: http://github.com/jbarnette/hoe-plugin-examples
 
 == DESCRIPTION:
 
@@ -284,7 +284,7 @@ We use the bug trackers hosted at: http://rubyforge.org/projects/seattlerb
 
 (The MIT License)
 
-Copyright (c) Ryan Davis, Seattle.rb
+Copyright (c) Ryan Davis, seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/hoe.rb

@@ -67,7 +67,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.9.6'
+  VERSION = '2.10.0'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -211,12 +211,22 @@ class Hoe
   attr_accessor :test_globs
 
   ##
-  # Optional: The url(s) of the project. (can be array).
+  # Deprecated: Optional: The url(s) of the project. (can be array).
   # Auto-populates to a list of urls read from the beginning of
   # README.txt.
+  #
 
   attr_accessor :url
 
+  ##
+  # Optional: The urls of the project. This can be an array or
+  # (preferably) a hash. Auto-populates to the urls read from the
+  # beginning of README.txt.
+  #
+  # See parse_urls for more details
+
+  attr_accessor :urls
+
   ##
   # *MANDATORY*: The version. Don't hardcode! use a constant in the project.
 
@@ -532,10 +542,19 @@ class Hoe
       }]
       desc     = sections.values_at(*description_sections).join("\n\n")
       summ     = desc.split(/\.\s+/).first(summary_sentences).join(". ")
+      urls     = parse_urls(readme[1])
 
+      self.urls        ||= urls
       self.description ||= desc
       self.summary     ||= summ
-      self.url         ||= readme[1].gsub(/^\* /, '').split(/\n/).grep(/\S+/)
+      self.url         ||= case urls
+                           when Hash then
+                             urls["home"] || urls["repo"] || urls.values.first
+                           when Array then
+                             urls
+                           else
+                             raise "unknown urls format: #{urls.inspect}"
+                           end
     else
       missing readme_file
     end
@@ -549,6 +568,33 @@ class Hoe
                      end
   end
 
+  ##
+  # Parse the urls section of the readme file. Returns a hash or an
+  # array depending on the format of the section.
+  #
+  #     label1 :: url1
+  #     label2 :: url2
+  #     label3 :: url3
+  #
+  # vs:
+  #
+  #     * url1
+  #     * url2
+  #     * url3
+  #
+  # The hash format is preferred as it will be used to populate gem
+  # metadata. The array format will work, but will warn that you
+  # should update the readme.
+
+  def parse_urls text
+    lines = text.gsub(/^\* /, '').split(/\n/).grep(/\S+/)
+    if lines.first =~ /::/ then
+      Hash[lines.map { |line| line.split(/\s*::\s*/) }]
+    else
+      lines
+    end
+  end
+
   ##
   # Load activated plugins by calling their define tasks method.
 

data/lib/hoe/racc.rb

@@ -43,7 +43,7 @@ module Hoe::Racc
     self.racc_flags ||= "-v -l"
     self.rex_flags  ||= "--independent"
 
-    dependency 'racc', '~> 1.4.7', :development
+    dependency 'racc', '~> 1.4.6', :development
   end
 
   ##

data/test/test_hoe.rb

@@ -11,6 +11,12 @@ end
 $rakefile = nil # shuts up a warning in rdoctask.rb
 
 class TestHoe < MiniTest::Unit::TestCase
+  def hoe
+    @hoe ||= Hoe.spec("blah") do
+      developer 'author', 'email'
+    end
+  end
+
   def setup
     Rake.application.clear
   end
@@ -24,10 +30,6 @@ class TestHoe < MiniTest::Unit::TestCase
   end
 
   def test_activate_plugins
-    hoe = Hoe.spec 'blah' do
-      developer 'author', 'email'
-    end
-
     initializers = hoe.methods.grep(/^initialize/).map { |s| s.to_s }
 
     assert_includes initializers, 'initialize_clean'
@@ -56,11 +58,7 @@ class TestHoe < MiniTest::Unit::TestCase
         io.write YAML.dump('plugins' => %w[hoerc])
       end
 
-      spec = Hoe.spec 'blah' do
-        developer 'author', 'email'
-      end
-
-      methods = spec.methods.grep(/^initialize/).map { |s| s.to_s }
+      methods = hoe.methods.grep(/^initialize/).map { |s| s.to_s }
 
       assert_includes methods, 'initialize_hoerc'
     end
@@ -90,12 +88,9 @@ class TestHoe < MiniTest::Unit::TestCase
         io.write YAML.dump('plugins' => %w[hoerc])
       end
 
-      spec = Hoe.spec 'blah' do
-        developer 'author', 'email'
-      end
-
-      assert_includes spec.instance_variables.map(&:to_s), '@hoerc_plugin_initialized',
-        "Hoerc plugin wasn't initialized"
+      methods = hoe.instance_variables.map(&:to_s)
+      assert_includes(methods, '@hoerc_plugin_initialized',
+                      "Hoerc plugin wasn't initialized")
     end
   ensure
     Hoe.instance_variable_get(:@loaded).delete :hoerc
@@ -113,6 +108,38 @@ class TestHoe < MiniTest::Unit::TestCase
     end
   end
 
+  def test_parse_urls_ary
+    ary  = ["* https://github.com/seattlerb/hoe",
+            "* http://seattlerb.rubyforge.org/hoe/",
+            "* http://seattlerb.rubyforge.org/hoe/Hoe.pdf",
+            "* http://github.com/jbarnette/hoe-plugin-examples"].join "\n"
+
+    exp = ["https://github.com/seattlerb/hoe",
+           "http://seattlerb.rubyforge.org/hoe/",
+           "http://seattlerb.rubyforge.org/hoe/Hoe.pdf",
+           "http://github.com/jbarnette/hoe-plugin-examples"]
+
+    assert_equal exp, hoe.parse_urls(ary)
+  end
+
+  def test_parse_urls_hash
+    hash = [
+            "home  :: https://github.com/seattlerb/hoe",
+            "rdoc  :: http://seattlerb.rubyforge.org/hoe/",
+            "doco  :: http://seattlerb.rubyforge.org/hoe/Hoe.pdf",
+            "other :: http://github.com/jbarnette/hoe-plugin-examples",
+           ].join "\n"
+
+    exp = {
+      "home"  => "https://github.com/seattlerb/hoe",
+      "rdoc"  => "http://seattlerb.rubyforge.org/hoe/",
+      "doco"  => "http://seattlerb.rubyforge.org/hoe/Hoe.pdf",
+      "other" => "http://github.com/jbarnette/hoe-plugin-examples",
+    }
+
+    assert_equal exp, hoe.parse_urls(hash)
+  end
+
   def test_possibly_better
     t = Gem::Specification::TODAY
     hoe = Hoe.spec("blah") do
@@ -124,6 +151,16 @@ class TestHoe < MiniTest::Unit::TestCase
 
     spec = hoe.spec
 
+    urls = {
+      "home"  => "https://github.com/seattlerb/hoe",
+      "rdoc"  => "http://seattlerb.rubyforge.org/hoe/",
+      "doco"  => "http://seattlerb.rubyforge.org/hoe/Hoe.pdf",
+      "other" => "http://github.com/jbarnette/hoe-plugin-examples",
+    }
+
+    assert_equal "https://github.com/seattlerb/hoe", hoe.url
+    assert_equal urls, hoe.urls
+
     text_files = files.grep(/txt$/).reject { |f| f =~ /template/ }
 
     assert_equal 'blah', spec.name
@@ -137,7 +174,8 @@ class TestHoe < MiniTest::Unit::TestCase
     assert_equal ['sow'], spec.executables
     assert_equal text_files, spec.extra_rdoc_files
     assert_equal files, spec.files
-    assert_equal "http://rubyforge.org/projects/seattlerb/", spec.homepage
+    assert_equal "https://github.com/seattlerb/hoe", spec.homepage
+    # TODO: assert_equal "https://github.com/seattlerb/hoe", spec.metadata
     assert_equal ['--main', 'README.txt'], spec.rdoc_options
     assert_equal ['lib'], spec.require_paths
     assert_equal 'blah', spec.rubyforge_project
@@ -155,6 +193,8 @@ class TestHoe < MiniTest::Unit::TestCase
     assert_equal expected, deps.map { |dep|
       [dep.name, dep.type, dep.requirement.to_s]
     }
+
+    # flunk "not yet"
   end
 
   def test_plugins

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 2
-  - 9
-  - 6
-  version: 2.9.6
+  - 10
+  - 0
+  version: 2.10.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-06-23 00:00:00 Z
+date: 2011-06-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -61,12 +61,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 2
         - 3
-        - 0
-        version: 2.3.0
+        - 1
+        version: 2.3.1
   type: :development
   version_requirements: *id002
 description: |-
@@ -129,7 +129,7 @@ files:
 - test/test_hoe_gemcutter.rb
 - test/test_hoe_test.rb
 - .gemtest
-homepage: http://rubyforge.org/projects/seattlerb/
+homepage: https://github.com/seattlerb/hoe
 licenses: []
 
 post_install_message: