hoe 2.5.0 → 2.6.0

data/History.txt

@@ -1,3 +1,21 @@
+=== 2.6.0 / 2010-03-27
+
+* 6 minor enhancements:
+
+  * Added '.' to load path for (bad) 1.9.2 changes
+  * Added rdoc_locations array to the publish plugin to allow for
+    multiple arbitrary rdoc locations
+    * Refactored old rubyforge rdoc location to the rubyforge plugin.
+  * Added require_ruby_version and require_rubygems_version.
+  * Cleaned up dep tests
+  * Hoe now depends on rubygems 1.3.6 instead of the gemcutter gem.
+  * Remove ext from default_ruby_flags and require_paths. (luis)
+
+* 2 bug fixes:
+
+  * Fixed test command to use '--' before filter args
+  * Tweaked .hoerc error to point to a fix.
+
 === 2.5.0 / 2010-01-06
 
 * 8 minor enhancements:

data/Rakefile

@@ -14,6 +14,7 @@ Hoe.spec "hoe" do
   blog_categories << "Seattle.rb" << "Ruby"
 
   pluggable!
+  require_ruby_version '>= 1.3.6'
 end
 
 task :plugins do

data/lib/hoe.rb

@@ -58,7 +58,7 @@ require 'hoe/rake'
 
 class Hoe
   # duh
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :rubyforge, :gemcutter, :signing, :test]
@@ -68,7 +68,7 @@ class Hoe
 
   RUBY_DEBUG = ENV['RUBY_DEBUG']
 
