hen 0.0.6.166 → 0.0.6.183

data/Rakefile

@@ -13,6 +13,6 @@ Hen.lay! {{
                      "helper that fits my own personal style.",
     :files        => FileList['lib/**/*.rb', 'bin/*'].to_a,
     :extra_files  => FileList['[A-Z]*', 'lib/hens/*.rake', 'example/*', 'example/.henrc'].to_a,
-    :dependencies => ['rubyforge', ['ruby-nuggets', '>= 0.0.3']]
+    :dependencies => ['rubyforge', ['ruby-nuggets', '>= 0.0.4']]
   }
 }}

data/bin/hen

@@ -28,7 +28,10 @@
 ###############################################################################
 #++
 
-# TODO: Add 'list' - List available hens with their tasks (?)
+# TODO: Implement 'list' action -- List available hens with their tasks (?)
+
+require 'rubygems'
+require 'nuggets/enumerable/minmax'
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
@@ -38,13 +41,17 @@ require 'hen/cli'
 include Hen::CLI
 
 ACTIONS = {
-  'config' => 'Create a fresh .henrc file',
-  'create' => 'Create a new project directory tree',
-  'list'   => 'List available hens with their tasks'
+  'config'  => 'Create a fresh .henrc file',
+  'create'  => [
+    'Create a new project directory tree',
+    'Arguments: path [sample-skeleton]'
+  ],
+  'list'    => 'List available hens with their tasks',
+  'version' => 'Display version number'
 }
 
 USAGE = <<EOT
-Usage: #{$0} {#{ACTIONS.keys.sort.join('|')}}
+Usage: #{$0} {#{ACTIONS.keys.sort.join('|')}} [action-arguments]
        #{$0} [-h|--help]
 EOT
 
@@ -58,27 +65,29 @@ case action = ARGV.shift
     puts
     puts 'Actions:'
 
-    m = ACTIONS.keys.map { |a| a.length }.max
+    max = ACTIONS.keys.max(:length)
+
+    ACTIONS.sort.each { |act, desc|
+      desc = [*desc]
+      puts "  %-#{max}s - %s" % [act, desc.shift]
 
-    ACTIONS.sort.each { |a, d|
-      puts "  %-#{m}s - %s" % [a, d]
+      desc.each { |extra|
+        puts "  %#{max}s   + %s" % [' ', extra]
+      }
     }
+  when 'version', '--version'
+    puts "hen v#{Hen::VERSION}"
   when 'config'
-    henrc = File.join(EXAMPLE, '.henrc')
-
-    # TODO: DRY up with lib/hen.rb
-    target = File.join(ENV['HOME'] || File.expand_path('~'), '.henrc')
-
-    render(henrc, target)
+    render(File.join(EXAMPLE, '.henrc'), henrc = Hen.henrc(false))
 
     puts
-    puts "Your .henrc has been created: #{target}. Modify to your needs."
+    puts "Your .henrc has been created: #{henrc}. Now modify it to your needs."
   when 'create'
     path = File.expand_path(ARGV.shift)
     abort 'Path argument missing!' unless path
 
-    template = File.join(EXAMPLE, 'project')
-    abort "Sample project tree not found: #{template}" unless File.directory?(template)
+    skel = ARGV.shift || File.join(EXAMPLE, 'project')
+    abort "Sample project tree not found: #{skel}" unless File.directory?(skel)
 
     if File.directory?(path)
       abort "Target directory already exists: #{path}. Won't touch."
@@ -87,15 +96,17 @@ case action = ARGV.shift
     end
 
     # Parts to be replaced by the user
-    replacements = {}
+    replace = {}
 
     begin
       # Keep track of what's been created
       created = [path]
 
-      progname = ask!("Program's name")
+      # We need the name here so ask for it already. Additionally, it's
+      # a good opportunity to make sure the user's .henrc is available.
+      progname = ask!("Program's name", true)
 
-      Dir.chdir(template) {
+      Dir.chdir(skel) {
         Dir['**/*'].each { |sample|
           target = File.join(path, sample.gsub(/__progname__/, progname))
           created << target
@@ -103,8 +114,7 @@ case action = ARGV.shift
           if File.directory?(sample)
             Dir.mkdir(target)
           else
-            content = render(sample, target)
-            replacements[target] = content.scan(/### .* ###/)
+            replace[target] = render(sample, target).scan(/### .* ###/)
           end
         }
       }
@@ -113,25 +123,28 @@ case action = ARGV.shift
       created.clear
     ensure
       # In case of an exception or premature program exit: Clean up!
-      created.reverse.each { |target|
-        (File.directory?(target) ? Dir : File).unlink(target)
+      created.reverse.each { |p|
+        (File.directory?(p) ? Dir : File).unlink(p) if File.readable?(p)
       }
     end
 
     puts
-    puts "Your new project directory has been created: #{path}"
+    puts "Your new project directory has been created: #{path}. Have fun!"
 
-    replacements.each { |target, parts|
-      next if parts.empty?
+    replace.each { |target, details|
+      next if details.empty?
 
       puts
       puts "#{target}:"
 
-      parts.each { |part|
-        puts "  #{part}"
+      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: #{action}\n#{USAGE}"

data/lib/hen.rb

@@ -93,7 +93,13 @@ class Hen
       # Execute each hen definition
       hens.each { |name, hen|
         # Load any dependencies, in case they're not included yet
-        load_hens(*hen.dependencies)
+        begin
+          load_hens(*hen.dependencies)
+        rescue LoadError => err
+          warn "#{name}: Required dependency missing: " <<
+               File.basename(err.to_s, '.rake') if verbose
+          next
+        end
 
         hen.lay!
       }
@@ -124,19 +130,8 @@ class Hen
     #   henrc => aString
     #
     # The path to the user's .henrc
-    def henrc
-      @henrc ||= if henrc = ENV['HENRC']
-        abort "The specified .henrc file could not be found: #{henrc}" \
-          unless File.readable?(henrc)
-
-        henrc
-      else
-        RCDIRS.find { |path|
-          henrc = File.join(path, '.henrc')
-          break henrc if File.readable?(henrc)
-        } or abort "No .henrc file could be found! Please " <<
-                   "create one first by running 'hen config'."
-      end
+    def henrc(must_exist = true)
+      @henrc ||= find_henrc(must_exist)
     end
 
     # call-seq:
@@ -149,10 +144,9 @@ class Hen
     #
     # Example:
     #   config('a/b/c')  #=> @config[:a][:b][:c]
-    def config(key = default = Object.new)
+    def config(key = nil)
       @config ||= YAML.load_file(henrc)
-
-      return @config if key == default
+      return @config unless key
 
       key.split('/').inject(@config) { |value, k|
         value.fetch(k.to_sym)
@@ -162,6 +156,29 @@ class Hen
 
     private
 
+    # call-seq:
+    #   find_henrc(must_exist = true) => aString
+    #
+    # Search for a readable .henrc, or, if +must_exist+ is false, just return a
+    # suitable default location.
+    def find_henrc(must_exist = true)
+      return ENV['HENRC'] || File.join(RCDIRS.last, '.henrc') unless must_exist
+
+      if    henrc = ENV['HENRC']
+        abort "The specified .henrc file could not be found: #{henrc}" \
+          unless File.readable?(henrc)
+      elsif henrc = RCDIRS.find { |p|
+        h = File.join(p, '.henrc')
+        break h if File.readable?(h)
+      }
+      else
+        abort "No .henrc file could be found! Please " <<
+              "create one first by running 'hen config'."
+      end
+
+      henrc
+    end
+
     # call-seq:
     #   load_hens(*hens)
     #   load_hens(*hens) { |hen_name| ... }

data/lib/hen/cli.rb

@@ -40,17 +40,17 @@ module Hen::CLI
 
   # Ask the user to enter an appropriate value for +key+. Uses
   # already stored answer if present, unless +cached+ is false.
-  def ask(key, config_key = false, cached = true)
+  def ask(key, config_key = nil, cached = true)
     @@values[key] = nil unless cached
 
-    @@values[key] ||=
-      Hen.config(config_key) || original_ask("Please enter your #{key}: ")
+    @@values[key] ||= config_key && Hen.config(config_key) ||
+      original_ask("Please enter your #{key}: ")
   rescue Interrupt
     abort ''
   end
 
-  # Same as ask, but requires a non-empty value to be entered.
-  def ask!(key, config_key = false)
+  # Same as #ask, but requires a non-empty value to be entered.
+  def ask!(key, config_key = nil)
     msg = "#{key} is required! Please enter a non-empty value."
     max = 3
 

data/lib/hen/dsl.rb

@@ -73,7 +73,7 @@ class Hen
     # Prepare the use of Rubyforge, optionally logging in right away.
     # Returns the RubyForge object.
     def init_rubyforge(login = true)
-      require 'rubyforge'
+      require_rubyforge
 
       rf = RubyForge.new
       rf.login if login
@@ -90,12 +90,12 @@ class Hen
       rf_project = rf_config[:project]
 
       raise 'Skipping Rubyforge tasks' if rf_project.nil? || rf_project.empty?
-      raise LocalJumpError, 'no block given' unless block
 
-      require 'rubyforge'
+      require_rubyforge
 
-      block_args = [rf_config]
+      raise LocalJumpError, 'no block given' unless block
 
+      block_args = [rf_config]
       block_args << lambda { |*args|
         init_rubyforge(args.empty? || args.first)
       } if block.arity > 1
@@ -103,6 +103,18 @@ class Hen
       block[*block_args]
     end
 
+    private
+
+    # Loads the Rubyforge library, giving a
+    # nicer error message if it's not found.
+    def require_rubyforge
+      begin
+        require 'rubyforge'
+      rescue LoadError
+        raise "Please install the 'rubyforge' gem first."
+      end
+    end
+
   end
 
 end

data/lib/hens/gem.rake

@@ -1,5 +1,7 @@
-# Use RDOC_OPTIONS from 'rdoc.rake'
 Hen :gem => :rdoc do
+  # Dependencies:
+  # * rdoc -- Uses RDOC_OPTIONS and 'publish_docs' task
+
   require 'rake/gempackagetask'
 
   gem_options = config[:gem]
@@ -68,7 +70,7 @@ Hen :gem => :rdoc do
   }
 
   desc 'Display the gem specification'
-  task :debug_gem do
+  task :gemspec do
     puts gem_spec.to_ruby
   end
 

data/lib/hens/rdoc.rake

@@ -1,4 +1,5 @@
 Hen :rdoc do
+
   require 'rake/rdoctask'
 
   rdoc_options = config[:rdoc]

data/lib/hens/spec.rake

@@ -1,4 +1,5 @@
 Hen :spec do
+
   require 'spec/rake/spectask'
 
   spec_options = config[:spec]
@@ -15,4 +16,5 @@ Hen :spec do
       }.compact.flatten
     }
   end
+
 end

data/lib/hens/test.rake

@@ -1,4 +1,5 @@
 Hen :test do
+
   require 'rake/testtask'
 
   test_options = config[:test]
@@ -15,4 +16,5 @@ Hen :test do
       }
     }
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.166
+  version: 0.0.6.183
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-09 00:00:00 +01:00
+date: 2008-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.3
+        version: 0.0.4
     version: 
 description: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.
 email: jens.wille@uni-koeln.de
@@ -60,15 +60,15 @@ has_rdoc: true
 homepage: http://prometheus.rubyforge.org/hen
 post_install_message: 
 rdoc_options: 
+- --inline-source
+- --charset
+- UTF-8
 - --title
 - hen Application documentation
 - --all
-- --line-numbers
-- --inline-source
 - --main
 - README
-- --charset
-- UTF-8
+- --line-numbers
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement