hoe 2.2.0 → 2.3.0

data/History.txt

@@ -1,3 +1,25 @@
+=== 2.3.0 / 2009-06-23
+
+* 1 major enhancement:
+
+  * Plugins can no longer be self-activating.
+
+* 8 minor enhancements:
+
+  * All hoe plugins are pre-activated.
+  * Allow RDoc title to be set via spec_extras['rdoc_options'].
+  * Cleaned up plugin activation.
+  * History intuition extended for markdown. drnic/jbarnette
+  * Move RDoc task requires to hoe/publish.rb.
+  * Only activated plugins are loaded, extended, and activated.
+  * Plugin loading deferred until hoe-spec creation, allowing proper meta-plugins.
+  * inline plugin adds RubyInline dependency and hooks clean task.
+
+* 2 bug fixes:
+
+  * Fixed developer load order error in load_plugins.
+  * rcov should use test_globs. apatterson
+
 === 2.2.0 / 2009-06-17
 
 * 8 minor enhancements:

data/lib/hoe.rb

@@ -3,20 +3,11 @@
 require 'rubygems'
 require 'rake'
 require 'rake/gempackagetask'
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask'
-end
 require 'rake/testtask'
-require 'rbconfig'
 require 'rubyforge'
 require 'yaml'
 
-begin
-  gem 'rdoc'
-rescue Gem::LoadError
-end
+require 'hoe/rake'
 
 ##
 # Hoe is a simple rake/rubygems helper for project Rakefiles. It helps
@@ -69,7 +60,10 @@ end
 
 class Hoe
   # duh
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
+
+  @@plugins = [:clean, :debug, :deps, :flay, :flog, :package, :publish,
+               :rcov, :signing, :test]
 
   ##
   # Used to add extra flags to RUBY_FLAGS.
@@ -216,19 +210,22 @@ class Hoe
   # It is called at the end of hoe.rb
 
   def self.load_plugins
-    loaded = {}
+    loaded, found = {}, {}
 
-    Gem.find_files("hoe/*.rb").each do |plugin|
-      warn plugin if $DEBUG
-      name = File.basename plugin
+    Gem.find_files("hoe/*.rb").reverse.each do |path|
+      found[File.basename(path, ".rb").intern] = path
+    end
+
+    :keep_doing_this while found.map { |name, plugin|
+      next unless Hoe.plugins.include? name
       next if loaded[name]
       begin
-        load plugin
-        loaded[name] = true
+        warn "loading #{plugin}" if $DEBUG
+        loaded[name] = load plugin
       rescue LoadError => e
         warn "error loading #{plugin.inspect}: #{e.message}. skipping..."
       end
-    end
+    }.any?
   end
 
   ##
@@ -255,13 +252,15 @@ class Hoe
   # Return the list of activated plugins.
 
   def self.plugins
-    @@plugins ||= []
+    @@plugins
   end
 
   ##
   # Create a new hoe-specification executing the supplied block
 
   def self.spec name, &block
+    Hoe.load_plugins
+
     spec = self.new name
     spec.activate_plugins
     spec.instance_eval(&block)
@@ -273,12 +272,19 @@ class Hoe
   # Activate plugin modules and add them to the current instance.
 
   def activate_plugins
-    self.class.constants.reject { |n| n =~ /^[A-Z_]+$/ }.each do |name|
+    names = self.class.constants.map { |s| s.to_s }
+    names.reject! { |n| n =~ /^[A-Z_]+$/ }
+
+    names.each do |name|
+      next unless Hoe.plugins.include? name.downcase.intern
+      warn "extend #{name}" if $DEBUG
       self.extend Hoe.const_get(name)
     end
 
-    self.class.plugins.each do |plugin|
-      send "initialize_#{plugin}" rescue nil
+    Hoe.plugins.each do |plugin|
+      msg = "initialize_#{plugin}"
+      warn msg if $DEBUG
+      send msg if self.respond_to? msg
     end
   end
 
@@ -345,15 +351,6 @@ class Hoe
       s.extra_rdoc_files.reject! { |f| f =~ %r%^(test|spec|vendor|template|data|tmp)/% }
       s.extra_rdoc_files += @extra_rdoc_files
 
-      # Do any extra stuff the user wants
-      spec_extras.each do |msg, val|
-        case val
-        when Proc
-          val.call(s.send(msg))
-        else
-          s.send "#{msg}=", val
-        end
-      end
     end
 
     unless self.version then