-  default_ruby_flags = "-w -I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}" +
+  default_ruby_flags = "-w -I#{%w(lib bin test .).join(File::PATH_SEPARATOR)}" +
     (RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
 
   ##
@@ -343,7 +343,7 @@ class Hoe
 
   def define_spec
     self.spec = Gem::Specification.new do |s|
-      dirs = Dir['{lib,ext}']
+      dirs = Dir['lib']
 
       s.name                 = name
       s.version              = version if version
@@ -552,10 +552,13 @@ class Hoe
 
   ##
   # Tell the world you're a pluggable package (ie you require rubygems 1.3.1+)
+  #
+  # This uses require_rubygems_version. Last one wins. Make sure you
+  # account for that.
 
   def pluggable!
     abort "update rubygems to >= 1.3.1" unless  Gem.respond_to? :find_files
-    spec_extras[:required_rubygems_version] = '>= 1.3.1'
+    require_rubygems_version '>= 1.3.1'
   end
 
   ##
@@ -569,6 +572,20 @@ class Hoe
     load_plugin_tasks
   end
 
+  ##
+  # Declare that your gem requires a specific rubygems version. Last one wins.
+
+  def require_rubygems_version version
+    spec_extras[:required_rubygems_version] = version
+  end
+
+  ##
+  # Declare that your gem requires a specific ruby version. Last one wins.
+
+  def require_ruby_version version
+    spec_extras[:required_ruby_version] = version
+  end
+
   ##
   # Provide a linear degrading value from n to m over start to finis dates.
 

data/lib/hoe/debug.rb

@@ -47,7 +47,9 @@ module Hoe::Debug
       files = []
       with_config do |config, _|
         exclusions = config["exclude"]
-        abort "exclude entry missing from .hoerc. Aborting." if exclusions.nil?
+        abort "exclude entry missing from .hoerc. Run rake config_hoe." if
+          exclusions.nil?
+
         Find.find '.' do |path|
           next unless File.file? path
           next if path =~ exclusions

data/lib/hoe/gemcutter.rb

@@ -1,12 +1,6 @@
 require 'rake'
-gem "gemcutter" # lame. gemcutter doesn't have a VERSION const.
 
 module Hoe::Gemcutter
-  def initialize_gemcutter
-    version = Gem.loaded_specs['gemcutter'].version
-    dependency_target << ['gemcutter', ">= #{version}"]
-  end
-
   def define_gemcutter_tasks
     desc "Push gem to gemcutter."
     task :release_to_gemcutter => [:clean, :package, :release_sanity] do

data/lib/hoe/publish.rb

@@ -47,6 +47,15 @@ module Hoe::Publish
 
   attr_accessor :need_rdoc
 
+  ##
+  # Optional: An array of remote (rsync) paths to copy rdoc to.
+  #
+  # eg:
+  #
+  #     rdoc_locations << "user@server:Sites/rdoc/#{remote_rdoc_dir}"
+
+  attr_accessor :rdoc_locations
+
   ##
   # Optional: Name of RDoc destination directory on Rubyforge. [default: +name+]
 
@@ -77,6 +86,7 @@ module Hoe::Publish
     self.blog_categories ||= [self.name]
     self.local_rdoc_dir  ||= 'doc'
     self.need_rdoc       ||= true
+    self.rdoc_locations  ||= []
     self.remote_rdoc_dir ||= self.name
     self.rsync_args      ||= '-av --delete'
   end
@@ -117,16 +127,12 @@ module Hoe::Publish
       end
     end
 
-    desc 'Publish RDoc to RubyForge.'
+    desc "Publish RDoc to wherever you want."
     task :publish_docs => [:clean, :docs] do
-      path = File.expand_path("~/.rubyforge/user-config.yml")
-      config = YAML.load(File.read(path))
-      host = "#{config["username"]}@rubyforge.org"
-
-      remote_dir = "/var/www/gforge-projects/#{rubyforge_name}/#{remote_rdoc_dir}"
-      local_dir = local_rdoc_dir
-
-      sh %{rsync #{rsync_args} #{local_dir}/ #{host}:#{remote_dir}}
+      warn "no rdoc_location values" if rdoc_locations.empty?
+      self.rdoc_locations.each do |dest|
+        sh %{rsync #{rsync_args} #{local_rdoc_dir}/ #{dest}}
+      end
     end
 
     # no doco for this one

data/lib/hoe/rubyforge.rb

@@ -38,5 +38,14 @@ module Hoe::RubyForge
       puts "Releasing #{name} v. #{version}"
       rf.add_release rubyforge_name, name, version, *files
     end
+
+    if Hoe.plugins.include? :publish then
+      path   = File.expand_path("~/.rubyforge/user-config.yml")
+      config = YAML.load(File.read(path))
+      base   = "/var/www/gforge-projects"
+      dir    = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
+
+      rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
+    end
   end
 end

data/lib/hoe/test.rb

@@ -126,7 +126,7 @@ module Hoe::Test
       test_globs.map { |g| Dir.glob(g) }.flatten
     tests.map! {|f| %(require "#{f}")}
 
-    cmd = "#{Hoe::RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
+    cmd = "#{Hoe::RUBY_FLAGS} -e '#{tests.join("; ")}' -- #{FILTER}"
 
     if multi then
       ENV['EXCLUDED_VERSIONS'] = multiruby_skip.join ":"

data/test/test_hoe.rb

@@ -53,23 +53,12 @@ class TestHoe < MiniTest::Unit::TestCase
 
     deps = spec.dependencies.sort_by { |dep| dep.name }
 
-    assert_equal %w(gemcutter hoe rubyforge), deps.map { |dep| dep.name }
+    expected = [["hoe",       :development, ">= #{Hoe::VERSION}"],
+                ["rubyforge", :development, ">= #{::RubyForge::VERSION}"]]
 
-    dep = deps.shift
-    assert_equal 'gemcutter', dep.name
-    assert_equal :development, dep.type
-    version = Gem.loaded_specs['gemcutter'].version
-    assert_equal ">= #{version}", dep.version_requirements.to_s
-
-    dep = deps.shift
-    assert_equal 'hoe', dep.name
-    assert_equal :development, dep.type
-    assert_equal ">= #{Hoe::VERSION}", dep.version_requirements.to_s
-
-    dep = deps.shift
-    assert_equal 'rubyforge', dep.name
-    assert_equal :development, dep.type
-    assert_equal ">= #{::RubyForge::VERSION}", dep.version_requirements.to_s
+    assert_equal expected, deps.map { |dep|
+      [dep.name, dep.type, dep.requirement.to_s]
+    }
   end
 
   def test_plugins

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  prerelease: false
+  segments: 
+  - 2
+  - 6
+  - 0
+  version: 2.6.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -30,49 +35,51 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: minitest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.2
-    version: 
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :development
+  version_requirements: *id003
 description: |-
   Hoe is a rake/rubygems helper for project Rakefiles. It helps you
   manage and maintain, and release your project and includes a dynamic
@@ -142,18 +149,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles