hen 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 411e49bf6115cade4f5c44b8040bfb5964e77d31
-  data.tar.gz: 8c4647e28461ff1e49fd0768bae8b26d137b64b2
+  metadata.gz: d550997b7aaa45957a960114ce0343e5dd27cb29
+  data.tar.gz: 7fd60ffa855f0735cc37eb52900210ee043f1a42
 SHA512:
-  metadata.gz: 4477dad2ec9f108fd5a8705c09c2e7d3175355ed68a5216f3c8ba6de25b0efcd4c1ecac19f97ed0bb1a6683755320ff9463f60c22b6a7f8a1b012a83b278bc3d
-  data.tar.gz: b3fade51de0c9b7f065285570fd425816faf0b965a07f58aeb05550a42fcfdaac7038fd0f60ea44c30a57143ac737ed1fb69f313c40e537c3a74bddc91fd346a
+  metadata.gz: 76f095d06132a9ca99ccf20cf5c792a4b5da7e00975d2bd6912a5939f02806d4820b7013483e4929fe3e2ebb71422ea1515cb85e957aa7576b07761877707722
+  data.tar.gz: 5be59b9729067e560edb255c97e96a14e14a691c9332eb22228f5f486f81540eb6975576953af71dde076d359795319620644c2a15d8c1294419ced542414004

data/ChangeLog

@@ -2,18 +2,27 @@
 
 = Revision history for hen
 
+== 0.7.0 [2014-10-07]
+
+* Require at least Ruby 1.9.3.
+* Task <tt>doc:publish:github</tt> cleans up before adding new files.
+* Task <tt>doc:publish:github</tt> performs local clone and shallow checkout
+  instead of fetching the full history.
+* When setting +post_install_message+, gem files are searched for log file;
+  specify +HEN_CHANGELOG+ to override.
+
 == 0.6.3 [2014-08-01]
 
 * Added general support for other variables in skeleton paths.
-* Ignore missing ChangeLog for post_install_message.
+* Ignore missing ChangeLog for +post_install_message+.
 * Housekeeping.
 
 == 0.6.2 [2014-05-13]
 
-* Avoid circular dependency for 'gem:native' task.
+* Avoid circular dependency for <tt>gem:native</tt> task.
 * Added default dependency for rake-compiler.
 * Updated sample project skeleton.
-* New DSL method 'tasks'.
+* New DSL method +tasks+.
 
 == 0.6.1 [2014-04-24]
 
@@ -22,17 +31,17 @@
 == 0.6.0 [2014-04-14]
 
 * Essential development dependencies are added automatically.
-* New task 'gem:dependencies:install'.
+* New task <tt>gem:dependencies:install</tt>.
 * Dropped support for RubyForge (EOL on May 15th).
 * New projects to require at least Ruby 1.9.3.
-* Added .travis.yml to project skeleton.
+* Added +.travis.yml+ to project skeleton.
 * Use GitHub as default remote when creating a Git-backed project.
 * Use SafeYAML when loading configuration files.
 
 == 0.5.1 [2014-03-31]
 
 * Improved extension name handling.
-* Only define 'gem:native' task when cross-compiling.
+* Only define <tt>gem:native</tt> task when cross-compiling.
 * Avoid circular require.
 
 == 0.5.0 [2013-12-19]
@@ -59,14 +68,14 @@
 
 == 0.4.6 [2012-04-05]
 
-* Fixed `hen version`.
+* Fixed <tt>hen version</tt>.
 * Added debug info for extension tasks.
 
 == 0.4.5 [2012-01-20]
 
 * Publish native Gems.
 * Build and publish Meta-Gems.
-* Renamed Meta-Gem option 'extras' to 'dependencies'.
+* Renamed Meta-Gem option +extras+ to +dependencies+.
 * Fixed Ruby warnings.
 
 == 0.4.4 [2012-01-18]
@@ -81,17 +90,17 @@
 
 == 0.4.2 [2012-01-09]
 
-* New option 'meta' to build meta-gems.
+* New option +meta+ to build meta-gems.
 
 == 0.4.1 [2012-01-02]
 
-* Make 'release' depend on 'doc:publish'.
+* Make +release+ depend on <tt>doc:publish</tt>.
 
 == 0.4.0 [2011-09-21]
 
 * Use env ruby.
-* New task 'gem:dependencies'.
-* Don't undefine `object_id' for (pseudo-)objects.
+* New task <tt>gem:dependencies</tt>.
+* Don't undefine +object_id+ for (pseudo-)objects.
 
 == 0.3.9 [2011-05-24]
 
@@ -130,11 +139,11 @@
 == 0.3.1 [2011-02-11]
 
 * Fixed the RubyForge release task name in the prerequisite list for the
-  <tt>:release</tt> task.
+  <tt>release</tt> task.
 
 == 0.3.0 [2011-02-11]
 
-* Implementations for <tt>doc:publish</tt> and <tt>:release</tt> are
+* Implementations for <tt>doc:publish</tt> and <tt>release</tt> are
   now cumulative.
 * The configuration (through the user's <tt>.henrc</tt> files) is now
   cumulative.
@@ -143,13 +152,13 @@
 * Ignoring untracked files when building the official documentation and
   when building the Gem.
   * Added new task <tt>doc:local</tt> for the previous +doc+ behaviour.
-* Renamed <tt>:gemspec</tt> -> <tt>gem:spec</tt>, <tt>gemspec:update</tt>
+* Renamed <tt>gemspec</tt> -> <tt>gem:spec</tt>, <tt>gemspec:update</tt>
   -> <tt>gem:spec:update</tt>.
 * New task <tt>gem:install</tt> to install the current Gem locally.
 * Added support for RDoc 2/3.
-* Recognize <tt>:legacy</tt> option in <tt>:spec</tt> options to force
+* Recognize <tt>legacy</tt> option in <tt>spec</tt> options to force
   RSpec 1 even when RSpec 2 is available. Same for RDoc 2 vs. 3.
-* Added support for easy GitHub homepage by setting <tt>:homepage</tt>
+* Added support for easy GitHub homepage by setting <tt>homepage</tt>
   option to a symbol that identifies the GitHub user name.
 * Better defaults for <tt>hen create/config</tt>.
 * Hen::CLI#render makes a backup before overwriting an existing file.
@@ -157,7 +166,7 @@
 * The +gemcutter+ helper has been deprecated; use +rubygems+ instead.
 * Some defaults are set in Hen files rather than relying on <tt>.henrc</tt>
   file.
-* No longer messing with RubyGems/$LOAD_PATH.
+* No longer messing with RubyGems/<tt>$LOAD_PATH</tt>.
 
 == 0.2.7 [2011-01-24]
 
@@ -170,7 +179,7 @@
 
 == 0.2.5 [2011-01-07]
 
-* Handle rcov.opts file for RSpec 2
+* Handle +rcov.opts+ file for RSpec 2
 * Optionally set custom zip command for package task
 
 == 0.2.4 [2011-01-06]
@@ -211,7 +220,7 @@
 
 == 0.1.6 [2009-01-26]
 
-* Ignore nonexistent spec.opts file
+* Ignore nonexistent +spec.opts+ file
 
 == 0.1.5 [2009-01-22]
 
@@ -232,7 +241,7 @@
 == 0.1.1 [2008-07-29]
 
 * Added task to run specs with RCov
-* Added option to specify spec_helper which will be loaded first
+* Added option to specify +spec_helper+ which will be loaded first
 
 == 0.1.0 [2008-05-21]
 
@@ -248,31 +257,31 @@
 
 == 0.0.7 [2008-02-01]
 
-* Search HENPATH for available hens, allowing to easily add custom hens
-* Added sample custom hen file ('example/hens/sample.rake')
-* Refined 'gem' and 'rdoc' hens
-* Added 'hen version' command
+* Search +HENPATH+ for available hens, allowing to easily add custom hens
+* Added sample custom hen file (+example/hens/sample.rake+)
+* Refined +gem+ and +rdoc+ hens
+* Added <tt>hen version</tt> command
 
 == 0.0.6 [2008-01-09]
 
-* Added basic sample project tree (skeleton for 'hen create')
-* Lazily find and load .henrc
+* Added basic sample project tree (skeleton for <tt>hen create</tt>)
+* Lazily find and load +.henrc+
 * Some polishing and fixes
 
 == 0.0.5 [2008-01-08]
 
-* Replaced 'hen' executable stub with something actually useful
+* Replaced +hen+ executable stub with something actually useful
 * Added Hen::CLI helper module
 
 == 0.0.4 [2008-01-07]
 
-* Added Test::Unit and RSpec hens (tasks 'test' and 'spec')
+* Added Test::Unit and RSpec hens (tasks +test+ and +spec+)
 * Removed HenError stuff
 
 == 0.0.3 [2008-01-04]
 
 * More cleanup and maturing
-* New tasks 'release' (formerly 'upload_gem'), 'publish_docs', and 'debug_gem'
+* New tasks +release+ (formerly +upload_gem+), +publish_docs+, and +debug_gem+
 * All in all: Pretty much inspired by Hoe ;-)
 
 == 0.0.2 [2007-12-21]

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.6.3
+This documentation refers to hen version 0.7.0
 
 
 == DESCRIPTION

data/Rakefile

@@ -1,18 +1,22 @@
-$:.unshift(File.expand_path('../lib', __FILE__))
-
-require 'hen'
+require_relative 'lib/hen'
 
 Hen.lay! {{
-  :gem => {
-    :name         => %q{hen},
-    :version      => Hen::VERSION,
-    :summary      => %q{Just another project helper that integrates with Rake.},
-    :description  => %q{A Rake helper framework, similar to Hoe or Echoe.},
-    :author       => %q{Jens Wille},
-    :email        => %q{jens.wille@gmail.com},
-    :license      => %q{AGPL-3.0},
-    :homepage     => :blackwinter,
-    :extra_files  => FileList['lib/hens/*.rake'].to_a,
-    :dependencies => %w[highline nuggets safe_yaml]
+  gem: {
+    name:         %q{hen},
+    version:      Hen::VERSION,
+    summary:      %q{Just another project helper that integrates with Rake.},
+    description:  %q{A Rake helper framework, similar to Hoe or Echoe.},
+    author:       %q{Jens Wille},
+    email:        %q{jens.wille@gmail.com},
+    license:      %q{AGPL-3.0},
+    homepage:     :blackwinter,
+    extra_files:  FileList['lib/hens/*.rake'].to_a,
+    dependencies: {
+      highline:  '~> 1.6',
+      nuggets:   '~> 1.0',
+      safe_yaml: '~> 1.0'
+    },
+
+    required_ruby_version: '>= 1.9.3'
   }
 }}

data/example/project/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/<%= progname %>/version}, __FILE__)
+require_relative 'lib/<%= progname %>/version'
 
 begin
   require 'hen'

data/lib/hen.rb

@@ -34,8 +34,8 @@ require 'nuggets/env/user_home'
 require 'nuggets/hash/deep_merge'
 require 'nuggets/proc/bind'
 
-require 'hen/dsl'
-require 'hen/version'
+require_relative 'hen/dsl'
+require_relative 'hen/version'
 
 # The class handling the program logic. This is what you use in your Rakefile.
 # See the README for more information.
@@ -78,7 +78,7 @@ class Hen
     # call-seq:
     #   lay!
     #   lay!(:some_hen, :some_other_hen)
-    #   lay!(:exclude => [:some_hen, :some_other_hen])
+    #   lay!(exclude: [:some_hen, :some_other_hen])
     #
     # Loads the hens, causing them to lay their eggs^H^H^Htasks. Either all,
     # if no restrictions are specified, or the given hens, or all but those
@@ -182,7 +182,7 @@ class Hen
       hash = Hash.new { |h, k| h[k] = {} }
 
       henrc.each { |path|
-        yaml = SafeYAML.load_file(path, :deserialize_symbols => true)
+        yaml = SafeYAML.load_file(path, deserialize_symbols: true)
         hash.deep_update(yaml) if yaml.is_a?(Hash)
       }
 

data/lib/hen/commands.rb

@@ -30,7 +30,7 @@ require 'fileutils'
 require 'nuggets/argv/option'
 require 'nuggets/enumerable/minmax'
 
-require 'hen/cli'
+require_relative 'cli'
 
 class Hen
 

data/lib/hen/dsl.rb

@@ -273,10 +273,19 @@ class Hen
           clone '-n', '-o', remote, url, dir
         end
 
+        def local_clone(dir, src = '.')  # :nodoc:
+          clone '-n', src, dir
+        end
+
         def checkout_remote_branch(remote, branch = 'master')  # :nodoc:
           checkout '-b', branch, "#{remote}/#{branch}"
         end
 
+        def checkout_fetched_branch(url, branch = 'master')  # :nodoc:
+          fetch '--depth', '1', url, branch
+          checkout '-b', branch, 'FETCH_HEAD'
+        end
+
         def add_and_commit(msg)  # :nodoc:
           add '.'
           commit '-m', msg

data/lib/hen/version.rb

@@ -3,8 +3,8 @@ class Hen
   module Version
 
     MAJOR = 0
-    MINOR = 6
-    TINY  = 3
+    MINOR = 7
+    TINY  = 0
 
     class << self
 

data/lib/hens/gem.rake

@@ -1,23 +1,23 @@
-Hen :gem => :rdoc do
+Hen gem: :rdoc do
   # Dependencies:
   # * rdoc -- Uses RDOC_OPTIONS and 'doc:publish' task
 
   gem_options = {
-    :files => FileList[
+    files: FileList[
       'lib/**/*.rb',
       'bin/*'
     ].to_a,
-    :default_extra_files => FileList[
+    default_extra_files: FileList[
       '[A-Z]*',
       'example/**/*',
       'ext/**/*',
       'spec/**/*', '.rspec',
       'test/**/*', '.autotest'
     ].to_a,
-    :extensions => FileList[
+    extensions: FileList[
       'ext/**/extconf.rb'
     ].to_a,
-    :require_path => 'lib'
+    require_path: 'lib'
   }.update(config[:gem])
 
   gem_klass = begin
@@ -60,37 +60,10 @@ Hen :gem => :rdoc do
 
     warn 'Gem author(s) missing' if authors.empty?
 
-    ### description, post_install_message
+    ### description
 
     gem_options[:description] ||= gem_options[:summary]
 
-    post_install_message = gem_options[:post_install_message]
-
-    gem_options[:post_install_message] = case post_install_message
-      when nil, true
-        if File.readable?(log = ENV['HEN_CHANGELOG'] || 'ChangeLog')
-          msg, ver = [], gem_options[:version].sub(/\.?[^\d.].*/, '')
-
-          heading, found = /\A== (#{Regexp.escape(ver)}\D.*)/o, false
-
-          File.foreach(log) { |line|
-            line.chomp!
-
-            case line
-              when heading then msg << "#{gem_name}-#{found = $1}:"
-              when /\A== / then break if found
-              else msg << line if found
-            end
-          }
-
-          "\n#{msg.join("\n").strip}\n\n" unless msg.empty?
-        elsif post_install_message
-          warn "File not found: #{log}. Skipping post_install_message." if Hen.verbose
-        end
-      when false
-      else post_install_message
-    end
-
     ### homepage
 
     if homepage = gem_options[:homepage]
@@ -124,6 +97,38 @@ Hen :gem => :rdoc do
       gem_options[:executables].map! { |executable| File.basename(executable) }
     end
 
+    ## post_install_message
+
+    post_install_message = gem_options[:post_install_message]
+
+    gem_options[:post_install_message] = case post_install_message
+      when nil, true
+        log = ENV['HEN_CHANGELOG'] || gem_options[:files].grep(
+          %r{\A(?:change(?:s|log)|history)[^/]*\z}i).first || 'ChangeLog'
+
+        if File.readable?(log)
+          msg, ver = [], gem_options[:version].sub(/\.?[^\d.].*/, '')
+
+          heading, found = /\A== (#{Regexp.escape(ver)}\D.*)/o, false
+
+          File.foreach(log) { |line|
+            line.chomp!
+
+            case line
+              when heading then msg << "#{gem_name}-#{found = $1}:"
+              when /\A== / then break if found
+              else msg << line if found
+            end
+          }
+
+          "\n#{msg.join("\n").strip}\n\n" unless msg.empty?
+        elsif post_install_message
+          warn "File not found: #{log}. Skipping post_install_message." if Hen.verbose
+        end
+      when false
+      else post_install_message
+    end
+
     ### dependencies
 
     dependencies             = Array(gem_options.delete(:dependencies))
@@ -400,7 +405,7 @@ Hen :gem => :rdoc do
     end
 
     desc release_desc; release_desc = nil
-    task :release => 'gem:push'
+    task release: 'gem:push'
 
   end
 
@@ -422,13 +427,13 @@ Hen :gem => :rdoc do
 
   end
 
-  %w[doc:publish release:tag].each { |t| task :release => t if have_task?(t) }
+  %w[doc:publish release:tag].each { |t| task release: t if have_task?(t) }
 
   def write_gemspec(gem_spec)
     file = "#{gem_spec.name}.gemspec"
     action = File.exists?(file) ? 'Updated' : 'Created'
 
-    File.open(file, 'w') { |f| f.puts gem_spec.to_ruby }
+    File.write(file, gem_spec.to_ruby)
 
     puts "#{action} #{file}"
   end

data/lib/hens/rdoc.rake

@@ -1,13 +1,13 @@
 Hen :rdoc do
 
   rdoc_options = {
-    :rdoc_dir       => 'doc',
-    :rdoc_files     => %w[README COPYING ChangeLog lib/**/*.rb ext/**/*.c],
-    :title          => '{name:%s }Application documentation{version: (v%s)}',
-    :charset        => 'UTF-8',
-    :inline_source  => true,
-    :line_numbers   => true,
-    :all            => true
+    rdoc_dir:       'doc',
+    rdoc_files:     %w[README COPYING ChangeLog lib/**/*.rb ext/**/*.c],
+    title:          '{name:%s }Application documentation{version: (v%s)}',
+    charset:        'UTF-8',
+    inline_source:  true,
+    line_numbers:   true,
+    all:            true
   }.update(config[:rdoc])
 
   rdoc_klass = begin
@@ -47,7 +47,7 @@ Hen :rdoc do
   rdoc_files_local = rdoc_files.dup
 
   if mangle_files!(rdoc_files)
-    mangle_files!(rdoc_files_local, :managed => false)
+    mangle_files!(rdoc_files_local, managed: false)
   else
     rdoc_files_local = []
   end
@@ -61,9 +61,9 @@ Hen :rdoc do
 
   # Make settings available to other hens
   RDOC_OPTIONS = {
-    :rdoc_dir   => rdoc_dir,
-    :rdoc_files => rdoc_files,
-    :options    => rdoc_opts
+    rdoc_dir:   rdoc_dir,
+    rdoc_files: rdoc_files,
+    options:    rdoc_opts
   }
 
   unless rdoc_files.empty?
@@ -118,15 +118,16 @@ Hen :rdoc do
       task 'doc:publish:github' => :doc do
         rm_rf clone_dir
 
-        git.easy_clone pages_url, clone_dir, git_remote
+        git.local_clone clone_dir
 
         Dir.chdir(clone_dir) {
-          git.checkout_remote_branch git_remote, git_branch
+          git.checkout_fetched_branch pages_url, git_branch
 
+          rm_r Dir['*']
           cp_r Dir["../#{rdoc_task.rdoc_dir}/*"], '.'
 
           git.add_and_commit 'Updated documentation.'
-          git.push git_remote, git_branch
+          git.push pages_url, git_branch
         }
       end
 

data/lib/hens/spec.rake

@@ -1,9 +1,9 @@
 Hen :spec do
 
   spec_options = {
-    :pattern => 'spec/**/*_spec.rb',
-    :helper  => 'spec/spec_helper.rb',
-    :options => 'spec/spec.opts'
+    pattern: 'spec/**/*_spec.rb',
+    helper:  'spec/spec_helper.rb',
+    options: 'spec/spec.opts'
   }.update(config[:spec])
 
   spec_klass = begin
@@ -23,7 +23,7 @@ Hen :spec do
   spec_files = spec_options.delete(:files) ||
       FileList[spec_options.delete(:pattern)].to_a
 
-  mangle_files!(spec_files, :managed => false)
+  mangle_files!(spec_files, managed: false)
 
   unless spec_files.empty?
     raise load_error if load_error

data/lib/hens/test.rake

@@ -3,13 +3,13 @@ Hen :test do
   require 'rake/testtask'
 
   test_options = {
-    :pattern => 'test/**/*_test.rb'
+    pattern: 'test/**/*_test.rb'
   }.update(config[:test])
 
   test_files = test_options.delete(:files) ||
       FileList[test_options.delete(:pattern)].to_a
 
-  mangle_files!(test_files, :managed => false)
+  mangle_files!(test_files, managed: false)
 
   unless test_files.empty?
     Rake::TestTask.new { |t|

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hen
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,15 +106,18 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  hen-0.6.3 [2014-08-01]:
+  hen-0.7.0 [2014-10-07]:
 
-  * Added general support for other variables in skeleton paths.
-  * Ignore missing ChangeLog for post_install_message.
-  * Housekeeping.
+  * Require at least Ruby 1.9.3.
+  * Task <tt>doc:publish:github</tt> cleans up before adding new files.
+  * Task <tt>doc:publish:github</tt> performs local clone and shallow checkout
+    instead of fetching the full history.
+  * When setting +post_install_message+, gem files are searched for log file;
+    specify +HEN_CHANGELOG+ to override.
 
 rdoc_options:
 - "--title"
-- hen Application documentation (v0.6.3)
+- hen Application documentation (v0.7.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -127,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -135,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Just another project helper that integrates with Rake.