lib/hoe.rb in hoe-1.0.1 vs lib/hoe.rb in hoe-1.0.2

- old
+ new

@@ -7,11 +7,11 @@ require 'rake/rdoctask' require 'rake/testtask' require 'rbconfig' class Hoe - VERSION = '1.0.1' + VERSION = '1.0.2' rubyprefix = Config::CONFIG['prefix'] sitelibdir = Config::CONFIG['sitelibdir'] PREFIX = ENV['PREFIX'] || rubyprefix @@ -81,11 +81,11 @@ s.files = File.read("Manifest.txt").split s.executables = s.files.grep(/bin/) { |f| File.basename(f) } s.bindir = "bin" - s.require_paths = ['lib', 'test'] + s.require_paths = Dir['{lib,test}'] s.has_rdoc = true s.test_suite_file = "test/test_all.rb" if test ?f, "test/test_all.rb" puts s.to_ruby if $DEBUG end @@ -123,22 +123,29 @@ desc 'Deploy the package to rubyforge.' task :deploy => [:clean, :package] do |t| v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z" abort "Versions don't match #{v} vs #{version}" if v != version - puts "Releasing #{name} v. #{version}" require 'rubyforge' 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 rf = RubyForge.new + puts "Logging in" rf.login + puts "Releasing #{name} v. #{version} tarball" release_id = rf.add_release rubyforge_name, name, version, "#{pkg}.tgz" - rf.add_file rubyforge_name, name, release_id, "#{pkg}.gem" + if release_id then + puts " release_id = #{release_id.inspect}" + puts "Releasing #{name} v. #{version} gem" + rf.add_file rubyforge_name, name, release_id, "#{pkg}.gem" + else + abort "Couldn't get release_id" + end end ############################################################ # Doco