hoe 2.12.1 → 2.12.2

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.12.2 / 2011-08-24
+
+* 2 minor enhancements:
+
+  * Added recursive chmod to docs task to ensure group write-ability (kleb)
+  * Improve error message when no manifest found. (Apparently some linux packagers remove manifest files)
+
+* 3 bug fixes:
+
+  * Added missing minitest/autorun require (NOT reported by fedoraproject.org)
+  * Fix for RSpec support broken in 0dc6b2f (ged)
+  * Fix for the edgiest of edge cases (-Ku in ruby19... ummm, yeah)
+
 === 2.12.1 / 2011-08-22
 
 * 2 bug fixes:

data/Rakefile

@@ -37,7 +37,7 @@ end
 [:redocs, :docs].each do |t|
   task t do
     cp "Hoe.pdf", "doc"
-    sh "chmod u+w doc/Hoe.pdf"
+    sh "chmod ug+w doc/Hoe.pdf"
   end
 end
 

data/lib/hoe.rb

@@ -1,4 +1,4 @@
-# -*- ruby -*-
+# -*- mode: ruby; coding: us-ascii; -*-
 
 require 'rubygems'
 require 'rake'
@@ -68,7 +68,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.12.1'
+  VERSION = '2.12.2'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -422,6 +422,15 @@ class Hoe
     self.spec = Gem::Specification.new do |s|
       dirs = Dir['lib']
 
+      manifest = File.read_utf("Manifest.txt").split(/\r?\n\r?/) rescue nil
+
+      abort [
+             "Manifest is missing or couldn't be read.",
+             "The Manifest is kind of a big deal.",
+             "Maybe you're using a gem packaged by a linux project.",
+             "It seems like they enjoy breaking other people's code."
+             ].join "\n" unless manifest
+
       s.name                 = name
       s.version              = version if version
       s.summary              = summary
@@ -429,7 +438,7 @@ class Hoe
       s.homepage             = Array(url).first
       s.rubyforge_project    = rubyforge_name
       s.description          = description
-      s.files = files        = File.read_utf("Manifest.txt").split(/\r?\n\r?/)
+      s.files                = manifest
       s.executables          = s.files.grep(/^bin/) { |f| File.basename(f) }
       s.bindir               = "bin"
       s.require_paths        = dirs unless dirs.empty?
@@ -437,7 +446,7 @@ class Hoe
       s.post_install_message = post_install_message
       s.test_files           = Dir[*self.test_globs]
 
-      missing "Manifest.txt" if files.empty?
+      missing "Manifest.txt" if s.files.empty?
 
       case author
       when Array

data/lib/hoe/publish.rb

@@ -130,6 +130,7 @@ module Hoe::Publish
     task :docs do
       Dir.chdir local_rdoc_dir do
         cp "#{readme_file.gsub(/\./, '_')}.html", "index.html"
+        sh "chmod -R g+w ."
       end
     end
 

data/lib/hoe/test.rb

@@ -98,26 +98,7 @@ module Hoe::Test
     end
 
     if File.directory? "spec" then
-      if defined?(RSpec) then
-        require 'rspec/core/rake_task' # rspec 2
-
-        desc "Run all specifications"
-        RSpec::Core::RakeTask.new(:spec) do |t|
-          t.rspec_opts = self.rspec_options
-          t.rspec_opts << "-I#{self.rspec_dirs.join(":")}" unless
-            rspec_dirs.empty?
-        end
-      elsif defined?(Spec) then
-        require 'spec/rake/spectask'     # rspec 1
-
-        desc "Run all specifications"
-        Spec::Rake::SpecTask.new(:spec) do |t|
-          t.libs = self.rspec_dirs
-          t.spec_opts = self.rspec_options
-        end
-      else
-        found = true
-      end
+      found = try_loading_rspec2 || try_loading_rspec1
 
       if found then
         default_tasks << :spec
@@ -183,4 +164,41 @@ module Hoe::Test
 
     cmd
   end
+
+  ##
+  # Attempt to load RSpec 2, returning true if successful
+
+  def try_loading_rspec2
+    require 'rspec/core/rake_task'
+
+    desc "Run all specifications"
+    RSpec::Core::RakeTask.new(:spec) do |t|
+      t.rspec_opts = self.rspec_options
+      t.rspec_opts << "-I#{self.rspec_dirs.join(":")}" unless
+      rspec_dirs.empty?
+    end
+
+    true
+  rescue LoadError => err
+    warn "%p while trying to load RSpec 2: %s" % [ err.class, err.message ]
+    false
+  end
+
+  ##
+  # Attempt to load RSpec 1, returning true if successful
+
+  def try_loading_rspec1
+    require 'spec/rake/spectask'
+
+    desc "Run all specifications"
+    Spec::Rake::SpecTask.new(:spec) do |t|
+      t.libs = self.rspec_dirs
+      t.spec_opts = self.rspec_options
+    end
+    true
+  rescue LoadError => err
+    warn "%p while trying to load RSpec 1: %s" % [ err.class, err.message ]
+    false
+  end
+
 end

data/test/test_hoe_gemcutter.rb

@@ -1,5 +1,6 @@
 require "hoe"
 require "hoe/gemcutter" unless defined? Hoe::Gemcutter
+require "minitest/autorun"
 
 class TestHoeGemcutter < MiniTest::Unit::TestCase
   include Hoe::Gemcutter

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 2
   - 12
-  - 1
-  version: 2.12.1
+  - 2
+  version: 2.12.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 2
-        - 4
-        version: "2.4"
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id002
 description: |-
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.8
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles