hen 0.4.4 → 0.4.5

data/ChangeLog

@@ -1,5 +1,12 @@
 = Revision history for hen
 
+== 0.4.5 [2012-01-20]
+
+* Publish native Gems.
+* Build and publish Meta-Gems.
+* Renamed Meta-Gem option 'extras' to 'dependencies'.
+* Fixed Ruby warnings.
+
 == 0.4.4 [2012-01-18]
 
 * Some extension task improvements.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.4.4
+This documentation refers to hen version 0.4.5
 
 
 == DESCRIPTION

data/bin/hen

@@ -57,7 +57,7 @@ abort USAGE if ARGV.empty?
 
 EXAMPLE = File.expand_path('../../example', __FILE__)
 
-case action = ARGV.shift
+case arg = ARGV.shift
   when 'help', '-h', '--help'
     puts USAGE
     puts
@@ -173,5 +173,5 @@ case action = ARGV.shift
     # a particular hen/task is currently available).
     abort 'Sorry, not yet available...'
   else
-    abort "Illegal action: #{action}\n#{USAGE}"
+    abort "Illegal action: #{arg}\n#{USAGE}"
 end

data/lib/hen/cli.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # hen -- Just a Rake helper                                                   #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
@@ -26,7 +26,6 @@
 ###############################################################################
 #++
 
-require 'hen'
 require 'etc'
 require 'erb'
 require 'highline/import'

data/lib/hen/dsl.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of hen, the Rake helper.                                        #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
@@ -26,8 +26,8 @@
 ###############################################################################
 #++
 
-require 'hen'
 require 'nuggets/file/which'
+require 'nuggets/object/singleton_class'
 
 class Hen
 
@@ -323,7 +323,7 @@ class Hen
     def extend_object(object, *blocks)
       blocks << Proc.new if block_given?
 
-      singleton_class = class << object; self; end
+      singleton_class = object.singleton_class
 
       blocks.compact.reverse_each { |block|
         singleton_class.class_eval(&block)

data/lib/hen/version.rb

@@ -4,7 +4,7 @@ class Hen
 
     MAJOR = 0
     MINOR = 4
-    TINY  = 4
+    TINY  = 5
 
     class << self
 

data/lib/hens/gem.rake

@@ -41,7 +41,7 @@ Hen :gem => :rdoc do
 
   extension_options = gem_options.delete(:extension) || {}
 
-  meta_gems = Array(gem_options.delete(:meta))
+  meta_gems, meta_gem_specs = Array(gem_options.delete(:meta)), []
 
   gem_name = gem_options[:name] ||= project_name(rf_config)
   abort 'Gem name missing' unless gem_name
@@ -165,7 +165,7 @@ Hen :gem => :rdoc do
 
     noauto = meta_gem_options.delete(:noauto)
 
-    meta_gem_spec = Gem::Specification.new { |spec|
+    meta_gem_specs << meta_gem_spec = Gem::Specification.new { |spec|
 
       ### inherit from original spec
 
@@ -189,7 +189,7 @@ Hen :gem => :rdoc do
 
       [
         [gem_options[:name], gem_options[:version]],
-        *Array(meta_gem_options.delete(:extras))
+        *Array(meta_gem_options.delete(:dependencies))
       ].each { |dependency|
         spec.add_dependency(*dependency)
       }
@@ -201,6 +201,10 @@ Hen :gem => :rdoc do
     }
 
     meta_prefix = "gem:meta:#{meta_gem_name = meta_gem_spec.name}"
+    meta_class  = meta_gem_spec.singleton_class
+
+    meta_class.send(:define_method, :auto?)    { !noauto }
+    meta_class.send(:define_method, :taskname) { meta_prefix }
 
     desc "Display the #{meta_gem_name} gem specification"
     task "#{meta_prefix}:spec" do
@@ -229,6 +233,31 @@ Hen :gem => :rdoc do
     end
   }
 
+  meta_gem_specs.each { |meta_gem_spec|
+
+    meta_pkg_task = gem_klass.new(meta_gem_spec)
+
+    taskname = meta_gem_spec.taskname
+
+    gem_file = File.basename(meta_gem_spec.cache_file)
+    gem_path = File.join(package_dir = meta_pkg_task.package_dir, gem_file)
+
+    desc "Build the meta gem file #{gem_file}"
+    task taskname => gem_path
+
+    Gem.configuration.verbose = trace = Rake.application.options.trace
+
+    file gem_path => package_dir do
+      when_writing "Creating #{meta_gem_spec.file_name}" do
+        Gem::Builder.new(meta_gem_spec).build
+        verbose(trace) { mv gem_file, package_dir }
+      end
+    end
+
+    %w[package gem].each { |t| task t => taskname } if meta_gem_spec.auto?
+
+  }
+
   begin
     require 'rake/extensiontask' unless gem_spec.extensions.empty?
   rescue LoadError
@@ -255,7 +284,7 @@ Hen :gem => :rdoc do
       ENV['RUBY_CC_VERSION'] ||= Array(ruby_versions).join(':')
     end
 
-    Rake::ExtensionTask.new(nil, gem_spec) { |ext|
+    extension_task = Rake::ExtensionTask.new(nil, gem_spec) { |ext|
       set_options(ext, extension_options, 'Extension')
     }
 
@@ -270,7 +299,8 @@ Hen :gem => :rdoc do
 
   rubygems do |rg_pool|
 
-    gem_path = File.join(pkg_task.package_dir, gem_spec.file_name)
+    gem_base = pkg_task.package_dir
+    gem_path = File.join(gem_base, gem_spec.file_name)
 
     desc 'Create the gem and install it'
     task 'gem:install' => :gem do
@@ -282,12 +312,43 @@ Hen :gem => :rdoc do
       rg_pool.call.push(gem_path)
     end
 
+    meta_gem_specs.each { |meta_gem_spec|
+      taskname = meta_gem_spec.taskname
+
+      desc "Create the meta gem #{meta_gem_spec.name} and upload it to RubyGems.org"
+      task "#{taskname}:push" => taskname do
+        rg_pool.call.push(File.join(gem_base, meta_gem_spec.file_name))
+      end
+
+      task 'gem:push:meta' => "#{taskname}:push" if meta_gem_spec.auto?
+    }
+
+    if have_task?('gem:push:meta')
+      desc 'Create the meta gems and upload them to RubyGems.org'
+      task 'gem:push:meta'
+
+      task 'gem:push' => 'gem:push:meta'
+    end
+
+    if extension_task
+      platforms = Array(extension_task.cross_platform).join(',')
+      gems_glob = gem_path.sub(/(?=\.gem\z)/, "-{#{platforms}}")
+
+      desc 'Create the native gems and upload them to RubyGems.org'
+      task 'gem:push:native' => 'gem:native' do
+        rg = rg_pool.call
+        Dir[gems_glob].each { |native_gem| rg.push(native_gem) }
+      end
+
+      task 'gem:push' => 'gem:push:native'
+    end
+
     desc release_desc; release_desc = nil
     task :release => 'gem:push'
 
   end
 
-  rubyforge do |rf_config, rf_pool|
+  rubyforge do |_, rf_pool|
 
     desc 'Package and upload the release to RubyForge'
     task 'release:rubyforge' => [:package, 'doc:publish:rubyforge'] do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-nuggets
@@ -85,14 +85,14 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset
-- UTF-8
-- --title
-- hen Application documentation (v0.4.4)
+- --line-numbers
 - --main
 - README
 - --all
-- --line-numbers
+- --charset
+- UTF-8
+- --title
+- hen Application documentation (v0.4.5)
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement