hen 0.0.2.144 → 0.0.2.148

data/Rakefile

@@ -15,7 +15,7 @@ task(:gem_spec) {{
                         "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      => %w[rubyforge]
+  :dependencies      => ['rubyforge', ['ruby-nuggets', '>= 0.0.3']]
 }}
 
 Hen.lay!

data/lib/hen.rb

@@ -29,6 +29,9 @@
 require 'rake'
 require 'yaml'
 
+require 'rubygems'
+require 'nuggets/proc/bind'
+
 require 'hen/dsl'
 require 'hen/errors'
 
@@ -102,14 +105,10 @@ class Hen
 
       # Execute each hen definition
       hens.each { |name, hen|
-        # Load any dependencies first
+        # Load any dependencies, in case they're not included yet
         load_hens(*hen.dependencies)
 
-        begin
-          hen.lay!
-        rescue HenError => err
-          warn "#{name}: #{err}" if verbose
-        end
+        hen.lay!
       }
     end
 
@@ -126,6 +125,14 @@ class Hen
       end
     end
 
+    # call-seq:
+    #   Hen[hen] => aHen
+    #
+    # Get hen by name.
+    def [](hen)
+      @hens[hen]
+    end
+
     private
 
     # call-seq:
@@ -182,7 +189,16 @@ class Hen
   #
   # Runs the definition block, exposing the DSL if requested.
   def lay!
-    block.arity == 1 ? block[DSL] : block.call
+    return if laid?
+
+    # Call dependencies first
+    dependencies.each { |hen|
+      self.class[hen].lay!
+    }
+
+    block.bind(DSL).call
+  rescue HenError => err
+    warn "#{name}: #{err}" if verbose
   end
 
   # call-seq:
@@ -217,6 +233,17 @@ class Hen
     [name.to_sym, dependencies.map { |d| d.to_sym }]
   end
 
+  # call-seq:
+  #   laid? => true or false
+  #
+  # Keeps track of whether the block has already been executed.
+  def laid?
+    return @laid if @laid
+
+    @laid = true
+    false
+  end
+
 end
 
 # call-seq:

data/lib/hen/dsl.rb

@@ -33,41 +33,22 @@ class Hen
 
     extend self
 
-    # call-seq:
-    #   hen.requires(*tasks)
-    #
-    # Specify a list of +tasks+ the hen requires to be present in
-    # actual the Rakefile. In case one of those is not available,
-    # a HenError::TaskRequired error is raised.
-    def requires(*tasks)
-      tasks.each { |task|
-        raise HenError::TaskRequired.new(task) \
-          unless Rake::Task.task_defined?(task)
-      }
-    end
-
-    # call-seq:
-    #   hen.call(task)
-    #
-    # Short-cut to call Rake task +task+.
-    def call(task)
+    # Call Rake task +task+. Raises HenError::TaskRequired if task is not defined.
+    def call_task(task)
+      raise HenError::TaskRequired.new(task) unless Rake::Task.task_defined?(task)
       Rake::Task[task].invoke.first.call
     end
 
-    # call-seq:
-    #   hen.config
-    #
     # The Hen configuration.
     def config
       Hen.config
     end
 
-    # call-seq:
-    #   hen[key]
-    #
-    # Short-cut to the config.
-    def [](key)
-      config[key]
+    # Define task +t+, but overwrite any existing task of that name!
+    # (Rake usually just adds them up)
+    def task!(t, &block)
+      Rake.application.instance_variable_get(:@tasks).delete(t.to_s)
+      task(t, &block)
     end
 
   end

data/lib/hens/gem.rake

@@ -1,96 +1,85 @@
 # Use RDOC_OPTIONS from 'rdoc.rake'
-Hen :gem => :rdoc do |hen|
-  hen.requires :gem_spec
-
+Hen :gem => :rdoc do
   require 'rake/gempackagetask'
 
-  GEM_DEFAULTS = hen[:gem] unless Object.const_defined?(:GEM_DEFAULTS)
+  GEM_DEFAULTS = config[:gem] unless Object.const_defined?(:GEM_DEFAULTS)
 
-  gem_options = GEM_DEFAULTS.merge(hen.call(:gem_spec))
+  # Merge defaults with user's spec
+  gem_options = GEM_DEFAULTS.merge(call_task(:gem_spec))
 
   if Object.const_defined?(:RDOC_OPTIONS)
     gem_options[:rdoc_options] ||= RDOC_OPTIONS[:options]
     rdoc_files                   = RDOC_OPTIONS[:rdoc_files]
   end
 
-  spec = Gem::Specification.new { |gem_spec|
+  gem_spec = Gem::Specification.new { |spec|
+
+    ### dependencies
+
     (gem_options.delete(:dependencies) || []).each { |dependency|
-      gem_spec.add_dependency(*dependency)
+      spec.add_dependency(*dependency)
     }
 
-    if gem_options.has_key?(:version)
-      gem_version = gem_options.delete(:version).dup
-    else
-      abort "Gem version missing"
-    end
+    ### version
+
+    abort 'Gem version missing' unless gem_options[:version]
 
     if gem_options.delete(:append_svnversion) && svnversion = `svnversion`.chomp[/\d+/]
-      gem_version << '.' << svnversion
+      gem_options[:version] << '.' << svnversion
     end
 
-    gem_spec.version = gem_version
+    ### description
 
-    if rubyforge_project = gem_options[:rubyforge_project]
-      gem_spec.homepage = gem_options.delete(:homepage) ||
-        "#{rubyforge_project}.rubyforge.org/#{gem_options[:name]}"
+    gem_options[:description] ||= gem_options[:summary]
+
+    ### homepage
+
+    if rf_project = gem_options[:rubyforge_project]
+      gem_options[:homepage] ||= "#{rf_project}.rubyforge.org/#{gem_options[:name]}"
     end
 
-    files            = gem_options.delete(:files)       || []
-    extra_files      = gem_options.delete(:extra_files) || []
-    executable_files = gem_options.delete(:executables) || files.grep(/\Abin\//)
+    ### extra_rdoc_files, files, executables, bindir
 
-    unless executable_files.empty?
-      gem_spec.executables = executable_files.map { |executable|
-        File.basename(executable)
-      }
+    gem_options[:files]            ||= []
+    gem_options[:extra_rdoc_files] ||= rdoc_files - gem_options[:files] if rdoc_files
+    gem_options[:files]             += gem_options.delete(:extra_files) || []
 
-      gem_spec.bindir = File.dirname(executable_files.first)
-    end
+    gem_options[:executables] ||= gem_options[:files].grep(/\Abin\//)
+    gem_options[:bindir]      ||= File.dirname(gem_options[:executables].first)
 
-    gem_spec.extra_rdoc_files   = gem_options.delete(:extra_rdoc_files)
-    gem_spec.extra_rdoc_files ||= rdoc_files - files if rdoc_files
+    gem_options[:executables].map! { |executable| File.basename(executable) }
 
-    gem_spec.files = files + extra_files
+    ### => set options!
 
     gem_options.each { |option, value|
-      gem_spec.send("#{option}=", value)
+      spec.send("#{option}=", value)
     }
   }
 
-  Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_tar = true
+  desc "Display the gem specification"
+  task :debug_gem do
+    puts gem_spec.to_ruby
+  end
+
+  pkg_task = Rake::GemPackageTask.new(gem_spec) do |pkg|
+    pkg.need_tar_gz = true
+    pkg.need_zip    = true
   end
 
-  desc 'Upload latest gem to Rubyforge'
-  task :upload_gem => :gem do
+  desc "Package and upload the release to Rubyforge"
+  task :release => :package do
     require 'rubyforge'
 
-    rf = RubyForge.new
-    rf.login
+    files = Dir[File.join('pkg', "#{pkg_task.package_name}.*")]
+    abort "Nothing to release!" if files.empty?
 
     # shorten to (at most) three digits
-    version = spec.version.to_s.split(/([.])/)[0..4].join
+    version = pkg_task.version.to_s.split(/([.])/)[0..4].join
 
-    latest_gem = Dir['pkg/*.gem'].sort_by { |gem|
-      File.mtime(gem)
-    }.last
-
-    rf.add_release spec.rubyforge_project, spec.name, version, latest_gem
-  end
-
-  desc 'Upload latest gem to gem server'
-  task :upload_gem_to_server => :gem do
-    host = ENV['GEM_HOST'] || 'prometheus.khi.uni-koeln.de'
-    user = ENV['GEM_USER'] || 'prometheus'
-    path = ENV['GEM_PATH'] || '/var/www/rubygems'
-    temp = ENV['GEM_TEMP'] || File.join(path, 'tmp')
-
-    latest_gem = Dir['pkg/*.gem'].sort_by { |gem|
-      File.mtime(gem)
-    }.last
+    rf = RubyForge.new
+    rf.login
 
-    sh "scp #{latest_gem} #{user}@#{host}:#{path}/gems"
-    sh "ssh #{user}@#{host} 'TMPDIR='#{temp}' gem generate_index -d #{path} -V'"
+    rf.add_release gem_spec.rubyforge_project, pkg_task.name, version, *files
   end
 
 end

data/lib/hens/rdoc.rake

@@ -1,12 +1,11 @@
-Hen :rdoc do |hen|
-  hen.requires :doc_spec
-
+Hen :rdoc do
   require 'rake/rdoctask'
 
-  RDOC_DEFAULTS = hen[:rdoc] unless Object.const_defined?(:RDOC_DEFAULTS)
+  RDOC_DEFAULTS = config[:rdoc] unless Object.const_defined?(:RDOC_DEFAULTS)
 
   unless Object.const_defined?(:RDOC_OPTIONS)
-    opts = RDOC_DEFAULTS.merge(hen.call(:doc_spec))
+    # Merge defaults with user's spec
+    opts = RDOC_DEFAULTS.merge(call_task(:doc_spec))
 
     RDOC_OPTIONS = {
       :rdoc_dir   => opts.delete(:rdoc_dir),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hen
 version: !ruby/object:Gem::Version 
-  version: 0.0.2.144
+  version: 0.0.2.148
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-21 00:00:00 +01:00
+date: 2008-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,14 +21,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-nuggets
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+    version: 
+description: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.
 email: jens.wille@uni-koeln.de
 executables: 
 - hen
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
+- COPYING
+- ChangeLog
 files: 
 - lib/hen/version.rb
 - lib/hen/dsl.rb
@@ -48,14 +59,14 @@ homepage: prometheus.rubyforge.org/hen
 post_install_message: 
 rdoc_options: 
 - --all
-- --line-numbers
+- --charset
+- UTF-8
+- --title
+- hen Application documentation
 - --main
 - README
+- --line-numbers
 - --inline-source
-- --title
-- hen Application documentation
-- --charset
-- UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement