hen 0.0.4.153 → 0.0.4.163

data/bin/hen

@@ -35,4 +35,5 @@ Will most probably provide the following functionality:
 
 - config: Create a fresh .henrc file
 - create: Create a new project directory tree
+- list:   List available hens with their tasks
 EOT

data/lib/hen.rb

@@ -28,6 +28,7 @@
 
 require 'rake'
 require 'yaml'
+require 'forwardable'
 
 require 'rubygems'
 require 'nuggets/proc/bind'
@@ -54,8 +55,9 @@ class Hen
     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 ('hen config')."
+    } or abort %q{
+      No .henrc file could be found! Please create one first with 'hen config'.
+    }
   end
 
   # The path to the user's .henrc
@@ -169,6 +171,11 @@ class Hen
 
   end
 
+  extend Forwardable
+
+  # Forward to the class
+  def_delegators self, :verbose
+
   attr_reader :name, :dependencies, :block
 
   # call-seq:
@@ -207,14 +214,6 @@ class Hen
     warn "#{name}: #{err} (#{err.class})" if verbose
   end
 
-  # call-seq:
-  #   hen.verbose
-  #
-  # Just an accessor to the class attribute.
-  def verbose
-    self.class.verbose
-  end
-
   private
 
   # call-seq:
@@ -228,7 +227,7 @@ class Hen
       when Hash
         raise ArgumentError, "Too many hen names: #{args.keys.join(' ')}" \
           if args.size > 1
-        raise ArgumentError, "No hen name given" \
+        raise ArgumentError, 'No hen name given' \
           if args.size < 1
 
         [args.keys.first, [*args.values.first]]

data/lib/hen/dsl.rb

@@ -81,6 +81,27 @@ class Hen
       rf
     end
 
+    # Encapsulates tasks targeting at Rubyforge, skipping those if no
+    # Rubyforge project is defined. Yields the Rubyforge configuration
+    # hash and, optionally, a proc to obtain RubyForge objects from (via
+    # +call+; reaching out to init_rubyforge).
+    def rubyforge(&block)
+      rf_config = config[:rubyforge]
+
+      raise 'Skipping Rubyforge tasks' unless rf_config[:project]
+      raise LocalJumpError, 'no block given' unless block
+
+      require 'rubyforge'
+
+      block_args = [rf_config]
+
+      block_args << lambda { |*args|
+        init_rubyforge(args.empty? || args.first)
+      } if block.arity > 1
+
+      block[*block_args]
+    end
+
   end
 
 end

data/lib/hens/gem.rake

@@ -3,7 +3,6 @@ Hen :gem => :rdoc do
   require 'rake/gempackagetask'
 
   gem_options = config[:gem]
-  rubyforge   = config[:rubyforge]
 
   if Object.const_defined?(:RDOC_OPTIONS)
     gem_options[:rdoc_options] ||= RDOC_OPTIONS[:options]
@@ -14,15 +13,15 @@ Hen :gem => :rdoc do
 
     ### name
 
-    gem_options[:name] ||= rubyforge[:package]
+    gem_options[:name] ||= config[:rubyforge][:package]
 
-    abort "Gem name missing" unless gem_options[:name]
+    abort 'Gem name missing' unless gem_options[:name]
 
     ### version
 
     abort 'Gem version missing' unless gem_options[:version]
 
-    if gem_options.delete(:append_svnversion) && svnversion = `svnversion`.chomp[/\d+/]
+    if gem_options.delete(:append_svnversion) && svnversion = `svnversion`[/\d+/]
       gem_options[:version] << '.' << svnversion
     end
 
@@ -32,7 +31,7 @@ Hen :gem => :rdoc do
 
     ### rubyforge project, homepage
 
-    gem_options[:rubyforge_project] ||= rubyforge[:project]
+    gem_options[:rubyforge_project] ||= config[:rubyforge][:project]
 
     if rf_project = gem_options[:rubyforge_project]
       gem_options[:homepage] ||= "#{rf_project}.rubyforge.org/#{gem_options[:name]}"
@@ -49,9 +48,11 @@ Hen :gem => :rdoc do
     gem_options[:files]             += gem_options.delete(:extra_files) || []
 
     gem_options[:executables] ||= gem_options[:files].grep(/\Abin\//)
-    gem_options[:bindir]      ||= File.dirname(gem_options[:executables].first)
 
-    gem_options[:executables].map! { |executable| File.basename(executable) }
+    unless gem_options[:executables].empty?
+      gem_options[:bindir] ||= File.dirname(gem_options[:executables].first)
+      gem_options[:executables].map! { |executable| File.basename(executable) }
+    end
 
     ### dependencies
 
@@ -66,7 +67,7 @@ Hen :gem => :rdoc do
     }
   }
 
-  desc "Display the gem specification"
+  desc 'Display the gem specification'
   task :debug_gem do
     puts gem_spec.to_ruby
   end
@@ -76,17 +77,27 @@ Hen :gem => :rdoc do
     pkg.need_zip    = true
   end
 
-  desc "Package and upload the release to Rubyforge"
-  task :release => [:package, :publish_docs] do
-    rf = init_rubyforge
+  rubyforge do |rf_config, rf_pool|
+
+    desc 'Package and upload the release to Rubyforge'
+    task :release => [:package, :publish_docs] do
+      rf = rf_pool.call
+
+      files = Dir[File.join('pkg', "#{pkg_task.package_name}.*")]
+      abort 'Nothing to release!' if files.empty?
 
-    files = Dir[File.join('pkg', "#{pkg_task.package_name}.*")]
-    abort "Nothing to release!" if files.empty?
+      # shorten to (at most) three digits
+      version = pkg_task.version.to_s.split(/([.])/)[0..4].join
 
-    # shorten to (at most) three digits
-    version = pkg_task.version.to_s.split(/([.])/)[0..4].join
+      # TODO: Add release notes and changes.
+      #uc = rf.userconfig
+      #uc['release_notes']   = description if description
+      #uc['release_changes'] = changes if changes
+      #uc['preformatted']    = true
+
+      rf.add_release rf_config[:project], pkg_task.name, version, *files
+    end
 
-    rf.add_release rubyforge[:project], pkg_task.name, version, *files
   end
 
 end

data/lib/hens/rdoc.rake

@@ -2,9 +2,8 @@ Hen :rdoc do
   require 'rake/rdoctask'
 
   rdoc_options = config[:rdoc]
-  rubyforge    = config[:rubyforge]
 
-  if rf_package = rubyforge[:package]
+  if rf_package = config[:rubyforge][:package]
     rdoc_options[:title] ||= "#{rf_package} Application documentation"
   end
 
@@ -23,31 +22,35 @@ Hen :rdoc do
     rdoc.options    = RDOC_OPTIONS[:options]
   }
 
-  desc "Publish RDoc to Rubyforge"
-  task :publish_docs => :doc do
-    rf_project = rubyforge[:project]
-    abort "Rubyforge project name missing" unless rf_project
+  rubyforge do |rf_config|
 
-    rf_user = rubyforge[:username]
-    abort "Rubyforge user name missing" unless rf_user
+    desc 'Publish RDoc to Rubyforge'
+    task :publish_docs => :doc do
+      rf_project = rf_config[:project]
+      abort 'Rubyforge project name missing' unless rf_project
 
-    user__host = "#{rf_user}@rubyforge.org"
+      rf_user = rf_config[:username]
+      abort 'Rubyforge user name missing' unless rf_user
 
-    local_dir  = rdoc_task.rdoc_dir + '/'
-    remote_dir = "/var/www/gforge-projects/#{rf_project}/"
+      user__host = "#{rf_user}@rubyforge.org"
 
-    if rdoc_dir = rubyforge[:rdoc_dir]
-      if rf_package = rubyforge[:package]
-        rdoc_dir = rf_package if rdoc_dir == :package
+      local_dir  = rdoc_task.rdoc_dir + '/'
+      remote_dir = "/var/www/gforge-projects/#{rf_project}/"
+
+      if rdoc_dir = rf_config[:rdoc_dir]
+        if rf_package = rf_config[:package]
+          rdoc_dir = rf_package if rdoc_dir == :package
+        end
+
+        remote_dir += rdoc_dir + '/'
       end
 
-      remote_dir += rdoc_dir + '/'
+      execute(
+        "rsync -av --delete #{local_dir} #{user__host}:#{remote_dir}",
+        "scp -r #{local_dir} #{user__host}:#{remote_dir}"
+      )
     end
 
-    execute(
-      "rsync -av --delete #{local_dir} #{user__host}:#{remote_dir}",
-      "scp -r #{local_dir} #{user__host}:#{remote_dir}"
-    )
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.153
+  version: 0.0.4.163
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-07 00:00:00 +01:00
+date: 2008-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,15 +59,15 @@ has_rdoc: true
 homepage: http://prometheus.rubyforge.org/hen
 post_install_message: 
 rdoc_options: 
-- --charset
-- UTF-8
 - --title
 - hen Application documentation
-- --main
-- README
-- --line-numbers
 - --all
+- --line-numbers
 - --inline-source
+- --main
+- README
+- --charset
+- UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement