hoe 2.9.4 → 2.9.5

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.9.5 / 2011-06-21
+
+* 2 minor enhancements:
+
+  * Extended #dependency to work post-spec creation in case a task wants to add a dep.
+
+* 4 bug fixes:
+
+  * Fixed dependency for :inline plugin.
+  * Fixed minor 1.9.3 warnings.
+  * Fixed sow to obey gem naming conventions.  It no longer munges - to _.
+  * Switched hoe deps from >= to ~>.
+
 === 2.9.4 / 2011-04-01
 
 * 1 minor enhancement:

data/bin/sow

@@ -20,7 +20,7 @@ def check_subdir option
   end
 end
 
-opts = OptionParser.new do |opts|
+op = OptionParser.new do |opts|
   opts.banner = "Usage: sow [options] project_name"
 
   opts.separator "Standard options:"
@@ -45,7 +45,7 @@ opts = OptionParser.new do |opts|
   end
 end
 
-opts.parse!
+op.parse!
 
 include FileUtils::Verbose
 
@@ -76,10 +76,10 @@ end
 
 project = ARGV.shift
 
-abort opts.to_s unless project
+abort op.to_s unless project
 abort "Project #{project} seems to exist" if test ?d, project
 
-project, file_name, klass = Hoe.normalize_names project
+_, file_name, klass = Hoe.normalize_names project
 
 FileUtils.cp_r template_path, project
 
@@ -95,13 +95,25 @@ Dir.chdir project do
 
     warn "erb: #{path}"
 
-    File.open path, "w" do |f|
-      f.puts ERB.new(file).result(binding)
+    File.open path, "w" do |io|
+      erb = ERB.new file
+      erb.filename = path
+      io.puts erb.result(binding)
     end
   end
 
   paths.grep(/file_name|\.erb$/).each do |file|
     new_file = file.sub(/file_name/, file_name).sub(/\.erb$/, '')
+
+    # TODO change template to separate a flat filename from a directory
+    # filename
+    if file =~ /^(bin|test)/ then
+      dir, *rest = new_file.split File::SEPARATOR
+
+      new_file = File.join dir, rest.join('_')
+    end
+
+    FileUtils.mkdir_p File.dirname new_file
     FileUtils.mv file, new_file
   end
 end

data/lib/hoe.rb

@@ -67,7 +67,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = '2.9.4'
+  VERSION = '2.9.5'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :gemcutter, :signing, :test]
@@ -261,14 +261,22 @@ class Hoe
   end
 
   ##
-  # Normalize a project name into the project, file, and klass cases (?!?).
+  # Normalize a project name into the project, file, and klass names that
+  # follow Ruby package naming guidelines.
   #
-  # no, I have no idea how to describe this. Does the thing with the stuff.
+  # Project names are lowercase with _ separating package parts and -
+  # separating extension parts.
+  #
+  # File names are lowercase with _ separating pacagke parts and / separating
+  # extension parts.  net-http-persistent becomes net/http/persistent.
+  #
+  # Klass names are CamelCase with :: separating extension parts.
 
   def self.normalize_names project # :nodoc:
-    project   = project.tr('-', '_').gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
+    project   = project.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
     klass     = project.gsub(/(?:^|_)([a-z])/) { $1.upcase }
-    file_name = project
+    klass     = klass.  gsub(/(?:^|-)([a-z])/) { "::#{$1.upcase}" }
+    file_name = project.gsub(/-/, '/')
 
     return project, file_name, klass
   end
@@ -345,15 +353,27 @@ class Hoe
   # +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]
+    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
+
+      spec.send msg, name, version
+    else
+      ary = if type == :runtime then
+              extra_deps
+            else
+              extra_dev_deps
+            end
+
+      ary << [name, version]
+    end
   end
 
   ##
@@ -365,11 +385,11 @@ class Hoe
 
     case name
     when 'hoe' then
-      extra_deps << ['rake', ">= #{RAKEVERSION}"]
-    when 'rubyforge', 'rake', 'gemcutter' then
+      dependency "rake", "~> #{RAKEVERSION}"
+    when 'rake', 'minitest' then
       # avoid circular dependencies for hoe's (potentially) hoe'd dependencies
     else
-      extra_dev_deps << ['hoe', ">= #{VERSION}"]
+      dependency "hoe", "~> #{VERSION}", :development
     end
   end
 
@@ -422,7 +442,6 @@ class Hoe
       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
-
     end
 
     unless self.version then
@@ -546,7 +565,7 @@ class Hoe
 
       begin
         send "define_#{plugin}_tasks"
-      rescue NoMethodError => e
+      rescue NoMethodError
         warn "warning: couldn't activate the #{plugin} plugin, skipping" if
           Rake.application.options.trace or $DEBUG
 

data/lib/hoe/compiler.rb

@@ -26,7 +26,7 @@ module Hoe::Compiler
 
     clean_globs << "lib/#{self.name}/*.{so,bundle,dll}"
 
-    extra_dev_deps << ["rake-compiler", "~> 0.7"]
+    dependency "rake-compiler", "~> 0.7", :development
   end
 
   ##

data/lib/hoe/deps.rb

@@ -70,8 +70,6 @@ module Hoe::Deps
 
       desc "Fetch all the dependent gems of this gem into tarballs"
       task :fetch do
-        gems = self.get_gems_by_name
-        gem  = gems[self.name]
         deps = self.dependent_upon self.name
 
         mkdir "deps" unless File.directory? "deps"

data/lib/hoe/gemcutter.rb

@@ -1,6 +1,8 @@
 require 'rake'
 
 module Hoe::Gemcutter
+  include Rake::DSL if defined?(Rake::DSL)
+
   def define_gemcutter_tasks
     desc "Push gem to gemcutter."
     task :release_to_gemcutter => [:clean, :package, :release_sanity] do

data/lib/hoe/inline.rb

@@ -18,12 +18,16 @@ require 'rbconfig'
 # +FORCE_PLATFORM+ (instead of default Gem::Platform::CURRENT)
 
 module Hoe::Inline
+  def initialize_inline
+    dependency "RubyInline", "~> 3.9"
+
+    clean_globs << File.expand_path("~/.ruby_inline")
+  end
+
   ##
   # Define tasks for plugin.
 
   def define_inline_tasks
-    extra_deps  << ['RubyInline', "~> 3.8.4"]
-    clean_globs << File.expand_path("~/.ruby_inline")
     task :test => :clean
 
     if ENV['INLINE'] then

data/lib/hoe/publish.rb

@@ -154,7 +154,7 @@ module Hoe::Publish
       with_config do |config, path|
         break unless config['blogs']
 
-        subject, title, body, urls = announcement
+        _, title, body, urls = announcement
         body += "\n\n#{urls}"
 
         config['blogs'].each do |site|
@@ -163,12 +163,12 @@ module Hoe::Publish
                                                 :description => body,
                                                 :categories => blog_categories)
 
-          result = server.call('metaWeblog.newPost',
-                               site['blog_id'],
-                               site['user'],
-                               site['password'],
-                               content,
-                               true)
+          server.call('metaWeblog.newPost',
+                      site['blog_id'],
+                      site['user'],
+                      site['password'],
+                      content,
+                      true)
         end
       end
     end

data/lib/hoe/racc.rb

@@ -43,7 +43,7 @@ module Hoe::Racc
     self.racc_flags ||= "-v -l"
     self.rex_flags  ||= "--independent"
 
-    extra_dev_deps << ['racc', '~> 1.4.7']
+    dependency 'racc', '~> 1.4.7', :development
   end
 
   ##

data/template/Manifest.txt.erb

@@ -3,6 +3,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/<%= project %>
-lib/<%= project %>.rb
-test/test_<%= project %>.rb
+bin/<%= file_name %>
+lib/<%= file_name %>.rb
+test/test_<%= file_name %>.rb

data/test/test_hoe.rb

@@ -147,7 +147,7 @@ class TestHoe < MiniTest::Unit::TestCase
 
     deps = spec.dependencies.sort_by { |dep| dep.name }
 
-    expected = [["hoe",       :development, ">= #{Hoe::VERSION}"]]
+    expected = [["hoe",       :development, "~> #{Hoe::VERSION}"]]
 
     expected << ["rubyforge", :development, ">= #{::RubyForge::VERSION}"] if
       defined? ::RubyForge
@@ -170,12 +170,12 @@ class TestHoe < MiniTest::Unit::TestCase
   def test_rename
     # project, file_name, klass = Hoe.normalize_names 'project_name'
 
-    assert_equal %w(    word      word     Word),  Hoe.normalize_names('word')
-    assert_equal %w(    word      word     Word),  Hoe.normalize_names('Word')
-    assert_equal %w(two_words two_words TwoWords), Hoe.normalize_names('TwoWords')
-    assert_equal %w(two_words two_words TwoWords), Hoe.normalize_names('twoWords')
-    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')
+    assert_equal %w(    word      word     Word),    Hoe.normalize_names('word')
+    assert_equal %w(    word      word     Word),    Hoe.normalize_names('Word')
+    assert_equal %w(two_words two_words TwoWords),   Hoe.normalize_names('TwoWords')
+    assert_equal %w(two_words two_words TwoWords),   Hoe.normalize_names('twoWords')
+    assert_equal %w(two-words two/words Two::Words), Hoe.normalize_names('two-words')
+    assert_equal %w(two_words two_words TwoWords),   Hoe.normalize_names('two_words')
   end
 
   def test_nosudo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 2
   - 9
-  - 4
-  version: 2.9.4
+  - 5
+  version: 2.9.5
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,8 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-04-01 00:00:00 -07:00
-default_executable: 
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -45,7 +44,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 49
         segments: 
@@ -63,12 +62,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 2
+        - 3
         - 0
-        - 2
-        version: 2.0.2
+        version: 2.3.0
   type: :development
   version_requirements: *id002
 description: |-
@@ -131,7 +130,6 @@ files:
 - test/test_hoe_gemcutter.rb
 - test/test_hoe_test.rb
 - .gemtest
-has_rdoc: true
 homepage: http://rubyforge.org/projects/seattlerb/
 licenses: []
 
@@ -163,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles

metadata.gz.sig

@@ -1,3 +1 @@
-c:E�
-��+���x<����|�r��U�`�#.�z�b9��6
-<������*��>�1���f;�<E���HaA:k�o��>ܖ��L"ʐ����Bڧ�?����BI�]�#�;z���c�-��V��}W�������{[a����;��9�qˢX�8)��R�|�M��{оg=x@�50$ɬ6
,�i�f0�� dYfeY:7b���-+ONE��O������L۠S25�i��O>�'Z�o֑z
+R�?ص?����z:%�i->��8(�MKS�1�%x.��'H%���