@@ -372,6 +369,16 @@ class Hoe
         warn "Add 'VERSION = \"x.y.z\"' to your code or fix your hoe spec"
       end
     end
+
+    # Do any extra stuff the user wants
+    spec_extras.each do |msg, val|
+      case val
+      when Proc
+        val.call spec.send(msg)
+      else
+        spec.send "#{msg}=", val
+      end
+    end
   end
 
   ##
@@ -412,6 +419,7 @@ class Hoe
 
     if block_given? then
       warn "Hoe.new {...} deprecated. Switch to Hoe.spec."
+      Hoe.load_plugins
       self.activate_plugins
       yield self
       post_initialize
@@ -422,12 +430,13 @@ class Hoe
   # Intuit values from the readme and history files.
 
   def intuit_values
-    readme = File.read_utf(readme_file).split(/^(=+ .*)$/)[1..-1] rescue ''
+    header_re = /^((?:=+|#+) .*)$/
+    readme    = File.read_utf(readme_file).split(header_re)[1..-1] rescue ''
+
     unless readme.empty? then
-      sections = readme.map { |s|
-        s =~ /^=/ ? s.strip.downcase.chomp(':').split.last : s.strip
-      }
-      sections = Hash[*sections]
+      sections = Hash[*readme.map { |s|
+        s =~ /^[=#]/ ? s.strip.downcase.chomp(':').split.last : s.strip
+      }]
       desc     = sections.values_at(*description_sections).join("\n\n")
       summ     = desc.split(/\.\s+/).first(summary_sentences).join(". ")
 
@@ -440,7 +449,7 @@ class Hoe
 
     self.changes ||= begin
                        h = File.read_utf(history_file)
-                       h.split(/^(===.*)/)[1..2].join.strip
+                       h.split(/^(={2,}|\#{2,})/)[1..2].join.strip
                      rescue
                        missing history_file
                        ''
@@ -469,7 +478,7 @@ class Hoe
       end
 
       (Rake::Task.tasks - old_tasks).each do |task|
-        task.plugin = plugin # "%-#{max}s" % plugin
+        task.plugin = plugin
       end
     end
     @@plugins -= bad
@@ -550,8 +559,6 @@ class Hoe
     config = exists ? YAML.load_file(rc) : {}
     yield(config, rc)
   end
-
-  Hoe.load_plugins
 end
 
 class File
@@ -560,13 +567,3 @@ class File
     File.read(path).sub(/\A\xEF\xBB\xBF/, '')
   end
 end
-
-module Rake
-  class Task
-    attr_accessor :plugin
-    alias :old_comment :comment
-    def comment
-      "%-#{$plugin_max}s # %s" % [plugin, old_comment] if old_comment
-    end
-  end
-end

data/lib/hoe/clean.rb

@@ -6,8 +6,6 @@
 # clean::              Clean up all the extras.
 
 module Hoe::Clean
-  Hoe.plugin :clean # activate globally, fine for general purpose tasks
-
   ##
   # Optional: An array of file patterns to delete on clean.
 

data/lib/hoe/debug.rb

@@ -8,8 +8,6 @@
 # debug_gem::          Show information about the gem.
 
 module Hoe::Debug
-  Hoe.plugin :debug
-
   Hoe::DEFAULT_CONFIG["exclude"] = /tmp$|CVS|TAGS|\.(svn|git|DS_Store)/
 
   # :stopdoc:

data/lib/hoe/deps.rb

@@ -11,8 +11,6 @@ require 'rubygems/remote_fetcher'
 # deps:list::          List all the dependent gems of this gem
 
 module Hoe::Deps
-  Hoe.plugin :deps
-
   ##
   # The main rubygems repository.
 

data/lib/hoe/flay.rb

@@ -6,8 +6,6 @@
 # flay::               Analyze for code duplication.
 
 module Hoe::Flay
-  Hoe.plugin :flay
-
   ##
   # Optional: flay threshold to determine threshold failure. [default: 1200-100]
 

data/lib/hoe/flog.rb

@@ -6,8 +6,6 @@
 # flog::               Analyze code complexity.
 
 module Hoe::Flog
-  Hoe.plugin :flog
-
   ##
   # Optional: flog threshold to determine threshold failure. [default: 1500-200]
 

data/lib/hoe/inline.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 ##
 # Hoe allows bundling of pre-compiled extensions in the +package+ task.
 #
@@ -16,11 +18,14 @@
 # +FORCE_PLATFORM+ (instead of default Gem::Platform::CURRENT)
 
 module Hoe::Inline
-
   ##
   # Define tasks for plugin.
 
   def define_inline_tasks
+    extra_deps  << 'RubyInline'
+    clean_globs << File.expand_path("~/.ruby_inline")
+    task :test => :clean
+
     if ENV['INLINE'] then
       s.platform = ENV['FORCE_PLATFORM'] || Gem::Platform::CURRENT
 

data/lib/hoe/package.rb

@@ -7,8 +7,6 @@
 # release::            Package and upload the release to rubyforge.
 
 module Hoe::Package
-  Hoe.plugin :package
-
   ##
   # Optional: Should package create a tarball? [default: true]
 

data/lib/hoe/publish.rb

@@ -1,3 +1,14 @@
+begin
+  gem 'rdoc'
+rescue Gem::LoadError
+end
+
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
+
 ##
 # Publish plugin for hoe.
 #
@@ -16,8 +27,6 @@
 # blogs::               An array of hashes of blog settings.
 
 module Hoe::Publish
-  Hoe.plugin :publish
-
   ##
   # Optional: An array of the project's blog categories. Defaults to project
   # name.
@@ -26,7 +35,7 @@ module Hoe::Publish
 
   ##
   # Optional: Name of destination directory for RDoc generated files.
-  # [default: rdoc]
+  # [default: doc]
 
   attr_accessor :local_rdoc_dir
 
@@ -86,10 +95,20 @@ module Hoe::Publish
         rd.rdoc_files += spec.require_paths
         rd.rdoc_files += spec.extra_rdoc_files
 
-        title = "#{name}-#{version} Documentation"
-        title = "#{rubyforge_name}'s " + title if rubyforge_name != name
+        title = spec.rdoc_options.grep(/^(-t|--title)=?$/).first
+
+        if title then
+          rd.options << title
 
-        rd.options << "-t" << title
+          unless title =~ /=/ then # for ['-t', 'title here']
+            title_index = spec.rdoc_options.index(title)
+            rd.options << spec.rdoc_options[title_index + 1]
+          end
+        else
+          title = "#{name}-#{version} Documentation"
+          title = "#{rubyforge_name}'s " + title if rubyforge_name != name
+          rd.options << '--title' << title
+        end
       end
 
       desc 'Generate ri locally for testing.'

data/lib/hoe/rake.rb

@@ -1,4 +1,12 @@
 module Rake
+  class Task
+    attr_accessor :plugin
+    alias :old_comment :comment
+    def comment
+      "%-#{$plugin_max}s # %s" % [plugin, old_comment] if old_comment
+    end
+  end
+
   module TaskManager
     ##
     # This gives us access to the tasks already defined in rake.
@@ -41,4 +49,4 @@ module Rake
       all_tasks[name].actions.delete_at(-1)
     end
   end
-end unless Rake.respond_to? :all_tasks
+end

data/lib/hoe/rcov.rb

@@ -6,8 +6,6 @@
 # rcov::               Analyze code coverage with tests
 
 module Hoe::RCov
-  Hoe.plugin :rcov
-
   ##
   # Define tasks for plugin.
 
@@ -16,7 +14,7 @@ module Hoe::RCov
       require 'rcov/rcovtask'
 
       Rcov::RcovTask.new do |t|
-        pattern = ENV['PATTERN'] || 'test/test_*.rb'
+        pattern = ENV['PATTERN'] || test_globs
 
         t.test_files = FileList[pattern]
         t.verbose = true

data/lib/hoe/signing.rb

@@ -37,8 +37,6 @@
 #   metadata.gz.sig
 
 module Hoe::Signing
-  Hoe.plugin :signing
-
   Hoe::DEFAULT_CONFIG["signing_key_file"]  = "~/.gem/gem-private_key.pem"
   Hoe::DEFAULT_CONFIG["signing_cert_file"] = "~/.gem/gem-public_cert.pem"
 

data/lib/hoe/test.rb

@@ -10,8 +10,6 @@
 # test_deps::          Show which test files fail when run alone.
 
 module Hoe::Test
-  Hoe.plugin :test # activate globally, fine for general purpose tasks
-
   ##
   # Configuration for the supported test frameworks for test task.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency