hen 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4072e13f1feb0d60af5d5cc34da7241534729021
-  data.tar.gz: f928a7f50cf2fa8792e21b74f5b89bc003d48ca4
+  metadata.gz: cd310f44a48870b4c354e0d3aa4cbe63b3445226
+  data.tar.gz: 240426572bc45989bdcf3566df93ede9d735ec38
 SHA512:
-  metadata.gz: 21ab42db487595edd0efac73bef24ac27b63839f7c4cec703552a850eb30d9bf7c05dfebaaabe2d8ec12c2e4675f6831f42c4ae73fe398151f6d75ec238a8dfa
-  data.tar.gz: 928c0691dfcd088104f2dc253b6939873b92477bdfa5e1ea105c3edb0910eb1eeb3c95d55439d5ee38fb6ffc4b937130f7d9139c7419bd0e3facec8d6e6b2516
+  metadata.gz: 4b4982093bd2c157239287e937db7453969ef4633853289363ee77852fdbf444297fbb1e1fcb2a9cb21793e719088305a54a9f9aa3d65bb0ef5114d3ed518672
+  data.tar.gz: e137da6c94932a56766bce7404dafb2117647403c63f667de09a94b40ea48c43619a2dceee5c73b90d05a8d2bfe360089f0f847e0fc8e8e1fc53dc24b7383546

data/ChangeLog

@@ -2,6 +2,25 @@
 
 = Revision history for hen
 
+== 0.8.1 [2014-12-19]
+
+* Removed workaround for RDoc issue 330. Implemented in RDoc 4.2.0.
+* Renamed cross compile option +ruby_versions+ to +cross_ruby_versions+;
+  defaults to all versions defined in rake-compiler's <tt>config.yml</tt>.
+* When +cross_config_options+ given, cross compilation is implicitly disabled
+  when they are empty or enabled when they are non-empty; override by setting
+  +cross_compile+ explicitly.
+* Added support for <tt>with_cross_<library></tt> options; specify a proc that
+  accepts the <tt>WITH_CROSS_<LIBRARY></tt> environment variable, if set, and
+  returns a single directory for <tt>--with-<library>-dir</tt> or an array for
+  <tt>--with-<library>-include</tt> and <tt>--with-<library>-lib</tt> to be
+  added to +cross_config_options+.
+* Added support for +cross_compiling+ option.
+* Added support for +local_files+ option, i.e., generated files that should be
+  included in the package but not under version control.
+* When determining the +ext_name+ option, a possible <tt>ruby-</tt> prefix is
+  ignored.
+
 == 0.8.0 [2014-10-31]
 
 * Removed support for legacy versions of RDoc, RSpec and RubyGems.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.8.0
+This documentation refers to hen version 0.8.1
 
 
 == DESCRIPTION

data/lib/hen.rb

@@ -29,6 +29,7 @@
 #++
 
 require 'rake'
+require 'rake/clean'
 require 'safe_yaml/load'
 require 'nuggets/env/user_home'
 require 'nuggets/hash/deep_merge'
@@ -266,8 +267,10 @@ class Hen
 
     block.bind(DSL).call
   rescue => err
-    warn "#{name}: #{err} (#{err.class})" if $DEBUG || verbose
-    warn err.backtrace.join("\n  ") if $DEBUG
+    trace = $DEBUG || Rake.application.options.trace
+
+    warn "#{name}: #{err} (#{err.class})" if trace || verbose
+    warn err.backtrace.join("\n  ") if trace
   end
 
   private

data/lib/hen/version.rb

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

data/lib/hens/gem.rake

@@ -82,6 +82,15 @@ Hen gem: :rdoc do
       :extra_rdoc_files, :files, :executables, :extensions
     ))
 
+    unless (local_files = Array(gem_options.delete(:local_files))).empty?
+      gem_options[:files].concat(local_files)
+
+      task :pkg     => local_files
+      task :compile => local_files
+
+      CLOBBER.include(*local_files)
+    end
+
     unless gem_options[:executables].empty?
       gem_options[:bindir] ||= File.dirname(gem_options[:executables].first)
       gem_options[:executables].map! { |executable| File.basename(executable) }
@@ -300,11 +309,12 @@ Hen gem: :rdoc do
   end
 
   if Rake.const_defined?(:ExtensionTask)
-    # gem_name    | extension name | ext_name
+    # gem_name       | ext_name  | extension name
     # ---------------------------------------
-    # libcdb-ruby | libcdb_ruby    | libcdb
-    # rb-gsl      | gsl_native     | gsl
-    # unicode     | unicode_native | unicode
+    # unicode        | unicode   | unicode_native
+    # libcdb-ruby    | libcdb    | libcdb_ruby
+    # ruby-filemagic | filemagic | ruby_filemagic
+    # rb-gsl         | gsl       | gsl_native
 
     gem_name_parts = gem_name.split('-')
     gem_name_parts.shift if gem_name_parts.first == 'rb'
@@ -312,27 +322,61 @@ Hen gem: :rdoc do
 
     extension_options[:name] ||= gem_name_parts.join('_')
 
-    ext_name = extension_options.delete(:ext_name) { gem_name_parts.first }
+    ext_name = extension_options.delete(:ext_name) {
+      gem_name_parts.find { |part| part != 'ruby' } }
 
     extension_options[:lib_dir] ||= File.join(['lib', ext_name, ENV['FAT_DIR']].compact)
     extension_options[:ext_dir] ||= File.join(['ext', ext_name].compact)
 
+    cross_config_options = nil
+
+    extension_options.delete_if { |key, val|
+      key =~ /\Awith_cross_(\w+)\z/ or next false
+      dir = ENV[key.to_s.upcase] or next true
+
+      cross_config_options ||= []
+
+      case res = val[dir]
+        when Array
+          inc, lib = res; lib = inc if res.size == 1
+
+          cross_config_options << "--with-#{$1}-include=#{inc}" if inc
+          cross_config_options << "--with-#{$1}-lib=#{lib}" if lib
+        when String
+          cross_config_options << "--with-#{$1}-dir=#{res}"
+      end
+    }
+
+    if cross_config_options
+      extension_options[:cross_config_options] ||= []
+      extension_options[:cross_config_options].concat(cross_config_options)
+    end
+
     unless extension_options.key?(:cross_compile)
-      extension_options[:cross_compile] = true
+      extension_options[:cross_compile] =
+        extension_options[:cross_config_options].is_a?(Array) ?
+          !extension_options[:cross_config_options].empty? : true
     end
 
     if extension_options[:cross_compile]
       extension_options[:cross_platform] ||= %w[x86-mswin32-60 x86-mingw32]
 
-      if ruby_versions = extension_options.delete(:ruby_versions)
+      if ruby_versions = extension_options.delete(:cross_ruby_versions)
         ENV['RUBY_CC_VERSION'] ||= Array(ruby_versions).join(':')
       end
 
+      if File.exist?(rc_config = File.expand_path('~/.rake-compiler/config.yml'))
+        ENV['RUBY_CC_VERSION'] ||= SafeYAML.load_file(rc_config).keys.
+                                     map { |k| k.split('-').last }.uniq.join(':')
+      end
+
       desc 'Build native gems'
       task 'gem:native' => %w[cross compile rake:native gem]
     end
 
     extension_task = Rake::ExtensionTask.new(nil, gem_spec) { |ext|
+      ext.cross_compiling(&extension_options.delete(:cross_compiling))
+
       set_options(ext, extension_options, 'Extension')
     }
 

data/lib/hens/rdoc.rake

@@ -61,21 +61,9 @@ Hen :rdoc do
     options:    rdoc_opts
   }
 
-  unless rdoc_files.empty? && rdoc_files_local.empty?
+  unless rdoc_files.empty?
     require 'rdoc/task'
 
-    class RDoc::Markup::ToLabel
-
-      alias_method :_hen_original_convert, :convert
-
-      def convert(*args)
-        _hen_original_convert(*args).gsub('%', '-').sub(/^-/, '')
-      end
-
-    end if defined?(RDoc::Markup::ToLabel)
-  end
-
-  unless rdoc_files.empty?
     RDoc::Task.new(:doc) { |rdoc|
       rdoc.rdoc_dir   = rdoc_dir
       rdoc.rdoc_files = rdoc_files
@@ -88,6 +76,8 @@ Hen :rdoc do
   end
 
   unless rdoc_files_local.empty?
+    require 'rdoc/task'
+
     RDoc::Task.new('doc:local') { |rdoc|
       rdoc.rdoc_dir   = rdoc_dir + '.local'
       rdoc.rdoc_files = rdoc_files_local

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hen
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -106,15 +106,28 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  hen-0.8.0 [2014-10-31]:
+  hen-0.8.1 [2014-12-19]:
 
-  * Removed support for legacy versions of RDoc, RSpec and RubyGems.
-  * Included workaround to make RDoc labels cross-browser compatible (issue
-    330[https://github.com/rdoc/rdoc/pull/330]).
+  * Removed workaround for RDoc issue 330. Implemented in RDoc 4.2.0.
+  * Renamed cross compile option +ruby_versions+ to +cross_ruby_versions+;
+    defaults to all versions defined in rake-compiler's <tt>config.yml</tt>.
+  * When +cross_config_options+ given, cross compilation is implicitly disabled
+    when they are empty or enabled when they are non-empty; override by setting
+    +cross_compile+ explicitly.
+  * Added support for <tt>with_cross_<library></tt> options; specify a proc that
+    accepts the <tt>WITH_CROSS_<LIBRARY></tt> environment variable, if set, and
+    returns a single directory for <tt>--with-<library>-dir</tt> or an array for
+    <tt>--with-<library>-include</tt> and <tt>--with-<library>-lib</tt> to be
+    added to +cross_config_options+.
+  * Added support for +cross_compiling+ option.
+  * Added support for +local_files+ option, i.e., generated files that should be
+    included in the package but not under version control.
+  * When determining the +ext_name+ option, a possible <tt>ruby-</tt> prefix is
+    ignored.
 
 rdoc_options:
 - "--title"
-- hen Application documentation (v0.8.0)
+- hen Application documentation (v0.8.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -135,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Just another project helper that integrates with Rake.