hoe 2.12.4 → 2.12.5

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.12.5 / 2011-12-19
+
+* 2 minor enhancements:
+
+  * Make hoe noisy about missing plugins again.
+  * Normalize dev/runtime deps: dev + runtime = runtime.
+
 === 2.12.4 / 2011-11-28
 
 * 3 bug fixes:

data/lib/hoe.rb

@@ -68,7 +68,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.12.4'
+  VERSION = '2.12.5'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -372,24 +372,13 @@ class Hoe
     raise "Unknown dependency type: #{type}" unless
       [:runtime, :dev, :development, :developer].include? type
 
-    # spec has already been defined. A task wants to add a dependency after.
-    if spec then
-      msg = if type == :runtime then
-              :add_dependency
-            else
-              :add_development_dependency
-            end
+    ary = if type == :runtime then
+            extra_deps
+          else
+            extra_dev_deps
+          end
 
-      spec.send msg, name, version
-    else
-      ary = if type == :runtime then
-              extra_deps
-            else
-              extra_dev_deps
-            end
-
-      ary << [name, version]
-    end
+    ary << [name, version]
   end
 
   ##
@@ -406,6 +395,17 @@ class Hoe
       version = VERSION.split(/\./).first(2).join(".")
       dependency "hoe", "~> #{version}", :development
     end
+
+    runtime = extra_deps.map(&:first)
+    extra_dev_deps.reject! { |(name, v)| runtime.include? name }
+
+    extra_deps.each do |dep|
+      spec.add_dependency(*dep)
+    end
+
+    extra_dev_deps.each do |dep|
+      spec.add_development_dependency(*dep)
+    end
   end
 
   ##
@@ -455,14 +455,6 @@ class Hoe
         s.author  = author
       end
 
-      extra_deps.each do |dep|
-        s.add_dependency(*dep)
-      end
-
-      extra_dev_deps.each do |dep|
-        s.add_development_dependency(*dep)
-      end
-
       s.extra_rdoc_files += s.files.grep(/txt$/)
       s.extra_rdoc_files.reject! { |f| f =~ %r%^(test|spec|vendor|template|data|tmp)/% }
       s.extra_rdoc_files += @extra_rdoc_files
@@ -626,8 +618,7 @@ class Hoe
       begin
         send "define_#{plugin}_tasks"
       rescue NoMethodError
-        warn "warning: couldn't activate the #{plugin} plugin, skipping" if
-          Rake.application.options.trace or $DEBUG
+        warn "warning: couldn't activate the #{plugin} plugin, skipping"
 
         bad << plugin
         next
@@ -703,9 +694,9 @@ class Hoe
   def post_initialize
     intuit_values
     validate_fields
-    add_dependencies
     define_spec
     load_plugin_tasks
+    add_dependencies
   end
 
   ##
@@ -746,13 +737,18 @@ class Hoe
   end
 
   ##
-  # Loads ~/.hoerc and yields the configuration and its path
+  # Loads ~/.hoerc, merges it with a .hoerc in the current pwd (if
+  # any) and yields the configuration and its path
 
   def with_config
     rc = File.expand_path("~/.hoerc")
     exists = File.exist? rc
     config = exists ? YAML.load_file(rc) : {}
-    yield(config, rc)
+    localrc = File.join Dir.pwd, '.hoerc'
+    exists = File.exist? localrc
+    localconfig = exists ? YAML.load_file(localrc) : {}
+
+    yield(config.merge(localconfig), rc)
   end
 end
 

data/test/test_hoe.rb

@@ -70,6 +70,35 @@ class TestHoe < MiniTest::Unit::TestCase
     ENV['HOME'] = home
   end
 
+  def test_perproject_hoerc
+    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
+
   def test_initialize_plugins_hoerc
     home = ENV['HOME']
     load_path = $LOAD_PATH.dup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 2
   - 12
-  - 4
-  version: 2.12.4
+  - 5
+  version: 2.12.5
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -53,25 +53,10 @@ dependencies:
         version: "0.8"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 9
-        version: "3.9"
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,11 +67,11 @@ dependencies:
         - 8
         version: "2.8"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,7 +82,7 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: |-
   Hoe is a rake/rubygems helper for project Rakefiles. It helps you
   manage and maintain, and release your project and includes a dynamic
@@ -189,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles