hoe 2.16.1 → 3.0.0

data/History.txt

@@ -1,3 +1,22 @@
+=== 3.0.0 / 2012-03-20
+
+* 3 major enhancements:
+
+  * Added activate_plugin_deps phase to plugin loading.
+  * Removed long deprecated Hoe.new { block }.
+  * Removed long deprecated handling of improper dependencies.
+
+* 3 minor enhancements:
+
+  * Added deprecation warnings to Hoe#url and Hoe#url=. Already deprecated for 9 mo.
+  * Reworked all the plugins to use activate_XXX_deps, as necessary.
+  * Switched internal usage of #url to #urls.
+
+* 2 bug fixes:
+
+  * Fixed failures in the publish_docs task when remote directory times cannot be changed (such as on rubyforge).
+  * Fixed isolate setup for the racc plugin
+
 === 2.16.1 / 2012-03-13
 
 * 2 bug fixes:

data/README.txt

@@ -249,11 +249,16 @@ their projects.
 ==== Initialization
 
 When your hoe-spec is instantiated, it extends itself all known plugin
-modules. This adds the method bodies to the hoe-spec and allows for the plugin
-to work as part of the spec itself. Once that is over, activated plugins have
-their **optional** define `initialize_#{plugin}` methods called. This lets
-them set needed instance variables to default values. Finally, the hoe-spec
-block is evaluated so that project specific values can override the defaults.
+modules. This adds the method bodies to the hoe-spec and allows for
+the plugin to work as part of the spec itself. Once that is over,
+activated plugins have their **optional** `initialize_#{plugin}`
+methods called followed by their **optional**
+`activate_#{plugin}_deps` methods called. This lets them set needed
+instance variables to default values and declare any gem dependencies
+needed.. Finally, the hoe-spec block is evaluated so that project
+specific values can override the defaults.
+
+See "Hoe Plugin Loading Sequence" in hoe.rb for full details.
 
 ==== Task Definition
 

data/lib/hoe.rb

@@ -68,13 +68,30 @@ require 'hoe/rake'
 #       # ...
 #     end
 #   end
+#
+# === Hoe Plugin Loading Sequence
+#
+#   Hoe.spec
+#     Hoe.load_plugins
+#       require
+#     activate_plugins
+#       extend plugin_module
+#       initialize_plugins
+#         initialize_XXX
+#       activate_plugin_deps
+#         activate_XXX_deps
+#     yield spec
+#     post_initialize
+#       define_spec # gemspec, not hoespec
+#       load_plugin_tasks
+#       add_dependencies
 
 class Hoe
 
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.16.1'
+  VERSION = '3.0.0'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -227,6 +244,11 @@ class Hoe
 
   attr_accessor :url
 
+  require 'rubygems/deprecate'
+  extend Gem::Deprecate
+  deprecate :url,  :urls,  2012, 6
+  deprecate :url=, :urls=, 2012, 6
+
   ##
   # Optional: The urls of the project. This can be an array or
   # (preferably) a hash. Auto-populates to the urls read from the
@@ -375,6 +397,11 @@ class Hoe
       self.extend Hoe.const_get(name)
     end
 
+    initialize_plugins
+    activate_plugin_deps
+  end
+
+  def initialize_plugins
     Hoe.plugins.each do |plugin|
       msg = "initialize_#{plugin}"
       warn msg if $DEBUG
@@ -382,6 +409,14 @@ class Hoe
     end
   end
 
+  def activate_plugin_deps
+    Hoe.plugins.each do |plugin|
+      msg = "activate_#{plugin}_deps"
+      warn msg if $DEBUG
+      send msg if self.respond_to? msg
+    end
+  end
+
   ##
   # Add a dependency declaration to your spec. Pass :dev to
   # +type+ for developer dependencies.
@@ -458,7 +493,14 @@ class Hoe
       s.version              = version if version
       s.summary              = summary
       s.email                = email
-      s.homepage             = Array(url).first
+      s.homepage             = case urls
+                               when Hash then
+                                 urls["home"] || urls.values.first
+                               when Array then
+                                 urls
+                               else
+                                 raise "unknown urls format: #{urls.inspect}"
+                               end
       s.rubyforge_project    = rubyforge_name
       s.description          = description
       s.files                = manifest
@@ -532,9 +574,7 @@ class Hoe
   end
 
   ##
-  # Create a newly initialized hoe spec. If a block is given, yield on
-  # it and finish post_initialize steps. This is deprecated behavior
-  # and should be switched from Hoe.new to Hoe.spec.
+  # Create a newly initialized hoe spec.
 
   def initialize name, version = nil # :nodoc:
     self.name                 = name
@@ -555,7 +595,6 @@ class Hoe
     self.summary              = nil
     self.summary_sentences    = 1
     self.test_globs           = ['test/**/test_*.rb']
-    self.url                  = nil
 
     if manifest = read_manifest then
       self.readme_file  = manifest.grep(/^README\./).first
@@ -565,13 +604,7 @@ class Hoe
     self.history_file ||= "History.txt"
     self.readme_file  ||= "README.txt"
 
-    if block_given? then
-      warn "Hoe.new {...} deprecated. Switch to Hoe.spec."
-      Hoe.load_plugins
-      self.activate_plugins
-      yield self
-      post_initialize
-    end
+    abort "Hoe.new {...} removed. Switch to Hoe.spec." if block_given?
   end
 
   ##
@@ -592,14 +625,6 @@ class Hoe
       self.urls        ||= urls
       self.description ||= desc
       self.summary     ||= summ
-      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
@@ -681,14 +706,13 @@ class Hoe
   # Normalize the dependencies.
 
   def normalize_deps deps
-    Array(deps).map { |o|
-      if String === o then
-        warn "WAR\NING: HOE DEPRECATION: Add '>= 0' to the '#{o}' dependency."
-        [o, ">= 0"]
-      else
-        o
-      end
-    }
+    deps = Array(deps)
+
+    deps.each do |o|
+      abort "ERROR: Add '~> x.y' to the '#{o}' dependency." if String === o
+    end
+
+    deps
   end
 
   ##

data/lib/hoe/compiler.rb

@@ -27,8 +27,11 @@ module Hoe::Compiler
     self.spec_extras   = { :extensions => ["ext/#{self.name}/extconf.rb"] }
 
     clean_globs << "lib/#{self.name}/*.{so,bundle,dll}"
+  end
 
+  def activate_compiler_deps
     dependency "rake-compiler", "~> 0.7", :development
+    gem "rake-compiler", "~> 0.7"
   end
 
   ##

data/lib/hoe/inline.rb

@@ -19,11 +19,13 @@ require 'rbconfig'
 
 module Hoe::Inline
   def initialize_inline
-    dependency "RubyInline", "~> 3.9"
-
     clean_globs << File.expand_path("~/.ruby_inline")
   end
 
+  def activate_inline_deps
+    dependency "RubyInline", "~> 3.9"
+  end
+
   ##
   # Define tasks for plugin.
 

data/lib/hoe/publish.rb

@@ -93,22 +93,11 @@ module Hoe::Publish
     self.need_rdoc       ||= true
     self.rdoc_locations  ||= []
     self.remote_rdoc_dir ||= self.name
-    self.rsync_args      ||= '-av --delete'
+    self.rsync_args      ||= '-av -O --delete'
   end
 
-  def make_rdoc_cmd(*extra_args)
-    title = "#{name}-#{version} Documentation"
-    title = "#{rubyforge_name}'s #{title}" if rubyforge_name != name
-    rdoc  = Gem.bin_wrapper "rdoc"
-
-    %W[#{rdoc}
-       --title #{title}
-       -o #{local_rdoc_dir}
-      ] +
-      spec.rdoc_options +
-      extra_args +
-      spec.require_paths +
-      spec.extra_rdoc_files
+  def activate_publish_deps
+    dependency "rdoc", "~> 3.10", :developer if need_rdoc
   end
 
   ##
@@ -116,8 +105,6 @@ module Hoe::Publish
 
   def define_publish_tasks
     if need_rdoc then
-      dependency "rdoc", "~> 3.10", :developer
-
       task :isolate # ensure it exists
 
       desc "Generate rdoc"
@@ -198,6 +185,21 @@ module Hoe::Publish
     task :announce => [:post_blog, :publish_on_announce ]
   end
 
+  def make_rdoc_cmd(*extra_args)
+    title = "#{name}-#{version} Documentation"
+    title = "#{rubyforge_name}'s #{title}" if rubyforge_name != name
+    rdoc  = Gem.bin_wrapper "rdoc"
+
+    %W[#{rdoc}
+       --title #{title}
+       -o #{local_rdoc_dir}
+      ] +
+      spec.rdoc_options +
+      extra_args +
+      spec.require_paths +
+      spec.extra_rdoc_files
+  end
+
   def post_blog_zenweb site
     dir = site["path"]
 

data/lib/hoe/racc.rb

@@ -42,7 +42,9 @@ module Hoe::Racc
     # -l = no-line-convert (they don't ever line up anyhow)
     self.racc_flags ||= "-v -l"
     self.rex_flags  ||= "--independent"
+  end
 
+  def define_racc_deps
     dependency 'racc', '~> 1.4.6', :development
   end
 
@@ -75,11 +77,13 @@ module Hoe::Racc
       end
     end
 
+    task :isolate # stub task
+
     desc "build the parser" unless parser_files.empty?
-    task :parser
+    task :parser => :isolate
 
     desc "build the lexer" unless lexer_files.empty?
-    task :lexer
+    task :lexer  => :isolate
 
     task :parser => parser_files
     task :lexer  => lexer_files

data/lib/hoe/rcov.rb

@@ -6,7 +6,7 @@
 # rcov::               Analyze code coverage with tests
 
 module Hoe::RCov
-  def initialize_rcov
+  def activate_rcov_deps
     dependency "rcov", "~> 0.9", :development
   end
 

data/test/test_hoe.rb

@@ -279,7 +279,6 @@ class TestHoe < MiniTest::Unit::TestCase
       "other" => "http://github.com/jbarnette/hoe-plugin-examples",
     }
 
-    assert_equal urls["home"], hoe.url
     assert_equal urls, hoe.urls
 
     text_files = files.grep(/txt$/).reject { |f| f =~ /template/ }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 7
   prerelease: 
   segments: 
-  - 2
-  - 16
-  - 1
-  version: 2.16.1
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-03-13 00:00:00 Z
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles