hoe 1.6.0 → 1.7.0

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.7.0 / 2008-06-30
+
+* 3 minor enhancements:
+
+  * Use rdoc 2.x gem if available. Eric likes his backslashes.
+  * Added extra_dev_deps for new rubygems developer dependencies.
+    * Switched hoe to dev dep. Fork off, bitches.
+  * Finally got a sane test that does something. Hey... it's a start.
+
 === 1.6.0 / 2008-06-18
 
 * 1 minor enhancement

data/lib/hoe.rb

@@ -9,6 +9,11 @@ require 'rbconfig'
 require 'rubyforge'
 require 'yaml'
 
+begin
+  gem 'rdoc'
+rescue Gem::LoadError
+end
+
 ##
 # hoe - a tool to help rake
 #
@@ -115,7 +120,7 @@ require 'yaml'
 #
 
 class Hoe
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 
   ruby_prefix = Config::CONFIG['prefix']
   sitelibdir = Config::CONFIG['sitelibdir']
@@ -213,6 +218,11 @@ class Hoe
 
   attr_accessor :extra_deps
 
+  ##
+  # Optional: An array of rubygem developer dependencies.
+
+  attr_accessor :extra_dev_deps
+
   ##
   # Populated automatically from the manifest. List of library files.
 
@@ -303,6 +313,15 @@ class Hoe
 
   attr_accessor :version
 
+  def normalize_deps deps
+    Array(deps).map { |o| String === o ? [o] : o }
+  end
+
+  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"
+  end
+
   def initialize(name, version) # :nodoc:
     self.name = name
     self.version = version
@@ -315,6 +334,7 @@ class Hoe
     self.blog_categories = [name]
     self.email = []
     self.extra_deps = []
+    self.extra_dev_deps = []
     self.multiruby_skip = []
     self.need_tar = true
     self.need_zip = false
@@ -331,11 +351,6 @@ class Hoe
 
     # Intuit 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"
-    end
-
     readme   = File.read("README.txt").split(/^(=+ .*)$/)[1..-1] rescue ''
     unless readme.empty? then
       sections = readme.map { |s|
@@ -377,14 +392,15 @@ class Hoe
       'rubyforge' => ">= #{::RubyForge::VERSION}",
     }
 
-    self.extra_deps = Array(extra_deps).map { |o| String === o ? [o] : o }
+    self.extra_deps     = normalize_deps extra_deps
+    self.extra_dev_deps = normalize_deps extra_dev_deps
 
     if name == 'hoe' then
       hoe_deps.each do |pkg, vers|
         extra_deps << [pkg, vers]
       end
     else
-      extra_deps << ['hoe', ">= #{VERSION}"] unless hoe_deps.has_key? name
+      extra_dev_deps << ['hoe', ">= #{VERSION}"] unless hoe_deps.has_key? name
     end
 
     define_tasks
@@ -395,14 +411,14 @@ class Hoe
     self.email << email
   end
 
-  def define_tasks # :nodoc:
-    def with_config # :nodoc:
-      rc = File.expand_path("~/.hoerc")
-      exists = File.exist? rc
-      config = exists ? YAML.load_file(rc) : {}
-      yield(config, rc)
-    end
+  def with_config # :nodoc:
+    rc = File.expand_path("~/.hoerc")
+    exists = File.exist? rc
+    config = exists ? YAML.load_file(rc) : {}
+    yield(config, rc)
+  end
 
+  def define_tasks # :nodoc:
     desc 'Run the default tasks.'
     task :default => :test
 
@@ -462,6 +478,10 @@ class Hoe
         s.add_dependency(*dep)
       end
 
+      extra_dev_deps.each do |dep|
+        s.add_development_dependency(*dep)
+      end
+
       s.files = File.read("Manifest.txt").delete("\r").split(/\n/)
       s.executables = s.files.grep(/^bin/) { |f| File.basename(f) }
 

data/test/test_hoe.rb

@@ -49,4 +49,46 @@ class TestHoe < Test::Unit::TestCase
 
     assert_equal expected.sort, public_tasks
   end
+
+  def test_possibly_better
+    t = Gem::Specification::TODAY
+    hoe = Hoe.new("blah", '1.2.3') do |h|
+      h.developer 'author', 'email'
+    end
+
+    files = File.read("Manifest.txt").split(/\n/)
+
+    spec = hoe.spec
+
+    assert_equal 'blah', spec.name
+    assert_equal '1.2.3', spec.version.to_s
+    assert_equal '>= 0', spec.required_rubygems_version.to_s
+
+    assert_equal ['author'], spec.authors
+    assert_equal t, spec.date
+    assert_equal 'sow', spec.default_executable
+    assert_match(/Hoe.*Rakefiles/, spec.description)
+    assert_equal ['email'], spec.email
+    assert_equal ['sow'], spec.executables
+    assert_equal files.grep(/txt$/), spec.extra_rdoc_files
+    assert_equal files, spec.files
+    assert_equal true, spec.has_rdoc
+    assert_equal "http://rubyforge.org/projects/seattlerb/", spec.homepage
+    assert_equal ['--main', 'README.txt'], spec.rdoc_options
+    assert_equal ['lib'], spec.require_paths
+    assert_equal 'blah', spec.rubyforge_project
+    assert_equal Gem::RubyGemsVersion, spec.rubygems_version
+    assert_match(/^Hoe.*Rakefiles$/, spec.summary)
+    assert_equal files.grep(/^test/), spec.test_files
+
+    deps = spec.dependencies
+
+    assert_equal 1, deps.size
+
+    dep = deps.first
+
+    assert_equal 'hoe', dep.name
+    assert_equal :development, dep.type
+    assert_equal ">= #{Hoe::VERSION}", dep.version_requirements.to_s
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-18 00:00:00 -07:00
+date: 2008-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -72,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Hoe is a simple rake/rubygems helper for project Rakefiles