hoe 2.13.1 → 2.14.0

data.tar.gz.sig

@@ -1 +1,4 @@
-!>����q�0Q<Ʈ�>I�D��B����K21A'�p�)
+
+:��~��n=����߽�;�֊��L�)Y���X�
+4\�@��x��<I=�'>�ڞ(�^�[�h%�ʧ޵slL�Q�����P��=�^�
+���rWR�E�2��+�y&D�՜U���8d��X�մ�
��|�*�;PS�G�I�:�k���!�{�k��S�fu;e���k�8�ES'��R7���k��$0�O��;�G)\�Z�u�lkښ�*��wlʲV%ϡ����E�C���J����`

data/History.txt

@@ -1,3 +1,23 @@
+=== 2.14.0 / 2012-02-20
+
+* 9 minor enhancements:
+
+  * .rdoc files are now automatically added to the extra_rdoc_files list.
+  * Added Hoe#read_manifest
+  * Added check_manifest to the prerelease task to prevent broken releases.
+  * Added extra duplicate dependency checking.
+  * Hoe#with_config merges the local and home configuration atop Hoe::DEFAULT_CONFIG to allow plugins to supply new defaults.
+  * The readme_file and history_file are now automatically guessed from the manifest.  This allows "README.rdoc" to be used automatically.
+  * install_gem optionally excludes rdoc/ri generation.
+  * rake check_extra_deps excludes rdoc/ri generation. rake install_gem does not.
+  * rake multi now just reinvokes rake using multiruby to allow hoe plugins to be invoked.
+
+* 3 bug fixes:
+
+  * Added workaround for check_extra_deps for multi-version dependencies.
+  * The publish plugin no longer raises an exception for missing or ancient versions of rdoc.
+  * rdoc plugin calls isolate if using isolate
+
 === 2.13.1 / 2012-02-06
 
 * 1 minor enhancement:

data/Rakefile

@@ -4,6 +4,7 @@ $:.unshift 'lib'
 require './lib/hoe.rb'
 
 Hoe.plugin :seattlerb
+Hoe.plugin :isolate
 
 Hoe.spec "hoe" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
@@ -14,6 +15,8 @@ Hoe.spec "hoe" do
 
   pluggable!
   require_rubygems_version '>= 1.4'
+
+  dependency "rake", "~> 0.8" # FIX: to force it to exist pre-isolate
 end
 
 task :plugins do

data/lib/hoe.rb

@@ -68,7 +68,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.13.1'
+  VERSION = '2.14.0'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -396,14 +396,19 @@ class Hoe
       dependency "hoe", "~> #{version}", :development
     end
 
-    runtime = extra_deps.map(&:first)
-    extra_dev_deps.reject! { |(name, _)| runtime.include? name }
+    seen = {}
 
     extra_deps.each do |dep|
+      next if seen[dep.first]
+      seen[dep.first] = true
+
       spec.add_dependency(*dep)
     end
 
     extra_dev_deps.each do |dep|
+      next if seen[dep.first]
+      seen[dep.first] = true
+
       spec.add_development_dependency(*dep)
     end
   end
@@ -422,7 +427,7 @@ class Hoe
     self.spec = Gem::Specification.new do |s|
       dirs = Dir['lib']
 
-      manifest = File.read_utf("Manifest.txt").split(/\r?\n\r?/) rescue nil
+      manifest = read_manifest
 
       abort [
              "Manifest is missing or couldn't be read.",
@@ -455,7 +460,7 @@ class Hoe
         s.author  = author
       end
 
-      s.extra_rdoc_files += s.files.grep(/txt$/)
+      s.extra_rdoc_files += s.files.grep(/(txt|rdoc)$/)
       s.extra_rdoc_files.reject! { |f| f =~ %r%^(test|spec|vendor|template|data|tmp)/% }
       s.extra_rdoc_files += @extra_rdoc_files
     end
@@ -516,9 +521,7 @@ class Hoe
     self.extra_deps           = []
     self.extra_dev_deps       = []
     self.extra_rdoc_files     = []
-    self.history_file         = "History.txt"
     self.post_install_message = nil
-    self.readme_file          = "README.txt"
     self.rubyforge_name       = name.downcase
     self.spec                 = nil
     self.spec_extras          = {}
@@ -527,6 +530,14 @@ class Hoe
     self.test_globs           = ['test/**/test_*.rb']
     self.url                  = nil
 
+    if manifest = read_manifest then
+      self.readme_file  = manifest.grep(/^README\./).first
+      self.history_file = manifest.grep(/^History\./).first
+    end
+
+    self.history_file ||= "History.txt"
+    self.readme_file  ||= "README.txt"
+
     if block_given? then
       warn "Hoe.new {...} deprecated. Switch to Hoe.spec."
       Hoe.load_plugins
@@ -699,6 +710,15 @@ class Hoe
     add_dependencies
   end
 
+  ##
+  # Reads Manifest.txt and returns an Array of lines in the manifest.
+  #
+  # Returns nil if no manifest was found.
+
+  def read_manifest
+    File.read_utf("Manifest.txt").split(/\r?\n\r?/) rescue nil
+  end
+
   ##
   # Declare that your gem requires a specific rubygems version. Last one wins.
 
@@ -741,14 +761,21 @@ class Hoe
   # any) and yields the configuration and its path
 
   def with_config
+    config = Hoe::DEFAULT_CONFIG
+
     rc = File.expand_path("~/.hoerc")
     exists = File.exist? rc
-    config = exists ? YAML.load_file(rc) : {}
+    homeconfig = exists ? YAML.load_file(rc) : {}
+
+    config = config.merge homeconfig
+
     localrc = File.join Dir.pwd, '.hoerc'
     exists = File.exist? localrc
     localconfig = exists ? YAML.load_file(localrc) : {}
 
-    yield(config.merge(localconfig), rc)
+    config = config.merge localconfig
+
+    yield config, rc
   end
 end
 

data/lib/hoe/deps.rb

@@ -113,7 +113,9 @@ module Hoe::Deps
         begin
           gem(*dep)
         rescue Gem::LoadError
-          install_gem(*dep)
+          name, req, = dep
+
+          install_gem name, req, false
         end
       end
     end

data/lib/hoe/package.rb

@@ -12,6 +12,8 @@ end
 # === Tasks Provided:
 #
 # install_gem::        Install the package as a gem.
+# prerelease::         Hook for pre-release actions like sanity checks.
+# postrelease::        Hook for post-release actions like release announcements.
 # release::            Package and upload the release.
 
 module Hoe::Package
@@ -53,7 +55,7 @@ module Hoe::Package
     task :release => [:prerelease, :release_to, :postrelease]
 
     # no doco, invisible hook
-    task :prerelease do
+    task :prerelease => [:check_manifest] do
       abort "Fix your version before you release" if spec.version =~ /borked/
     end
 
@@ -85,14 +87,18 @@ module Hoe::Package
   ##
   # Install the named gem.
 
-  def install_gem name, version = nil
+  def install_gem name, version = nil, rdoc=true
     should_not_sudo = Hoe::WINDOZE || ENV["NOSUDO"] || File.writable?(Gem.dir)
 
     gem_cmd = Gem.default_exec_format % 'gem'
     sudo    = 'sudo '                  unless should_not_sudo
     local   = '--local'                unless version
     version = "--version '#{version}'" if     version
-    sh "#{sudo}#{gem_cmd} install #{local} #{name} #{version}"
+
+    cmd  = "#{sudo}#{gem_cmd} install #{local} #{name} #{version}"
+    cmd += " --no-rdoc --no-ri" unless rdoc
+
+    sh cmd
   end
 
   def prerelease_version # :nodoc:

data/lib/hoe/publish.rb

@@ -89,11 +89,15 @@ module Hoe::Publish
     if need_rdoc then
       dependency "rdoc", "~> 3.10", :developer
 
+      Rake.application[:isolate].invoke if plugin? :isolate
+
       unless defined? RDoc::Task then
         begin
           gem 'rdoc'
         rescue Gem::LoadError
-          p $!
+          warn $!
+          warn ""
+          warn "please run: rake check_extra_deps"
         end unless Object.const_defined? :RDoc
 
         begin
@@ -103,6 +107,8 @@ module Hoe::Publish
         end
       end
 
+      return unless Object.const_defined? :RDoc
+
       RDoc::Task.new(:docs) do |rd|
         rd.main = readme_file
         rd.options << '-d' if (`which dot` =~ /\/dot/) unless

data/lib/hoe/test.rb

@@ -77,7 +77,7 @@ module Hoe::Test
 
       desc 'Run the test suite using multiruby.'
       task :multi do
-        ruby make_test_cmd(:multi)
+        system "multiruby -S rake"
       end
 
       desc 'Show which test files fail when run alone.'
@@ -143,7 +143,7 @@ module Hoe::Test
   ##
   # Generate the test command-line.
 
-  def make_test_cmd multi = false # :nodoc:
+  def make_test_cmd
     unless SUPPORTED_TEST_FRAMEWORKS.has_key?(testlib)
       raise "unsupported test framework #{testlib}"
     end
@@ -158,15 +158,7 @@ module Hoe::Test
 
     tests.insert 1, test_prelude if test_prelude
 
-    cmd = "#{Hoe::RUBY_FLAGS} -e '#{tests.join("; ")}' -- #{FILTER}"
-
-    if multi then
-      multiruby_skip << "mri_trunk" if multiruby_skip.include? "1.9"
-      ENV['EXCLUDED_VERSIONS'] = multiruby_skip.join ":"
-      cmd = "-S multiruby #{cmd}"
-    end
-
-    cmd
+    "#{Hoe::RUBY_FLAGS} -e '#{tests.join("; ")}' -- #{FILTER}"
   end
 
   ##

data/test/test_hoe.rb

@@ -141,6 +141,54 @@ class TestHoe < MiniTest::Unit::TestCase
     ENV['HOME'] = home
   end
 
+  def test_initialize_intuit
+    Dir.mktmpdir do |path|
+      Dir.chdir path do
+        open 'Manifest.txt', 'w' do |io| # sorted
+          io.puts 'FAQ.rdoc'
+          io.puts 'History.rdoc'
+          io.puts 'README.rdoc'
+        end
+
+        open 'README.rdoc',  'w' do |io| io.puts '= blah' end
+        open 'History.rdoc', 'w' do |io| io.puts '=== 1.0' end
+
+        hoe = Hoe.spec 'blah' do
+          self.version = '1.0'
+          developer 'nobody', 'nobody@example'
+        end
+
+        assert_equal 'History.rdoc', hoe.history_file
+        assert_equal 'README.rdoc', hoe.readme_file
+        assert_equal %w[FAQ.rdoc History.rdoc README.rdoc],
+                     hoe.spec.extra_rdoc_files
+      end
+    end
+  end
+
+  def test_initialize_intuit_ambiguous
+    Dir.mktmpdir do |path|
+      Dir.chdir path do
+        open 'Manifest.txt', 'w' do |io|
+          io.puts 'History.rdoc' # sorted
+          io.puts 'README.ja.rdoc'
+          io.puts 'README.rdoc'
+        end
+
+        open 'README.rdoc',    'w' do |io| io.puts '= blah' end
+        open 'README.ja.rdoc', 'w' do |io| io.puts '= blah' end
+        open 'History.rdoc',   'w' do |io| io.puts '=== 1.0' end
+
+        hoe = Hoe.spec 'blah' do
+          self.version = '1.0'
+          developer 'nobody', 'nobody@example'
+        end
+
+        assert_equal 'README.ja.rdoc', hoe.readme_file
+      end
+    end
+  end
+
   def test_file_read_utf
     Tempfile.open 'BOM' do |io|
       io.write "\xEF\xBB\xBFBOM"
@@ -257,6 +305,16 @@ class TestHoe < MiniTest::Unit::TestCase
     Hoe.plugins.replace before
   end
 
+  def test_read_manifest
+    hoe = Hoe.spec 'blah'  do
+      developer 'author', 'email'
+    end
+
+    expected = File.read_utf('Manifest.txt').split
+
+    assert_equal expected, hoe.read_manifest
+  end
+
   def test_rename
     # project, file_name, klass = Hoe.normalize_names 'project_name'
 
@@ -284,4 +342,49 @@ class TestHoe < MiniTest::Unit::TestCase
   ensure
     ENV.delete "NOSUDO"
   end
+
+  def test_with_config_default
+    home = ENV['HOME']
+    Hoe.files = nil
+
+    Dir.mktmpdir do |path|
+      ENV['HOME'] = path
+
+      hoeconfig = hoe.with_config {|config, _| config }
+
+      assert_equal Hoe::DEFAULT_CONFIG, hoeconfig
+    end
+  ensure
+    ENV['HOME'] = home
+  end
+
+  def test_with_config_overrides
+    overrides = {
+      'exclude' => Regexp.union( Hoe::DEFAULT_CONFIG["exclude"], /\.hg/ ),
+      'plugins' => ['tweedledee', 'tweedledum']
+    }
+    overrides_rcfile = File.join(Dir.pwd, '.hoerc')
+
+    home = ENV['HOME']
+    Hoe.files = nil
+
+    Dir.mktmpdir do |path|
+      ENV['HOME'] = path
+
+      open File.join(path, '.hoerc'), 'w' do |io|
+        io.write YAML.dump( Hoe::DEFAULT_CONFIG )
+      end
+      open overrides_rcfile, File::CREAT|File::EXCL|File::WRONLY do |io|
+        io.write YAML.dump( overrides )
+      end
+
+      hoeconfig = hoe.with_config {|config, _| config }
+
+      assert_equal Hoe::DEFAULT_CONFIG.merge(overrides), hoeconfig
+    end
+  ensure
+    File.delete overrides_rcfile if File.exist?( overrides_rcfile )
+    ENV['HOME'] = home
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 2
-  - 13
-  - 1
-  version: 2.13.1
+  - 14
+  - 0
+  version: 2.14.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-02-06 00:00:00 Z
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake