hoe 2.9.0 → 2.9.1.b.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.9.1 / 2011-02-05
+
+* 1 minor enhancement:
+
+  * Sow now creates all template directories before dealing with anything else
+
+* 3 bug fixes:
+
+  * Fixed dependency order bug with prereleases [erikh]
+  * Fixed sanity check for prereleases.
+  * Fixed sow when passed no args. [erikh]
+
 === 2.9.0 / 2011-01-31
 
 * 11 minor enhancements:

data/bin/sow

@@ -6,6 +6,8 @@ require 'hoe'
 require 'fileutils'
 require 'erb'
 
+XIF = 'FI' + 'X' # prevents extra hits on my TAG reporter
+
 option = {
   :style  => "default",
   :subdir => nil,
@@ -18,7 +20,9 @@ def check_subdir
   end
 end
 
-OptionParser.new do |opts|
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: sow [options] project_name"
+
   opts.separator "Standard options:"
 
   opts.on("-t", "--trunk", "Add project to subdir under 'trunk'.") do
@@ -39,25 +43,20 @@ OptionParser.new do |opts|
     puts opts
     exit
   end
-end.parse!
+end
+
+opts.parse!
 
 # TODO: fail if both dev and trunk
 
 include FileUtils::Verbose
 
-project = ARGV.shift
-
-abort "Project #{project} seems to exist" if test ?d, project
-
 # variables for erb:
-XIF                       = 'FI' + 'X' # prevents extra hits on my TAG reporter
-project, file_name, klass = Hoe.normalize_names project
-template_dir              = File.expand_path("~/.hoe_template")
-template_path             = File.join template_dir, option[:style]
-source_path               = File.join(File.dirname(File.dirname(__FILE__)),
-                                      "template")
+template_dir  = File.expand_path("~/.hoe_template")
+template_path = File.join template_dir, option[:style]
+source_path   = File.join(File.dirname(File.dirname(__FILE__)), "template")
+default_dir   = File.join template_dir, "default"
 
-default_dir = File.join template_dir, "default"
 if File.directory? template_dir and not File.directory? default_dir then
   warn "Detected old #{template_dir}"
   warn "Moving to #{default_dir}"
@@ -69,6 +68,7 @@ end
 
 unless File.directory? template_path then
   warn "Creating missing #{option[:style]} template."
+  FileUtils.mkdir_p File.dirname(template_path)
   FileUtils.cp_r source_path, template_path
   paths = (Dir["#{template_path}/**/*"] +
            Dir["#{template_path}/**/.*"]).select { |f| File.file? f }
@@ -76,6 +76,13 @@ unless File.directory? template_path then
   FileUtils.chmod 0755, paths.grep(/bin\//)
 end
 
+project = ARGV.shift
+
+abort opts.to_s unless project
+abort "Project #{project} seems to exist" if test ?d, project
+
+project, file_name, klass = Hoe.normalize_names project
+
 FileUtils.cp_r template_path, project
 
 Dir.chdir project do

data/lib/hoe.rb

@@ -58,7 +58,7 @@ require 'hoe/rake'
 
 class Hoe
   # duh
-  VERSION = '2.9.0'
+  VERSION = '2.9.1'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]

data/lib/hoe/package.rb

@@ -37,9 +37,9 @@ module Hoe::Package
   # Define tasks for plugin.
 
   def define_package_tasks
-    Gem::PackageTask.new spec do |pkg|
-      prerelease_version
+    prerelease_version
 
+    Gem::PackageTask.new spec do |pkg|
       pkg.need_tar = @need_tar
       pkg.need_zip = @need_zip
     end
@@ -54,8 +54,6 @@ module Hoe::Package
 
     # no doco, invisible hook
     task :prerelease do
-      prerelease_version
-
       abort "Fix your version before you release" if spec.version =~ /borked/
     end
 
@@ -68,6 +66,10 @@ module Hoe::Package
     desc "Sanity checks for release"
     task :release_sanity do
       v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
+
+      pre = ENV['PRERELEASE'] || ENV['PRE']
+      v += ".#{pre}" if pre
+
       abort "Versions don't match #{v} vs #{version}" if v != version
     end
   end

data/test/test_hoe.rb

@@ -22,7 +22,7 @@ class TestHoe < MiniTest::Unit::TestCase
       developer 'author', 'email'
     end
 
-    initializers = hoe.methods.grep(/^initialize/)
+    initializers = hoe.methods.grep(/^initialize/).map { |s| s.to_s }
 
     assert_includes initializers, 'initialize_clean'
     assert_includes initializers, 'initialize_flay'
@@ -53,7 +53,9 @@ class TestHoe < MiniTest::Unit::TestCase
         developer 'author', 'email'
       end
 
-      assert_includes spec.methods.grep(/^initialize/), 'initialize_hoerc'
+      methods = spec.methods.grep(/^initialize/).map { |s| s.to_s }
+
+      assert_includes methods, 'initialize_hoerc'
     end
   ensure
     Hoe.instance_variable_get(:@loaded).delete :hoerc

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 171
   prerelease: 
   segments: 
   - 2
   - 9
-  - 0
-  version: 2.9.0
+  - 1
+  - b
+  - 2
+  version: 2.9.1.b.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-01-31 00:00:00 -08:00
+date: 2011-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency