hen 0.3.6 → 0.3.9

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.3.6
+This documentation refers to hen version 0.3.9
 
 
 == DESCRIPTION

data/lib/hen/dsl.rb

@@ -36,6 +36,7 @@ class Hen
   module DSL
 
     extend self
+    extend Rake::DSL if Rake.const_defined?(:DSL)
 
     # The Hen configuration.
     def config
@@ -243,7 +244,7 @@ class Hen
           options = args.last.is_a?(Hash) ? args.pop : {}
           options[:verbose] = Hen.verbose unless options.has_key?(:verbose)
 
-          sh('git', cmd.to_s.tr('_', '-'), *args << options)
+          DSL.send(:sh, 'git', cmd.to_s.tr('_', '-'), *args << options)
         end
 
         def run(cmd, *args)  # :nodoc:
@@ -288,7 +289,7 @@ class Hen
           options = args.last.is_a?(Hash) ? args.pop : {}
           options[:verbose] = Hen.verbose unless options.has_key?(:verbose)
 
-          sh('svn', cmd.to_s.tr('_', '-'), *args << options)
+          DSL.send(:sh, 'svn', cmd.to_s.tr('_', '-'), *args << options)
         end
 
         def run(cmd, *args)  # :nodoc:

data/lib/hen/version.rb

@@ -4,7 +4,7 @@ class Hen
 
     MAJOR = 0
     MINOR = 3
-    TINY  = 6
+    TINY  = 9
 
     class << self
 

data/lib/hens/gem.rake

@@ -2,8 +2,6 @@ Hen :gem => :rdoc do
   # Dependencies:
   # * rdoc -- Uses RDOC_OPTIONS and 'doc:publish' task
 
-  require 'rake/gempackagetask'
-
   gem_options = config[:gem].merge(
     :files => FileList[
       'lib/**/*.rb',
@@ -22,6 +20,16 @@ Hen :gem => :rdoc do
     :require_path => 'lib'
   )
 
+  gem_klass = begin
+    raise LoadError if gem_options.delete(:legacy)
+
+    require 'rubygems/package_task'
+    Gem::PackageTask
+  rescue LoadError
+    require 'rake/gempackagetask'
+    Rake::GemPackageTask
+  end
+
   rf_config = config[:rubyforge]
 
   if Object.const_defined?(:RDOC_OPTIONS)
@@ -134,7 +142,7 @@ Hen :gem => :rdoc do
     puts "#{action} #{file}"
   end
 
-  pkg_task = Rake::GemPackageTask.new(gem_spec) { |pkg|
+  pkg_task = gem_klass.new(gem_spec) { |pkg|
     pkg.need_tar_gz = true
     pkg.need_zip    = true
 
@@ -144,12 +152,12 @@ Hen :gem => :rdoc do
     end
   }
 
-  release_desc = "Release #{pkg_task.name} version #{pkg_task.version}"
-  tag_desc     = "Tag the #{pkg_task.name} release version #{pkg_task.version}"
+  release_desc = "Release #{gem_spec.name} version #{gem_spec.version}"
+  tag_desc     = "Tag the #{gem_spec.name} release version #{gem_spec.version}"
 
   rubygems do |rg_pool|
 
-    gem_path = File.join(pkg_task.package_dir, pkg_task.gem_file)
+    gem_path = File.join(pkg_task.package_dir, gem_spec.file_name)
 
     desc "Create the gem and install it"
     task 'gem:install' => :gem do
@@ -174,7 +182,7 @@ Hen :gem => :rdoc do
       abort 'Nothing to release!' if files.empty?
 
       # shorten to (at most) three digits
-      version = pkg_task.version.to_s.split(/([.])/)[0..4].join
+      version = gem_spec.version.to_s.split(/([.])/)[0..4].join
 
       rf = rf_pool.call
 
@@ -184,7 +192,7 @@ Hen :gem => :rdoc do
       #uc['release_changes'] = changes if changes
       #uc['preformatted']    = true
 
-      rf.add_release(rf_config[:project], pkg_task.name, version, *files)
+      rf.add_release(rf_config[:project], gem_spec.name, version, *files)
     end
 
     desc release_desc
@@ -196,7 +204,7 @@ Hen :gem => :rdoc do
 
     desc "#{tag_desc} (Git)"
     task! 'release:tag' do
-      git.tag '-f', "v#{pkg_task.version}"
+      git.tag '-f', "v#{gem_spec.version}"
     end
 
   end
@@ -205,7 +213,7 @@ Hen :gem => :rdoc do
 
     desc "#{tag_desc} (SVN)"
     task! 'release:tag' do
-      svn.cp '-m', "v#{pkg_task.version}", '^/trunk', "^/tags/#{pkg_task.version}"
+      svn.cp '-m', "v#{gem_spec.version}", '^/trunk', "^/tags/#{gem_spec.version}"
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 Z
+date: 2011-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-nuggets
@@ -85,12 +85,12 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README
 - --charset
 - UTF-8
 - --title
-- hen Application documentation (v0.3.6)
+- hen Application documentation (v0.3.9)
+- --main
+- README
 - --line-numbers
 - --all
 require_paths: 
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.7.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.