hen 0.4.3 → 0.4.4

data/ChangeLog

@@ -1,5 +1,19 @@
 = Revision history for hen
 
+== 0.4.4 [2012-01-18]
+
+* Some extension task improvements.
+* Include extension files in RDoc.
+
+== 0.4.3 [2012-01-09]
+
+* Integrate with rake-compiler.
+* Reverse merge config.
+
+== 0.4.2 [2012-01-09]
+
+* New option 'meta' to build meta-gems.
+
 == 0.4.1 [2012-01-02]
 
 * Make 'release' depend on 'doc:publish'.

data/README

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

data/lib/hen/version.rb

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

data/lib/hens/gem.rake

@@ -43,13 +43,10 @@ Hen :gem => :rdoc do
 
   meta_gems = Array(gem_options.delete(:meta))
 
-  gem_spec = Gem::Specification.new { |spec|
-
-    ### name
-
-    gem_name = gem_options[:name] ||= project_name(rf_config)
+  gem_name = gem_options[:name] ||= project_name(rf_config)
+  abort 'Gem name missing' unless gem_name
 
-    abort 'Gem name missing' unless gem_name
+  gem_spec = Gem::Specification.new { |spec|
 
     ### version
 
@@ -203,14 +200,14 @@ Hen :gem => :rdoc do
 
     }
 
-    meta_prefix = "gem:meta:#{meta_gem_spec.name}"
+    meta_prefix = "gem:meta:#{meta_gem_name = meta_gem_spec.name}"
 
-    desc "Display the #{meta_gem_spec.name} gem specification"
+    desc "Display the #{meta_gem_name} gem specification"
     task "#{meta_prefix}:spec" do
       puts meta_gem_spec.to_ruby
     end
 
-    desc "Update (or create) the project's #{meta_gem_spec.name} gemspec file"
+    desc "Update (or create) the project's #{meta_gem_name} gemspec file"
     task "#{meta_prefix}:spec:update" do
       write_gemspec(meta_gem_spec)
     end
@@ -224,19 +221,27 @@ Hen :gem => :rdoc do
     pkg.need_zip    = true
 
     if defined?(ZIP_COMMANDS)
-      require 'nuggets/file/which'
-      pkg.zip_command = File.which_command(ZIP_COMMANDS) || ZIP_COMMANDS.first
+      pkg.zip_command = begin
+        require 'nuggets/file/which'
+        File.which_command(ZIP_COMMANDS)
+      rescue LoadError
+      end || ZIP_COMMANDS.first
     end
   }
 
-  unless gem_spec.extensions.empty?
-    require 'rake/extensiontask'
-    require 'nuggets/util/ruby'
+  begin
+    require 'rake/extensiontask' unless gem_spec.extensions.empty?
+  rescue LoadError
+  end
+
+  if Rake.const_defined?(:ExtensionTask)
+    extension_options[:name] ||= gem_name.include?('-') ?
+      gem_name.tr('-', '_') : "#{gem_name}_native"
 
-    extension_options[:name] ||= "#{gem_spec.name}_native"
+    ext_name = gem_name.include?('-') ? gem_name.split('-').first : gem_name
 
-    extension_options[:lib_dir] ||= File.join(['lib', gem_spec.name, ENV['FAT_DIR']].compact)
-    extension_options[:ext_dir] ||= File.join(['ext', gem_spec.name])
+    extension_options[:lib_dir] ||= File.join(['lib', ext_name, ENV['FAT_DIR']].compact)
+    extension_options[:ext_dir] ||= File.join(['ext', ext_name])
 
     unless extension_options.has_key?(:cross_compile)
       extension_options[:cross_compile] = true
@@ -246,23 +251,22 @@ Hen :gem => :rdoc do
       extension_options[:cross_platform] ||= %w[x86-mswin32-60 x86-mingw32]
     end
 
-    ruby_versions = extension_options.delete(:ruby_versions)
+    if ruby_versions = extension_options.delete(:ruby_versions)
+      ENV['RUBY_CC_VERSION'] ||= Array(ruby_versions).join(':')
+    end
 
     Rake::ExtensionTask.new(nil, gem_spec) { |ext|
       set_options(ext, extension_options, 'Extension')
     }
 
     desc 'Build native gems'
-    task 'gem:native' do
-      ENV['RUBY_CC_VERSION'] ||= Array(ruby_versions).join(':') if ruby_versions
+    task 'gem:native' => %w[cross compile native gem]
 
-      sh(Util::Ruby.rake_command, *%w[cross compile])
-      sh(Util::Ruby.rake_command, *%w[cross native gem])
-    end
+    %w[spec test].each { |t| task t => :compile }
   end
 
-  release_desc = "Release #{gem_spec.name} version #{gem_spec.version}"
-  tag_desc     = "Tag the #{gem_spec.name} release version #{gem_spec.version}"
+  release_desc = "Release #{gem_name} version #{gem_spec.version}"
+  tag_desc     = "Tag the #{gem_name} release version #{gem_spec.version}"
 
   rubygems do |rg_pool|
 
@@ -301,7 +305,7 @@ Hen :gem => :rdoc do
       #uc['release_changes'] = changes if changes
       #uc['preformatted']    = true
 
-      rf.add_release(rf_config[:project], gem_spec.name, version, *files)
+      rf.add_release(rf_config[:project], gem_name, version, *files)
     end
 
     desc release_desc

data/lib/hens/rdoc.rake

@@ -2,7 +2,7 @@ Hen :rdoc do
 
   rdoc_options = {
     :rdoc_dir       => 'doc',
-    :rdoc_files     => %w[README COPYING ChangeLog lib/**/*.rb],
+    :rdoc_files     => %w[README COPYING ChangeLog lib/**/*.rb ext/**/*.c],
     :charset        => 'UTF-8',
     :inline_source  => true,
     :line_numbers   => true,
@@ -41,7 +41,10 @@ Hen :rdoc do
 
   ### rdoc_files, main
 
-  rdoc_files = FileList[rdoc_options.delete(:rdoc_files)].to_a
+  rdoc_files = FileList[rdoc_options.delete(:rdoc_files)].sort_by { |file|
+    [file.length, file]
+  }
+
   rdoc_files_local = rdoc_files.dup
 
   if mangle_files!(rdoc_files)

data/lib/hens/spec.rake

@@ -60,14 +60,12 @@ Hen :spec do
     end
 
     #desc "Run specs with RCov"
-    klass.new('spec:rcov') do |t|
+    spec_klass.new('spec:rcov') do |t|
       spec_block[t]
 
       t.rcov = true
       t.rcov_opts = rcov_opts
     end
-
-    task :spec => :compile if have_task?(:compile)
   end
 
 end

data/lib/hens/test.rake

@@ -16,8 +16,6 @@ Hen :test do
       t.test_files = test_files
       set_options(t, test_options, 'Test')
     }
-
-    task :test => :compile if have_task?(:compile)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-01-18 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.4.3)
+- hen Application documentation (v0.4.4)
+- --main
+- README
 - --all
 - --line-numbers
 require_paths: