hen 0.0.5.164 → 0.0.6.166

data/ChangeLog

@@ -1,5 +1,11 @@
 = Revision history for hen
 
+== 0.0.6 [2008-01-09]
+
+* Added basic sample project tree (skeleton for 'hen create')
+* Lazily find and load .henrc
+* Some polishing and fixes
+
 == 0.0.5 [2008-01-08]
 
 * Replaced 'hen' executable stub with something actually useful
@@ -12,7 +18,7 @@
 
 == 0.0.3 [2008-01-04]
 
-* More cleanup and maturing.
+* More cleanup and maturing
 * New tasks 'release' (formerly 'upload_gem'), 'publish_docs', and 'debug_gem'
 * All in all: Pretty much inspired by Hoe ;-)
 

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.0.5
+This documentation refers to hen version 0.0.6
 
 
 == DESCRIPTION

data/bin/hen

@@ -50,6 +50,8 @@ EOT
 
 abort USAGE if ARGV.empty?
 
+EXAMPLE = File.join(File.dirname(__FILE__), '..', 'example')
+
 case action = ARGV.shift
   when '-h', '--help'
     puts USAGE
@@ -62,28 +64,73 @@ case action = ARGV.shift
       puts "  %-#{m}s - %s" % [a, d]
     }
   when 'config'
-    henrc = File.join(File.dirname(__FILE__), '..', 'example', '.henrc')
+    henrc = File.join(EXAMPLE, '.henrc')
 
     # TODO: DRY up with lib/hen.rb
     target = File.join(ENV['HOME'] || File.expand_path('~'), '.henrc')
 
     render(henrc, target)
 
+    puts
     puts "Your .henrc has been created: #{target}. Modify to your needs."
   when 'create'
-    path = ARGV.shift
+    path = File.expand_path(ARGV.shift)
     abort 'Path argument missing!' unless path
 
-    abort "Target directory already exists: #{path}. Won't touch." if File.directory?(path)
+    template = File.join(EXAMPLE, 'project')
+    abort "Sample project tree not found: #{template}" unless File.directory?(template)
+
+    if File.directory?(path)
+      abort "Target directory already exists: #{path}. Won't touch."
+    else
+      Dir.mkdir(path)
+    end
+
+    # Parts to be replaced by the user
+    replacements = {}
+
+    begin
+      # Keep track of what's been created
+      created = [path]
+
+      progname = ask!("Program's name")
+
+      Dir.chdir(template) {
+        Dir['**/*'].each { |sample|
+          target = File.join(path, sample.gsub(/__progname__/, progname))
+          created << target
+
+          if File.directory?(sample)
+            Dir.mkdir(target)
+          else
+            content = render(sample, target)
+            replacements[target] = content.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 { |target|
+        (File.directory?(target) ? Dir : File).unlink(target)
+      }
+    end
 
-    rakefile = File.join(File.dirname(__FILE__), '..', 'example', 'Rakefile')
-    target   = File.join(path, 'Rakefile')
+    puts
+    puts "Your new project directory has been created: #{path}"
 
-    # 1. create directory
-    Dir.mkdir(path)
+    replacements.each { |target, parts|
+      next if parts.empty?
 
-    # 2. copy Rakefile
-    render(rakefile, target)
+      puts
+      puts "#{target}:"
+
+      parts.each { |part|
+        puts "  #{part}"
+      }
+    }
   when 'list'
     abort 'Sorry, not yet available...'
   else

data/lib/hen.rb

@@ -45,36 +45,15 @@ class Hen
   # Directories to search for .henrc
   RCDIRS = ['.', ENV['HOME'], File.expand_path('~')]
 
-  find_henrc = if henrc = ENV['HENRC']
-    if File.readable?(henrc)
-      henrc
-    else
-      abort "The specified .henrc file could not be found: #{henrc}"
-    end
-  else
-    RCDIRS.find { |path|
-      henrc = File.join(path, '.henrc')
-      break henrc if File.readable?(henrc)
-    } or abort %q{
-      No .henrc file could be found! Please create one first with 'hen config'.
-    }
-  end
-
-  # The path to the user's .henrc
-  HENRC = find_henrc
-
   # A container for all loaded hens
   @hens = {}
 
-  # The configuration resulting from the user's .henrc
-  @config = YAML.load_file(HENRC)
-
   # The verbosity concerning errors and warnings
   @verbose = true
 
   class << self
 
-    attr_reader :hens, :config, :verbose
+    attr_reader :hens, :verbose
 
     # call-seq:
     #   lay!
@@ -141,6 +120,46 @@ class Hen
       @hens[hen]
     end
 
+    # call-seq:
+    #   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
+    end
+
+    # call-seq:
+    #   config => aHash
+    #   config(key) => aValue
+    #
+    # The configuration resulting from the user's .henrc. Takes optional
+    # +key+ argument as "path" into the config hash, returning the thusly
+    # retrieved value.
+    #
+    # Example:
+    #   config('a/b/c')  #=> @config[:a][:b][:c]
+    def config(key = default = Object.new)
+      @config ||= YAML.load_file(henrc)
+
+      return @config if key == default
+
+      key.split('/').inject(@config) { |value, k|
+        value.fetch(k.to_sym)
+      }
+    rescue IndexError, NoMethodError
+    end
+
     private
 
     # call-seq:

data/lib/hen/cli.rb

@@ -33,21 +33,53 @@ require 'highline/import'
 
 module Hen::CLI
 
+  # Collect user's answers by key, so we don't have to ask again.
+  @@values = {}
+
   alias_method :original_ask, :ask
-  def ask(key)
-    original_ask("Please enter your #{key}: ")
+
+  # 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)
+    @@values[key] = nil unless cached
+
+    @@values[key] ||=
+      Hen.config(config_key) || original_ask("Please enter your #{key}: ")
+  rescue Interrupt
+    abort ''
   end
 
-  def render(template, target)
-    abort "Sample file not found: #{template}" unless File.readable?(template)
+  # Same as ask, but requires a non-empty value to be entered.
+  def ask!(key, config_key = false)
+    msg = "#{key} is required! Please enter a non-empty value."
+    max = 3
+
+    (0...max).each { |i|
+      value = ask(key, config_key, i.zero?)
+      return value unless value.empty?
+
+      puts msg
+    }
+
+    abort "You had #{max} tries -- now be gone!"
+  end
+
+  # Renders the contents of +sample+ as an ERb template,
+  # storing the result in +target+. Returns the content.
+  def render(sample, target)
+    abort "Sample file not found: #{sample}" unless File.readable?(sample)
 
     if File.readable?(target)
       abort unless agree("Target file already exists: #{target}. Overwrite? ")
     end
 
+    content = ERB.new(File.read(sample)).result(binding)
+
     File.open(target, 'w') { |f|
-      f.puts ERB.new(File.read(template)).result(binding)
+      f.puts content unless content.empty?
     }
+
+    content
   end
 
 end

data/lib/hen/version.rb

@@ -32,7 +32,7 @@ class Hen
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.164
+  version: 0.0.6.166
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-08 00:00:00 +01:00
+date: 2008-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ files:
 - lib/hens/gem.rake
 - lib/hens/test.rake
 - lib/hens/rdoc.rake
-- example/Rakefile
+- example/project
 - example/.henrc
 has_rdoc: true
 homepage: http://prometheus.rubyforge.org/hen
@@ -64,9 +64,9 @@ rdoc_options:
 - hen Application documentation
 - --all
 - --line-numbers
+- --inline-source
 - --main
 - README
-- --inline-source
 - --charset
 - UTF-8
 require_paths: 

data/example/Rakefile

@@ -1,24 +0,0 @@
-begin
-  require 'hen'
-rescue LoadError
-  abort "Please install the 'hen' gem first."
-end
-
-PROGNAME = %q{<%= ask 'Program name' %>}
-
-require File.join('lib', PROGNAME, 'version')
-
-Hen.lay! {{
-  :rubyforge => {
-    :project => %q{<%= ask 'Rubyforge project name' %>},
-    :package => PROGNAME
-  },
-
-  :gem => {
-    :version      => <%= ask 'Module/Class name' %>::VERSION,
-    :summary      => %q{<%= ask 'Program description summary' %>},
-    :files        => FileList['lib/**/*.rb'].to_a,
-    :extra_files  => FileList['[A-Z]*'].to_a,
-    :dependencies => %w[]
-  }
-}}