hen 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c232c55a5cbe822c33e81619bd7dc073164f7de
-  data.tar.gz: c56cdecd6cdd14d08271db95d1ab00c43da383f4
+  metadata.gz: 7f082dccc6c68ce2ac6dd82122bc73252f3e56aa
+  data.tar.gz: 577ca2a99cb316c4a654444d819dc330f652a537
 SHA512:
-  metadata.gz: c3f8c88313abdd18df8c3fab691ecd88159315fd4ac9f9b63cdb2a90a8f79c9ccec35a9dda29381818a29af2dee9e96bab3c7dfe292a6fc92af192a8a00b33df
-  data.tar.gz: 0ff2fed8e31f2618d6cfe493c5ed9de0ffbd0c9592d8921bb6acbd3d615688c7b5658b41ade1d0406e34e69b6a8216f04d50bdf13e73c0b2ac0f216dc4890db6
+  metadata.gz: 12c0385cfc7705247ba458c4cb6b8b3988cf73594167301fd35a529df83f4001826752e8436b889d2b9cebe628ec12809c56657109d2f250767250971c7305cb
+  data.tar.gz: ef0cccbbcaa0bddfc5b15f8d53a52130807003c36882c30e14b23b44f2dfe0b27a9bbfb0ed1db4e373824039dfc4d580b11a098e8920d7f4544d828ad35fae4d

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for hen
 
+== 0.4.9 [2013-10-25]
+
+* Added post install message to gem spec.
+* Refactored +hen+ executable into Hen::Command module.
+
 == 0.4.8 [2013-07-15]
 
 * Fall back to first local RDoc file for initial page.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.4.8
+This documentation refers to hen version 0.4.9
 
 
 == DESCRIPTION

data/bin/hen

@@ -30,150 +30,5 @@
 ###############################################################################
 #++
 
-# TODO: Implement 'list' action -- List available hens with their tasks (?)
-
-require 'fileutils'
-require 'nuggets/enumerable/minmax'
-
-require 'hen/cli'
-include Hen::CLI
-
-ACTIONS = {
-  'config'  => 'Create a fresh .henrc file',
-  'create'  => [
-    'Create a new project directory tree',
-    'Arguments: path [sample-skeleton]',
-    'Options: -g, --git [[remote=]url]'
-  ],
-  'help'    => 'Print this help and exit',
-  'list'    => 'List available hens with their tasks',
-  'version' => 'Display version number'
-}
-
-USAGE = <<EOT
-Usage: #{$0} {#{ACTIONS.keys.sort.join('|')}} [arguments] [options]
-       #{$0} [-h|--help] [--version]
-EOT
-
-abort USAGE if ARGV.empty?
-
-EXAMPLE = File.expand_path('../../example', __FILE__)
-
-case arg = ARGV.shift
-  when 'help', '-h', '--help'
-    puts USAGE
-    puts
-    puts 'Actions:'
-
-    max = ACTIONS.keys.max(:length)
-
-    ACTIONS.sort.each { |action, description|
-      description = [*description]
-      puts "  %-#{max}s - %s" % [action, description.shift]
-
-      description.each { |extra|
-        puts "  %#{max}s   + %s" % [' ', extra]
-      }
-    }
-  when 'version', '--version'
-    puts "hen v#{Hen::VERSION}"
-  when 'config'
-    render(File.join(EXAMPLE, '_henrc'), henrc = Hen.default_henrc)
-
-    puts
-    puts "Your .henrc has been created: #{henrc}. Now adjust it to your needs."
-  when 'create'
-    path = File.expand_path(ARGV.shift)
-    abort 'Path argument missing!' unless path
-
-    skel = ARGV.first !~ /\A-/ && ARGV.shift || File.join(EXAMPLE, 'project')
-    abort "Sample project tree not found: #{skel}" unless File.directory?(skel)
-
-    # Keep track of what's been created
-    created = []
-
-    if File.directory?(path)
-      abort "Target directory already exists: #{path}. Won't touch."
-    else
-      Dir.mkdir(path)
-      created << path
-    end
-
-    if git = ARGV.index('-g') || ARGV.index('--git')
-      ARGV.delete_at(git)
-      remote = ARGV.delete_at(git)
-
-      Dir.chdir(path) {
-        if system('git', 'init')
-          created << File.join(path, '.git')
-
-          if remote
-            url, label = remote.split('=', 2).reverse
-            system('git', 'remote', 'add', label ||= 'origin', url)
-
-            system('git', 'config', 'branch.master.remote', label)
-            system('git', 'config', 'branch.master.merge', 'refs/heads/master')
-          end
-        end
-      }
-    end
-
-    # Parts to be replaced by the user
-    replace = {}
-
-    begin
-      # We need the name here, so ask for it already.
-      progname = progname(File.basename(path))
-
-      Dir.chdir(skel) {
-        Dir['**/*'].each { |sample|
-          target = File.join(path, sample.gsub(/__progname__/, progname))
-
-          next if target.sub!(%r{(\A|/)[._](git[^/]+)\z}, '\1.\2') && !git
-
-          created << target
-
-          if File.directory?(sample)
-            FileUtils.mkdir_p(target)
-          else
-            replace[target] = render(sample, target).scan(/### .+ ###/)
-          end
-        }
-      }
-
-      # If we got here, everything went fine...
-      created.clear
-    ensure
-      # In case of an exception or premature program exit: Clean up!
-      created.reverse.each { |item|
-        next unless File.exist?(item)
-
-        begin
-          (File.directory?(item) ? Dir : File).unlink(item)
-        rescue Errno::ENOTEMPTY => err
-          File.basename(item) == '.git' ? FileUtils.rm_rf(item) : raise(err)
-        end
-      }
-    end
-
-    puts
-    puts "Your new project directory has been created: #{path}. Have fun!"
-
-    replace.each { |target, details|
-      next if details.empty?
-
-      puts
-      puts "#{target}:"
-
-      details.each { |detail|
-        puts "  #{detail}"
-      }
-    }
-  when 'list'
-    # How to achieve? Has to list *all* hens and tasks made available therein,
-    # *regardless* of any missing prerequisites (preferably indicating whether
-    # a particular hen/task is currently available).
-    abort 'Sorry, not yet available...'
-  else
-    abort "Illegal action: #{arg}\n#{USAGE}"
-end
+require 'hen/commands'
+Hen::Commands[ARGV.shift || 'usage']

data/lib/hen/commands.rb

@@ -0,0 +1,190 @@
+#--
+###############################################################################
+#                                                                             #
+# hen -- Just a Rake helper                                                   #
+#                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# hen is free software; you can redistribute it and/or modify it under the    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# hen is distributed in the hope that it will be useful, but WITHOUT ANY      #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with hen. If not, see <http://www.gnu.org/licenses/>.                 #
+#                                                                             #
+###############################################################################
+#++
+
+# TODO: Implement 'list' command -- List available hens with their tasks (?)
+
+require 'nuggets/argv/option'
+require 'nuggets/enumerable/minmax'
+
+require 'hen/cli'
+
+class Hen
+
+  module Commands
+
+    extend self
+
+    extend CLI
+
+    COMMANDS = {
+      'config'  => 'Create a fresh .henrc file',
+      'create'  => [
+        'Create a new project directory tree',
+        'Arguments: path [sample-skeleton]',
+        'Options: -g, --git [[remote=]url]'
+      ],
+      'help'    => 'Print this help and exit',
+     #'list'    => 'List available hens with their tasks',
+      'version' => 'Display version number'
+    }
+
+    USAGE = <<-EOT
+Usage: #{$0} {#{COMMANDS.keys.sort.join('|')}} [arguments] [options]
+       #{$0} [-h|--help] [--version]
+    EOT
+
+    SKELETON = File.expand_path('../../../example', __FILE__)
+
+    GIT_RE = %r{(\A|/)[._](git[^/]+)\z}
+
+    def [](arg)
+      arg = arg.sub(/\A-+/, '')
+      arg !~ /\W/ && public_method_defined?(arg) ? send(arg) : method_missing(arg)
+    end
+
+    def usage
+      abort USAGE
+    end
+
+    def help
+      puts USAGE
+      puts
+      puts 'Commands:'
+
+      max = COMMANDS.keys.max(:length)
+
+      COMMANDS.sort.each { |cmd, desc|
+        puts "  %-#{max}s - %s" % [cmd, (desc = [*desc]).shift]
+        desc.each { |extra| puts "  %#{max}s   + %s" % [' ', extra] }
+      }
+    end
+
+    alias_method :h, :help
+
+    def list
+      # How to achieve? Has to list *all* hens and tasks made available therein,
+      # *regardless* of any missing prerequisites (preferably indicating whether
+      # a particular hen/task is currently available).
+      abort 'Sorry, not yet available...'
+    end
+
+    def version
+      puts "hen v#{VERSION}"
+    end
+
+    def config
+      render(File.join(SKELETON, '_henrc'), henrc = Hen.default_henrc)
+
+      puts
+      puts "Your .henrc has been created: #{henrc}. Now adjust it to your needs."
+    end
+
+    def create
+      abort 'Path argument missing!' unless path = ARGV.shift
+
+      skel = ARGV.first !~ /^-/ && ARGV.shift || File.join(SKELETON, 'project')
+      abort "Project skeleton not found: #{skel}" unless File.directory?(skel)
+
+      create_path(path = File.expand_path(path), created = [])
+      create_skel(path, skel = File.expand_path(skel), created, replace = {})
+
+      puts
+      puts "Your new project directory has been created: #{path}. Have fun!"
+
+      replace.each { |target, details|
+        puts ["\n#{target}:", *details].join("\n  ") unless details.empty?
+      }.clear
+    end
+
+    private
+
+    def method_missing(method, *)
+      abort "Illegal command: #{method}\n#{USAGE}"
+    end
+
+    def create_path(path, created)
+      if File.directory?(path)
+        abort "Target directory already exists: #{path}. Won't touch."
+      else
+        Dir.mkdir(path)
+        created << path
+      end
+    end
+
+    def create_skel(path, skel, created, replace)
+      git = create_git(path, created)
+
+      progname = progname(File.basename(path))
+
+      Dir.chdir(skel) {
+        Dir['**/*'].each { |sample|
+          target = File.join(path, sample.gsub(/__progname__/, progname))
+
+          unless target.sub!(GIT_RE, '\1.\2') && !git
+            created << target
+
+            File.directory?(sample) ? FileUtils.mkdir_p(target) :
+              replace[target] = render(sample, target).scan(/### .+ ###/)
+          end
+        }
+      }
+
+      created.clear
+    ensure
+      created.reverse_each { |item|
+        if File.exist?(item)
+          begin
+            (File.directory?(item) ? Dir : File).unlink(item)
+          rescue Errno::ENOTEMPTY
+            File.basename(item) == '.git' ? FileUtils.rm_rf(item) : raise
+          end
+        end
+      }.clear
+    end
+
+    def create_git(path, created)
+      ARGV.option!(:g, :git) { |remote|
+        Dir.chdir(path) {
+          if system('git', 'init')
+            created << File.join(path, '.git')
+
+            if remote
+              url, label = remote.split('=', 2).reverse
+              system('git', 'remote', 'add', label ||= 'origin', url)
+
+              system('git', 'config', 'branch.master.remote', label)
+              system('git', 'config', 'branch.master.merge', 'refs/heads/master')
+            end
+          end
+        }
+
+        true
+      }
+    end
+
+  end
+
+end

data/lib/hen/version.rb

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

data/lib/hens/gem.rake

@@ -63,10 +63,33 @@ Hen :gem => :rdoc do
 
     warn 'Gem author(s) missing' if authors.empty?
 
-    ### description
+    ### description, post_install_message
 
     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
+        msg, ver = [], gem_options[:version].sub(/\.?[^\d.].*/, '')
+
+        heading, found = /\A== (#{Regexp.escape(ver)}\D.*)/o, false
+
+        File.foreach(ENV['HEN_CHANGELOG'] || 'ChangeLog') { |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?
+      when false
+      else post_install_message
+    end
+
     ### rubyforge project, homepage
 
     gem_options[:rubyforge_project] ||= rf_config[:project]

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: hen
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal
@@ -51,6 +51,7 @@ extra_rdoc_files:
 files:
 - lib/hen.rb
 - lib/hen/cli.rb
+- lib/hen/commands.rb
 - lib/hen/dsl.rb
 - lib/hen/version.rb
 - bin/hen
@@ -75,31 +76,37 @@ homepage: http://github.com/blackwinter/hen
 licenses:
 - AGPL
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  hen-0.4.9 [2013-10-25]:
+
+  * Added post install message to gem spec.
+  * Refactored +hen+ executable into Hen::Command module.
+
 rdoc_options:
-- --charset
+- "--charset"
 - UTF-8
-- --line-numbers
-- --all
-- --title
-- hen Application documentation (v0.4.8)
-- --main
+- "--line-numbers"
+- "--all"
+- "--title"
+- hen Application documentation (v0.4.9)
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.