hoe 2.9.1 → 2.9.2

data/History.txt

@@ -1,3 +1,21 @@
+=== 2.9.2 / 2011-03-31
+
+* 7 minor enhancements:
+
+  * Added :none as a testlib option to let you do whatever you want. (phiggins)
+  * Added Hoe#dependency(name, version, type = :runtime) for cleaner hoe specs.
+  * Added NOSUDO option to `rake gem_install`. (nihildeb)
+  * Include Rake::DSL to support future versions of rake
+  * Multiruby now skips mri_trunk if multiruby_skip includes 1.9
+  * Test#make_test_cmd now sorts test files (mostly for testing)
+  * Try using psych before syck.
+
+* 3 bug fixes:
+
+  * Clean generated extension library too
+  * Fixed a bug with sow -d or -t
+  * Fixed plugin activation via ~/.hoerc. (ged)
+
 === 2.9.1 / 2011-02-05
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -34,3 +34,4 @@ template/lib/file_name.rb.erb
 template/test/test_file_name.rb.erb
 test/test_hoe.rb
 test/test_hoe_gemcutter.rb
+test/test_hoe_test.rb

data/README.txt

@@ -175,7 +175,7 @@ Again, this must be done before the Hoe spec, or it won't be useful.
 * hoe-gemcutter - Adds gemcutter release automation to Hoe.
 * hoe-gemspec   - Generate a prerelease gemspec based on a Hoe spec.
 * hoe-git       - A set of Hoe plugins for tighter Git integration.
-* hoe-hg        - A Hoe plugin for Mercurial integration.
+* hoe-mercurial - A Hoe plugin for Mercurial integration.
 * hoe-rubygems  - A Hoe plugin with additional RubyGems tasks.
 * hoe-seattlerb - Minitest, email announcements, release branching.
 * hoe-yard      - A Hoe plugin for generating YARD documentation.

data/bin/sow

@@ -13,7 +13,7 @@ option = {
   :subdir => nil,
 }
 
-def check_subdir
+def check_subdir option
   if option[:subdir] then
     warn "ERROR: you can't specify multiple subdirs"
     abort opts.to_s
@@ -26,12 +26,12 @@ opts = OptionParser.new do |opts|
   opts.separator "Standard options:"
 
   opts.on("-t", "--trunk", "Add project to subdir under 'trunk'.") do
-    check_subdir
+    check_subdir option
     option[:subdir] = "trunk"
   end
 
   opts.on("-d", "--dev", "Add project to subdir under 'dev'.") do
-    check_subdir
+    check_subdir option
     option[:subdir] = "dev"
   end
 
@@ -47,8 +47,6 @@ end
 
 opts.parse!
 
-# TODO: fail if both dev and trunk
-
 include FileUtils::Verbose
 
 # variables for erb:
@@ -108,11 +106,11 @@ Dir.chdir project do
   end
 end
 
-if option[:dev] || option[:trunk] then
+if option[:subdir] then
   temp_dir = "#{project}.#{$$}"
   FileUtils.mv project, temp_dir
   FileUtils.mkdir project
-  FileUtils.mv temp_dir, "#{project}/#{option[:dev] ? 'dev' : 'trunk'}"
+  FileUtils.mv temp_dir, "#{project}/#{option[:subdir]}"
 end
 
 puts

data/lib/hoe.rb

@@ -3,6 +3,12 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
+
+begin
+  require 'psych'
+rescue LoadError
+  # do nothing
+end
 require 'yaml'
 
 require 'hoe/rake'
@@ -57,8 +63,11 @@ require 'hoe/rake'
 #   end
 
 class Hoe
+
+  include Rake::DSL if defined?(Rake::DSL)
+
   # duh
-  VERSION = '2.9.1'
+  VERSION = '2.9.2'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -231,8 +240,9 @@ class Hoe
   def self.load_plugins plugins = Hoe.plugins
     @found  ||= {}
     @loaded ||= {}
+    @files  ||= Gem.find_files "hoe/*.rb"
 
-    Gem.find_files("hoe/*.rb").reverse.each do |path|
+    @files.reverse.each do |path|
       @found[File.basename(path, ".rb").intern] = path
     end
 
@@ -306,21 +316,19 @@ class Hoe
   # Activate plugin modules and add them to the current instance.
 
   def activate_plugins
-    plugins = Hoe.plugins
-
     with_config do |config, _|
       config_plugins = config['plugins']
       break unless config_plugins
-      plugins += config_plugins.map { |plugin| plugin.intern }
+      Hoe.plugins.concat config_plugins.map { |plugin| plugin.intern }
     end
 
-    Hoe.load_plugins plugins
+    Hoe.load_plugins Hoe.plugins
 
     names = Hoe.constants.map { |s| s.to_s }
     names.reject! { |n| n =~ /^[A-Z_]+$/ }
 
     names.each do |name|
-      next unless plugins.include? name.downcase.intern
+      next unless Hoe.plugins.include? name.downcase.intern
       warn "extend #{name}" if $DEBUG
       self.extend Hoe.const_get(name)
     end
@@ -332,6 +340,22 @@ class Hoe
     end
   end
 
+  ##
+  # Add a dependency declaration to your spec. Pass :dev to
+  # +type+ for developer dependencies.
+
+  def dependency name, version, type = :runtime
+    ary = case type
+          when :runtime then
+            extra_deps
+          when :dev, :development, :developer then
+            extra_dev_deps
+          else
+            raise "Unknown dependency type: #{type}"
+          end
+    ary << [name, version]
+  end
+
   ##
   # Add standard and user defined dependencies to the spec.
 

data/lib/hoe/compiler.rb

@@ -24,6 +24,8 @@ module Hoe::Compiler
     self.compile_tasks = [:multi, :test]
     self.spec_extras   = { :extensions => ["ext/#{self.name}/extconf.rb"] }
 
+    clean_globs << "lib/#{self.name}/*.{so,bundle,dll}"
+
     extra_dev_deps << ["rake-compiler", "~> 0.7"]
   end
 

data/lib/hoe/flay.rb

@@ -23,7 +23,6 @@ module Hoe::Flay
 
   def define_flay_tasks
     begin
-      require 'flay'
       require 'flay_task'
       FlayTask.new :flay, self.flay_threshold
     rescue Exception

data/lib/hoe/flog.rb

@@ -23,7 +23,6 @@ module Hoe::Flog
 
   def define_flog_tasks
     begin
-      require 'flog'
       require 'flog_task'
       FlogTask.new :flog, self.flog_threshold
     rescue Exception

data/lib/hoe/package.rb

@@ -44,7 +44,7 @@ module Hoe::Package
       pkg.need_zip = @need_zip
     end
 
-    desc 'Install the package as a gem.'
+    desc 'Install the package as a gem. (opt. NOSUDO=1)'
     task :install_gem => [:clean, :package, :check_extra_deps] do
       install_gem Dir['pkg/*.gem'].first
     end
@@ -87,7 +87,7 @@ module Hoe::Package
 
   def install_gem name, version = nil
     gem_cmd = Gem.default_exec_format % 'gem'
-    sudo    = 'sudo '                  unless Hoe::WINDOZE
+    sudo    = 'sudo '                  unless Hoe::WINDOZE || ENV["NOSUDO"]
     local   = '--local'                unless version
     version = "--version '#{version}'" if     version
     sh "#{sudo}#{gem_cmd} install #{local} #{name} #{version}"

data/lib/hoe/test.rb

@@ -16,6 +16,7 @@ module Hoe::Test
   SUPPORTED_TEST_FRAMEWORKS = {
     :testunit => "test/unit",
     :minitest => "minitest/autorun",
+    :none     => nil,
   }
 
   ##
@@ -159,11 +160,16 @@ module Hoe::Test
   # Generate the test command-line.
 
   def make_test_cmd multi = false # :nodoc:
+    unless SUPPORTED_TEST_FRAMEWORKS.has_key?(testlib)
+      raise "unsupported test framework #{testlib}"
+    end
+
     framework = SUPPORTED_TEST_FRAMEWORKS[testlib]
-    raise "unsupported test framework #{testlib}" unless framework
 
-    tests = ["rubygems", framework] +
-      test_globs.map { |g| Dir.glob(g) }.flatten
+    tests = ["rubygems"]
+    tests << framework if framework
+    tests << test_globs.sort.map { |g| Dir.glob(g) }
+    tests.flatten!
     tests.map! {|f| %(require "#{f}")}
 
     tests.insert 1, test_prelude if test_prelude
@@ -171,6 +177,7 @@ module Hoe::Test
     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

data/test/test_hoe.rb

@@ -2,6 +2,12 @@ require 'minitest/autorun'
 require 'hoe'
 require 'tempfile'
 
+class Hoe
+  def self.files= x
+    @files = x
+  end
+end
+
 $rakefile = nil # shuts up a warning in rdoctask.rb
 
 class TestHoe < MiniTest::Unit::TestCase
@@ -35,6 +41,7 @@ class TestHoe < MiniTest::Unit::TestCase
   def test_activate_plugins_hoerc
     home = ENV['HOME']
     load_path = $LOAD_PATH.dup
+    Hoe.files = nil
 
     Dir.mktmpdir do |path|
       ENV['HOME'] = path
@@ -46,7 +53,7 @@ class TestHoe < MiniTest::Unit::TestCase
       end
 
       open File.join(path, '.hoerc'), 'w' do |io|
-        io.write YAML.dump 'plugins' => %w[hoerc]
+        io.write YAML.dump('plugins' => %w[hoerc])
       end
 
       spec = Hoe.spec 'blah' do
@@ -60,6 +67,40 @@ class TestHoe < MiniTest::Unit::TestCase
   ensure
     Hoe.instance_variable_get(:@loaded).delete :hoerc
     Hoe.plugins.delete :hoerc
+    Hoe.send :remove_const, :Hoerc
+    $LOAD_PATH.replace load_path
+    ENV['HOME'] = home
+  end
+
+  def test_initialize_plugins_hoerc
+    home = ENV['HOME']
+    load_path = $LOAD_PATH.dup
+    Hoe.files = nil
+
+    Dir.mktmpdir do |path|
+      ENV['HOME'] = path
+      $LOAD_PATH << path
+
+      Dir.mkdir File.join(path, 'hoe')
+      open File.join(path, 'hoe', 'hoerc.rb'), 'w' do |io|
+        io.write 'module Hoe::Hoerc; def initialize_hoerc; @hoerc_plugin_initialized = true; end; end'
+      end
+
+      open File.join(path, '.hoerc'), 'w' do |io|
+        io.write YAML.dump('plugins' => %w[hoerc])
+      end
+
+      spec = Hoe.spec 'blah' do
+        developer 'author', 'email'
+      end
+
+      assert_includes spec.instance_variables.map(&:to_s), '@hoerc_plugin_initialized',
+        "Hoerc plugin wasn't initialized"
+    end
+  ensure
+    Hoe.instance_variable_get(:@loaded).delete :hoerc
+    Hoe.plugins.delete :hoerc
+    Hoe.send :remove_const, :Hoerc
     $LOAD_PATH.replace load_path
     ENV['HOME'] = home
   end
@@ -104,7 +145,7 @@ class TestHoe < MiniTest::Unit::TestCase
     assert_equal 'blah', spec.rubyforge_project
     assert_equal Gem::RubyGemsVersion, spec.rubygems_version
     assert_match(/^Hoe.*Rakefiles$/, spec.summary)
-    assert_equal files.grep(/^test/), spec.test_files
+    assert_equal files.grep(/^test/).sort, spec.test_files.sort
 
     deps = spec.dependencies.sort_by { |dep| dep.name }
 
@@ -138,4 +179,21 @@ class TestHoe < MiniTest::Unit::TestCase
     assert_equal %w(two_words two_words TwoWords), Hoe.normalize_names('two-words')
     assert_equal %w(two_words two_words TwoWords), Hoe.normalize_names('two_words')
   end
+
+  def test_nosudo
+    hoe = Hoe.spec("blah") do
+      self.version = '1.2.3'
+      developer 'author', 'email'
+
+      def sh cmd
+        cmd
+      end
+    end
+
+    assert_match(/^sudo gem.*/, hoe.install_gem('foo'))
+    ENV['NOSUDO'] = '1'
+    assert_match(/^gem.*/, hoe.install_gem('foo'))
+  ensure
+    ENV.delete "NOSUDO"
+  end
 end

data/test/test_hoe_test.rb

@@ -0,0 +1,46 @@
+require "minitest/autorun"
+require "hoe"
+
+Hoe.load_plugins # make sure Hoe::Test is loaded
+
+class TestHoeTest < MiniTest::Unit::TestCase
+  def setup
+    @tester = Module.new do
+      include Hoe::Test
+
+      extend self
+
+      initialize_test
+
+      def test_globs
+        ['test/**/test_*.rb']
+      end
+    end
+  end
+
+  def test_make_test_cmd_with_different_testlibs
+    expected = ['-w -Ilib:bin:test:. -e \'require "rubygems"; %s',
+                'require "test/test_hoe.rb"; ',
+                'require "test/test_hoe_gemcutter.rb"; ',
+                'require "test/test_hoe_test.rb"',
+                "' -- ",
+               ].join
+
+    testunit = %(require "test/unit"; )
+    assert_equal expected % testunit, @tester.make_test_cmd
+
+    @tester.testlib = :minitest
+    autorun = %(require "minitest/autorun"; )
+    assert_equal expected % autorun, @tester.make_test_cmd
+
+    @tester.testlib = :none
+    assert_equal expected % "", @tester.make_test_cmd
+
+    @tester.testlib = :faketestlib
+    e = assert_raises(RuntimeError) do
+      @tester.make_test_cmd
+    end
+
+    assert_equal "unsupported test framework faketestlib", e.to_s
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 2
   - 9
-  - 1
-  version: 2.9.1
+  - 2
+  version: 2.9.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-02-05 00:00:00 -08:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - template/test/test_file_name.rb.erb
 - test/test_hoe.rb
 - test/test_hoe_gemcutter.rb
+- test/test_hoe_test.rb
 - .gemtest
 has_rdoc: true
 homepage: http://rubyforge.org/projects/seattlerb/
@@ -162,10 +163,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles
 test_files: 
 - test/test_hoe.rb
 - test/test_hoe_gemcutter.rb
+- test/test_hoe_test.rb