hoe 2.16.0 → 2.16.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.16.1 / 2012-03-13
+
+* 2 bug fixes:
+
+  * Fixed missing dependency for .gemtest creation (larskanis)
+  * Fixed the rdoc/rcov commands to use sh. Oops.
+
 === 2.16.0 / 2012-03-06
 
 * 9 minor enhancements:

data/Manifest.txt

@@ -35,4 +35,5 @@ template/test/test_file_name.rb.erb
 test/test_hoe.rb
 test/test_hoe_debug.rb
 test/test_hoe_gemcutter.rb
+test/test_hoe_publish.rb
 test/test_hoe_test.rb

data/lib/hoe.rb

@@ -74,7 +74,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.16.0'
+  VERSION = '2.16.1'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -823,5 +823,5 @@ class File
 end
 
 def Gem.bin_wrapper name # HACK
-  File.join Gem.dir, "bin", Gem.default_exec_format % name
+  File.join Gem.bindir, Gem.default_exec_format % name
 end unless Gem.respond_to? :bin_wrapper

data/lib/hoe/publish.rb

@@ -96,21 +96,19 @@ module Hoe::Publish
     self.rsync_args      ||= '-av --delete'
   end
 
-  def make_rdoc_cmd extra_args = nil
+  def make_rdoc_cmd(*extra_args)
     title = "#{name}-#{version} Documentation"
     title = "#{rubyforge_name}'s #{title}" if rubyforge_name != name
     rdoc  = Gem.bin_wrapper "rdoc"
 
-    cmd = %W[#{rdoc}
-             --title "#{title}"
-             -o "#{local_rdoc_dir}"
-            ] +
+    %W[#{rdoc}
+       --title #{title}
+       -o #{local_rdoc_dir}
+      ] +
       spec.rdoc_options +
-      Array(extra_args) +
+      extra_args +
       spec.require_paths +
       spec.extra_rdoc_files
-
-    cmd.join " "
   end
 
   ##
@@ -124,12 +122,12 @@ module Hoe::Publish
 
       desc "Generate rdoc"
       task :docs => [:clobber_docs, :isolate] do
-        ruby make_rdoc_cmd
+        sh(*make_rdoc_cmd)
       end
 
       desc "Generate rdoc coverage report"
       task :dcov => :isolate do
-        ruby make_rdoc_cmd '-C'
+        sh(*make_rdoc_cmd('-C'))
       end
 
       desc "Remove RDoc files"

data/lib/hoe/rcov.rb

@@ -18,7 +18,7 @@ module Hoe::RCov
       task :isolate # ensure it exists
 
       task :rcov => :isolate do
-        ruby make_rcov_cmd
+        sh(*make_rcov_cmd)
       end
 
       task :clobber_rcov do
@@ -42,7 +42,7 @@ module Hoe::RCov
     end
   end
 
-  def make_rcov_cmd extra_args = nil
+  def make_rcov_cmd
     rcov  = Gem.bin_wrapper "rcov"
     tests = test_globs.sort.map { |g| Dir.glob(g) }.flatten.map(&:inspect)
 
@@ -55,10 +55,10 @@ module Hoe::RCov
              -x tmp/isolate
              --sort coverage
              --sort-reverse
-             -o "coverage"
+             -o coverage
             ] + tests
 
-    cmd.join " "
+    cmd
   end
 end
 

data/lib/hoe/test.rb

@@ -126,7 +126,7 @@ module Hoe::Test
       pkg  = pkg_path
       turd = "#{pkg}/.gemtest"
 
-      file turd do
+      file turd => pkg_path do
         touch turd
       end
 

data/test/test_hoe.rb

@@ -17,7 +17,7 @@ class TestHoe < MiniTest::Unit::TestCase
     end
   end
 
-  def setup
+  def teardown
     Rake.application.clear
 
     Hoe.plugins.clear

data/test/test_hoe_publish.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'hoe'
+
+class TestHoePublish < MiniTest::Unit::TestCase
+  def setup
+    @hoe = Hoe.spec 'blah' do
+      self.version = '1.0'
+
+      developer 'author', ''
+    end
+  end
+
+  def test_make_rdoc_cmd
+    expected = %W[
+                #{Gem.bin_wrapper "rdoc"}
+                --title blah-1.0\ Documentation
+                -o doc
+                --main README.txt
+                lib
+                History.txt Manifest.txt README.txt
+               ]
+    assert_equal expected, @hoe.make_rdoc_cmd
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: 
   segments: 
   - 2
   - 16
-  - 0
-  version: 2.16.0
+  - 1
+  version: 2.16.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -142,6 +142,7 @@ files:
 - test/test_hoe.rb
 - test/test_hoe_debug.rb
 - test/test_hoe_gemcutter.rb
+- test/test_hoe_publish.rb
 - test/test_hoe_test.rb
 - .gemtest
 homepage: http://www.zenspider.com/projects/hoe.html
@@ -183,4 +184,5 @@ test_files:
 - test/test_hoe.rb
 - test/test_hoe_debug.rb
 - test/test_hoe_gemcutter.rb
+- test/test_hoe_publish.rb
 - test/test_hoe_test.rb