hoe 2.0.0 → 2.1.0

data/History.txt

@@ -1,3 +1,17 @@
+=== 2.1.0 / 2009-06-14
+
+* 6 minor enhancements:
+
+  * Added File::read_utf to strip out UTF BOM marker. Fixes nokogiri. (tenderlove)
+  * Now using the minitest plugin.
+  * Refactored :release task to facilitate other plugins.
+  * Version intuiting now only bombs on packaging, allowing check_manifest.
+  * release now has prerelease, postrelease deps.
+
+* 1 bug fix:
+
+  * Fixed version intuiting to allow for beta versions (eg, 1.2.3.beta.4)
+
 === 2.0.0 / 2009-06-02
 
 * 3 major enhancements:

data/Rakefile

@@ -1,20 +1,14 @@
 # -*- ruby -*-
 
-$: << 'lib'
-
 require './lib/hoe.rb'
 
-# TODO:
-# Hoe.plugin :perforce
-# Hoe.plugin :minitest
-
-Hoe.add_include_dirs("../../minitest/dev/lib")
+Hoe.plugin :perforce
+Hoe.plugin :minitest
 
 Hoe.spec "hoe" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
 
   self.rubyforge_name = "seattlerb"
-  self.testlib        = :minitest
 
   blog_categories << "Seattle.rb" << "Ruby"
 

data/lib/hoe.rb

@@ -69,7 +69,7 @@ end
 
 class Hoe
   # duh
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 
   ##
   # Used to add extra flags to RUBY_FLAGS.
@@ -219,6 +219,7 @@ class Hoe
     loaded = {}
 
     Gem.find_files("hoe/*.rb").each do |plugin|
+      warn plugin if $DEBUG
       name = File.basename plugin
       next if loaded[name]
       begin
@@ -316,7 +317,7 @@ class Hoe
       s.homepage             = Array(url).first
       s.rubyforge_project    = rubyforge_name
       s.description          = description
-      s.files                = File.read("Manifest.txt").split(/\r?\n\r?/)
+      s.files                = File.read_utf("Manifest.txt").split(/\r?\n\r?/)
       s.executables          = s.files.grep(/^bin/) { |f| File.basename(f) }
       s.bindir               = "bin"
       s.require_paths        = dirs unless dirs.empty?
@@ -360,14 +361,17 @@ class Hoe
 
       spec.files.each do |file|
         next unless File.exist? file
-        version = File.read(file)[/VERSION = ([\"\'])([\d\.]+)\1/, 2]
+        version = File.read(file)[/VERSION = ([\"\'])([\d][\d\w\.]+)\1/, 2]
         break if version
       end
 
-      spec.version = self.version = version
-    end
+      spec.version = self.version = version if version
 
-    raise "Need version" unless self.version
+      unless self.version then
+        spec.version = self.version = "0.borked"
+        warn "Add 'VERSION = \"x.y.z\"' to your code or fix your hoe spec"
+      end
+    end
   end
 
   ##
@@ -418,7 +422,7 @@ class Hoe
   # Intuit values from the readme and history files.
 
   def intuit_values
-    readme = File.read(readme_file).split(/^(=+ .*)$/)[1..-1] rescue ''
+    readme = File.read_utf(readme_file).split(/^(=+ .*)$/)[1..-1] rescue ''
     unless readme.empty? then
       sections = readme.map { |s|
         s =~ /^=/ ? s.strip.downcase.chomp(':').split.last : s.strip
@@ -435,7 +439,7 @@ class Hoe
     end
 
     self.changes ||= begin
-                       h = File.read(history_file)
+                       h = File.read_utf(history_file)
                        h.split(/^(===.*)/)[1..2].join.strip
                      rescue
                        missing history_file
@@ -448,6 +452,7 @@ class Hoe
 
   def load_plugin_tasks
     self.class.plugins.each do |plugin|
+      warn plugin if $DEBUG
       send "define_#{plugin}_tasks"
     end
   end
@@ -474,7 +479,7 @@ class Hoe
   #   summary, *description = p.paragraphs_of('README.txt', 3, 3..8)
 
   def paragraphs_of path, *paragraphs
-    File.read(path).delete("\r").split(/\n\n+/).values_at(*paragraphs)
+    File.read_utf(path).delete("\r").split(/\n\n+/).values_at(*paragraphs)
   end
 
   ##
@@ -530,3 +535,10 @@ class Hoe
 
   Hoe.load_plugins
 end
+
+class File
+  # Like File::read, but strips out a BOM marker if it exists.
+  def self.read_utf path
+    File.read(path).sub(/\A\xEF\xBB\xBF/, '')
+  end
+end

data/lib/hoe/package.rb

@@ -32,6 +32,8 @@ module Hoe::Package
 
   def define_package_tasks
     Rake::GemPackageTask.new spec do |pkg|
+      abort "Fix your version before you release" if
+        spec.version.version =~ /borked/
       pkg.need_tar = @need_tar
       pkg.need_zip = @need_zip
     end
@@ -41,26 +43,36 @@ module Hoe::Package
       install_gem Dir['pkg/*.gem'].first
     end
 
-    desc 'Package and upload the release to rubyforge.'
-    task :release => [:clean, :package] do |t|
+    desc 'Package and upload the release.'
+    task :release => [:prerelease, :release_to, :postrelease]
+
+    # no doco, invisible hook
+    task :prerelease
+
+    # no doco, invisible hook
+    task :release_to => :release_to_rubyforge
+
+    # no doco, invisible hook
+    task :postrelease
+
+    desc "Sanity checks for release"
+    task :release_sanity do
       v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
       abort "Versions don't match #{v} vs #{version}" if v != version
-      pkg = "pkg/#{name}-#{version}"
-
-      if $DEBUG then
-        puts "release_id = rf.add_release #{rubyforge_name.inspect}, #{name.inspect}, #{version.inspect}, \"#{pkg}.tgz\""
-        puts "rf.add_file #{rubyforge_name.inspect}, #{name.inspect}, release_id, \"#{pkg}.gem\""
-      end
+    end
 
+    desc 'Release to rubyforge.'
+    task :release_to_rubyforge => [:clean, :package, :release_sanity] do
       rf = RubyForge.new.configure
       puts "Logging in"
       rf.login
 
       c = rf.userconfig
-      c["release_notes"] = description if description
-      c["release_changes"] = changes if changes
-      c["preformatted"] = true
+      c["release_notes"]   = description if description
+      c["release_changes"] = changes     if changes
+      c["preformatted"]    = true
 
+      pkg   = "pkg/#{name}-#{version}"
       files = [(@need_tar ? "#{pkg}.tgz" : nil),
                (@need_zip ? "#{pkg}.zip" : nil),
                "#{pkg}.gem"].compact

data/test/test_hoe.rb

@@ -41,6 +41,8 @@ class TestHoe < MiniTest::Unit::TestCase
                   publish_docs
                   rcov
                   release
+                  release_sanity
+                  release_to_rubyforge
                   ridocs
                   test
                   test_deps)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.4
+        version: 0.8.7
     version: 
 description: |-
   Hoe is a rake/rubygems helper for project Rakefiles. It helps generate