hoe 2.12.3 → 2.12.4

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.12.4 / 2011-11-28
+
+* 3 bug fixes:
+
+  * Fixed Hoe.read_utf to work on both 1.8 and 1.9. Unicode files FTW! (tenderlove)
+  * Moved the rdoc dependency to the publish plugin from hoe-seattlerb.
+  * Only load rdoc once to fix test loading bugs.
+
 === 2.12.3 / 2011-09-06
 
 * 1 bug fix:

data/lib/hoe/compiler.rb

@@ -6,6 +6,8 @@
 # standard extconf setup, namely that your extconf.rb and c source is
 # located in: ext/project-name.
 #
+# Look at nokogiri for a good example of how to use this.
+#
 # === Tasks Provided:
 #
 # compile::     Compile your c-extension.

data/lib/hoe/publish.rb

@@ -85,16 +85,20 @@ module Hoe::Publish
 
   def define_publish_tasks
     if need_rdoc then
-      begin
-        gem 'rdoc'
-      rescue Gem::LoadError
-        p $!
-      end
-
-      begin
-        require 'rdoc/task'
-      rescue LoadError
-        require 'rake/rdoctask'
+      dependency "rdoc", "~> 3.10", :developer
+
+      unless defined? RDoc::Task then
+        begin
+          gem 'rdoc'
+        rescue Gem::LoadError
+          p $!
+        end unless Object.const_defined? :RDoc
+
+        begin
+          require 'rdoc/task'
+        rescue LoadError
+          require 'rake/rdoctask'
+        end
       end
 
       RDoc::Task.new(:docs) do |rd|
@@ -126,12 +130,11 @@ module Hoe::Publish
       task :ridocs => :clean do
         sh %q{ rdoc --ri -o ri . }
       end
-    end
 
-    task :docs do
-      Dir.chdir local_rdoc_dir do
-        cp "#{readme_file.gsub(/\./, '_')}.html", "index.html"
-        sh "chmod -R g+w ."
+      task :docs do
+        Dir.chdir local_rdoc_dir do
+          sh "chmod -R g+w ."
+        end
       end
     end
 

data/lib/hoe/test.rb

@@ -117,7 +117,11 @@ module Hoe::Test
       # more information, see: <https://github.com/erikh/rubygems-test>
       # and/or <http://www.gem-testers.org/>
 
-      self.spec.files += [".gemtest"]
+      gemtest = ".gemtest"
+
+      gemtest.encode!(Encoding::UTF_8) if gemtest.respond_to?(:encoding)
+
+      self.spec.files += [gemtest]
 
       pkg  = pkg_path
       turd = "#{pkg}/.gemtest"

data/lib/hoe.rb

@@ -68,7 +68,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.12.3'
+  VERSION = '2.12.4'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -97,7 +97,7 @@ class Hoe
   ##
   # True if you're a masochistic developer. Used for building commands.
 
-  WINDOZE = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ unless defined? WINDOZE
+  WINDOZE = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
 
   ##
   # *MANDATORY*: The author(s) of the package. (can be array)
@@ -474,7 +474,7 @@ class Hoe
 
       spec.files.each do |file|
         next unless File.exist? file
-        version = File.read_utf(file)[version_re, 2]
+        version = File.read_utf(file)[version_re, 2] rescue nil
         break if version
       end
 
@@ -759,8 +759,15 @@ end
 class File
   # Like File::read, but strips out a BOM marker if it exists.
   def self.read_utf path
-    open path, 'rb' do |f|
-      f.read.sub %r/\A\xEF\xBB\xBF/, ''
+    r19 = "<3".respond_to? :encoding
+    opt = r19 ? "r:bom|utf-8" : "rb"
+
+    open path, opt do |f|
+      if r19 then
+        f.read
+      else
+        f.read.sub %r/\A\xEF\xBB\xBF/, ''
+      end
     end
   end
 end

data/test/test_hoe.rb

@@ -104,7 +104,13 @@ class TestHoe < MiniTest::Unit::TestCase
     Tempfile.open 'BOM' do |io|
       io.write "\xEF\xBB\xBFBOM"
       io.rewind
-      assert_equal 'BOM', File.read_utf(io.path)
+
+      content = File.read_utf io.path
+      assert_equal 'BOM', content
+
+      if content.respond_to? :encoding then
+        assert_equal Encoding::UTF_8, content.encoding
+      end
     end
   end
 
@@ -185,7 +191,10 @@ class TestHoe < MiniTest::Unit::TestCase
 
     deps = spec.dependencies.sort_by { |dep| dep.name }
 
-    expected = [["hoe", :development, "~> #{Hoe::VERSION.sub(/\.\d+$/, '')}"]]
+    expected = [
+      ["hoe",  :development, "~> #{Hoe::VERSION.sub(/\.\d+$/, '')}"],
+      ["rdoc", :development, "~> 3.10"],
+    ]
 
     expected << ["rubyforge", :development, ">= #{::RubyForge::VERSION}"] if
       defined? ::RubyForge

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 2
   - 12
-  - 3
-  version: 2.12.3
+  - 4
+  version: 2.12.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-09-06 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -54,20 +54,50 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 21
         segments: 
-        - 2
-        - 5
-        version: "2.5"
+        - 3
+        - 9
+        version: "3.9"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 8
+        version: "2.8"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id004
 description: |-
   Hoe is a rake/rubygems helper for project Rakefiles. It helps you
   manage and maintain, and release your project and includes a dynamic