hen 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f082dccc6c68ce2ac6dd82122bc73252f3e56aa
-  data.tar.gz: 577ca2a99cb316c4a654444d819dc330f652a537
+  metadata.gz: 7cca013795ab8838dedb03aab88a80addc25210e
+  data.tar.gz: e5394e737b54e49e6066ae511c830d94f2486c68
 SHA512:
-  metadata.gz: 12c0385cfc7705247ba458c4cb6b8b3988cf73594167301fd35a529df83f4001826752e8436b889d2b9cebe628ec12809c56657109d2f250767250971c7305cb
-  data.tar.gz: ef0cccbbcaa0bddfc5b15f8d53a52130807003c36882c30e14b23b44f2dfe0b27a9bbfb0ed1db4e373824039dfc4d580b11a098e8920d7f4544d828ad35fae4d
+  metadata.gz: da08775b2518dfa345cf05f854ea928a03dd972d32e094c22da59ffdbf9e5b91d29b9f375ddb4a08409b261e9b0fa4088669b83c922d35f00ae6641a46a0b618
+  data.tar.gz: 89321c2b52aa71714342fd731c64ce9b2da52063bcc215f9679bdce87433a11a6fefaa2d7134cdad7558ba605c3d6779e461a8398f03adad36b4b5d5a28560a9

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for hen
 
+== 0.5.0 [2013-12-19]
+
+* Added support for substitution directives in RDoc titles.
+* General cleanup and refactoring.
+
 == 0.4.9 [2013-10-25]
 
 * Added post install message to gem spec.

data/Rakefile

@@ -10,7 +10,7 @@ Hen.lay! {{
                      "helper that fits my own personal style.",
     :author       => %q{Jens Wille},
     :email        => %q{jens.wille@gmail.com},
-    :license      => %q{AGPL},
+    :license      => %q{AGPL-3.0},
     :homepage     => :blackwinter,
     :extra_files  => FileList['lib/hens/*.rake'].to_a,
     :dependencies => [['ruby-nuggets', '>= 0.8.4'], 'highline']

data/example/project/Rakefile

@@ -10,7 +10,7 @@ begin
       :summary      => %q{<%= progdesc %>},
       :author       => %q{<%= fullname %>},
       :email        => %q{<%= emailaddress %>},
-      :license      => %q{AGPL},
+      :license      => %q{AGPL-3.0},
       :dependencies => %w[]
     }
   }}

data/lib/hen.rb

@@ -87,13 +87,13 @@ class Hen
       # Extract potential options hash
       options = args.last.is_a?(Hash) ? args.pop : {}
 
-      @verbose = options[:verbose] if options.has_key?(:verbose)
+      @verbose = options[:verbose] if options.key?(:verbose)
 
       yield.each { |key, value| config[key].update(value) } if block_given?
 
       # Handle include/exclude requirements
       excl = options[:exclude]
-      args, default = args.empty? ? [excl ? [*excl] : [], true] : [args, false]
+      args, default = args.empty? ? [Array(excl), true] : [args, false]
 
       inclexcl = Hash.new(default)
       args.each { |arg| inclexcl[arg.to_s] = !default }
@@ -242,13 +242,13 @@ class Hen
   def initialize(args, overwrite = false, &block)
     @name, @dependencies = resolve_args(args)
 
+    @laid = false
+
     unless @block = block
       raise LocalJumpError, "#{@name}: no block given" if verbose
       return
     end
 
-    @laid = false
-
     self.class.add_hen(self, overwrite)
   end
 
@@ -259,6 +259,8 @@ class Hen
   def lay!
     return if laid?
 
+    @laid = true
+
     # Call dependencies first
     dependencies.each { |hen| self.class[hen].lay!  }
 
@@ -306,10 +308,7 @@ class Hen
   #
   # Keeps track of whether the block has already been executed.
   def laid?
-    return @laid if @laid
-
-    @laid = true
-    false
+    @laid
   end
 
 end

data/lib/hen/dsl.rb

@@ -63,14 +63,14 @@ class Hen
 
     # Define task +t+, but overwrite any existing task of that name!
     # (Rake usually just adds them up.)
-    def task!(t, *args)
+    def task!(t, *args, &block)
       Rake.application.instance_variable_get(:@tasks).delete(t.to_s)
-      task(t, *args, &block_given? ? Proc.new : nil)
+      task(t, *args, &block)
     end
 
     # Return true if task +t+ is defined, false otherwise.
     def have_task?(t)
-      Rake.application.instance_variable_get(:@tasks).has_key?(t.to_s)
+      Rake.application.instance_variable_get(:@tasks).key?(t.to_s)
     end
 
     # Find a command that is executable and run it. Intended for
@@ -102,10 +102,10 @@ class Hen
       managed_files = [:git, :svn].find { |scm|
         res = send(scm) { |scm_obj| scm_obj.managed_files }
         break res if res
-      } if !options.has_key?(:managed) || options[:managed]
+      } if !options.key?(:managed) || options[:managed]
 
-      args.each { |files|
-        files ? files.uniq! : next
+      args.compact.each { |files|
+        files.uniq!
 
         if managed_files
           files.replace(files & managed_files)
@@ -147,14 +147,14 @@ class Hen
     # 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
+    def rubyforge(&block)
       rf_config  = config[:rubyforge]
       rf_project = rf_config[:project]
 
       if rf_project && !rf_project.empty? && have_rubyforge?
         rf_config[:package] ||= rf_project
 
-        call_block(Proc.new, rf_config) { |*args|
+        call_block(block, rf_config) { |*args|
           init_rubyforge(args.empty? || args.first)
         }
       else
@@ -166,28 +166,28 @@ class Hen
     # RubyGem's 'push' command is not available. Yields an optional
     # proc to obtain RubyGems (pseudo-)objects from (via +call+;
     # reaching out to #init_rubygems).
-    def rubygems
+    def rubygems(&block)
       if have_rubygems?
-        call_block(Proc.new) { |*args| init_rubygems }
+        call_block(block) { |*args| init_rubygems }
       else
         skipping 'RubyGems'
       end
     end
 
     # DEPRECATED: Use #rubygems instead.
-    def gemcutter
+    def gemcutter(&block)
       warn "#{self}#gemcutter is deprecated; use `rubygems' instead."
-      rubygems(&block_given? ? Proc.new : nil)
+      rubygems(&block)
     end
 
     # Encapsulates tasks targeting at Git, skipping those if the current
-    # project us not controlled by Git. Yields a Git object via #init_git.
+    # project is not controlled by Git. Yields a Git object via #init_git.
     def git
       have_git? ? yield(init_git) : skipping('Git')
     end
 
     # Encapsulates tasks targeting at SVN, skipping those if the current
-    # project us not controlled by SVN. Yields an SVN object via #init_svn.
+    # project is not controlled by SVN. Yields an SVN object via #init_svn.
     def svn
       have_svn? ? yield(init_svn) : skipping('SVN')
     end
@@ -229,7 +229,7 @@ class Hen
 
       Gem::Commands::PushCommand
     rescue LoadError, NameError
-      missing_lib 'gemcutter'
+      missing_lib 'rubygems (gemcutter)'
     end
 
     # Checks whether the current project is managed by Git.
@@ -256,6 +256,8 @@ class Hen
     # Prepare the use of RubyGems.org. Returns the RubyGems
     # (pseudo-)object.
     def init_rubygems
+      return unless have_rubygems?
+
       pseudo_object {
         def method_missing(cmd, *args)  # :nodoc:
           run(cmd, *args)
@@ -264,15 +266,17 @@ class Hen
         def run(cmd, *args)  # :nodoc:
           Gem::CommandManager.instance.run([cmd.to_s.tr('_', '-'), *args])
         end
-      } if have_rubygems?
+      }
     end
 
     # Prepare the use of Git. Returns the Git (pseudo-)object.
     def init_git
+      return unless have_git?
+
       pseudo_object {
         def method_missing(cmd, *args)  # :nodoc:
           options = args.last.is_a?(Hash) ? args.pop : {}
-          options[:verbose] = Hen.verbose unless options.has_key?(:verbose)
+          options[:verbose] = Hen.verbose unless options.key?(:verbose)
 
           DSL.send(:sh, 'git', cmd.to_s.tr('_', '-'), *args << options)
         end
@@ -323,15 +327,17 @@ class Hen
         def managed_files  # :nodoc:
           run(:ls_files).split($/)
         end
-      } if have_git?
+      }
     end
 
     # Prepare the use of SVN. Returns the SVN (pseudo-)object.
     def init_svn
+      return unless have_svn?
+
       pseudo_object {
         def method_missing(cmd, *args)  # :nodoc:
           options = args.last.is_a?(Hash) ? args.pop : {}
-          options[:verbose] = Hen.verbose unless options.has_key?(:verbose)
+          options[:verbose] = Hen.verbose unless options.key?(:verbose)
 
           DSL.send(:sh, 'svn', cmd.to_s.tr('_', '-'), *args << options)
         end
@@ -347,16 +353,14 @@ class Hen
         def managed_files  # :nodoc:
           run(:list, '--recursive').split($/)
         end
-      } if have_svn?
+      }
     end
 
     # Extend +object+ with given +blocks+.
-    def extend_object(object, *blocks)
-      blocks << Proc.new if block_given?
-
+    def extend_object(object, *blocks, &block2)
       singleton_class = object.singleton_class
 
-      blocks.compact.reverse_each { |block|
+      blocks.push(block2).compact.reverse_each { |block|
         singleton_class.class_eval(&block)
       }
 
@@ -364,8 +368,8 @@ class Hen
     end
 
     # Create a (pseudo-)object.
-    def pseudo_object
-      extend_object(Object.new, block_given? ? Proc.new : nil) {
+    def pseudo_object(&block)
+      extend_object(Object.new, block) {
         instance_methods.each { |method|
           undef_method(method) unless method =~ /\A__|\Aobject_id\z/
         }
@@ -374,8 +378,8 @@ class Hen
 
     # Calls block +block+ with +args+, appending an
     # optional passed block if requested by +block+.
-    def call_block(block, *args)
-      args << Proc.new if block.arity > args.size
+    def call_block(block, *args, &block2)
+      args << block2 if block.arity > args.size
       block[*args]
     end
 

data/lib/hen/version.rb

@@ -3,8 +3,8 @@ class Hen
   module Version
 
     MAJOR = 0
-    MINOR = 4
-    TINY  = 9
+    MINOR = 5
+    TINY  = 0
 
     class << self
 

data/lib/hens/gem.rake

@@ -248,11 +248,7 @@ Hen :gem => :rdoc do
     pkg.need_zip    = true
 
     if defined?(ZIP_COMMANDS)
-      pkg.zip_command = begin
-        require 'nuggets/file/which'
-        File.which_command(ZIP_COMMANDS)
-      rescue LoadError
-      end || ZIP_COMMANDS.first
+      pkg.zip_command = File.which_command(ZIP_COMMANDS) || ZIP_COMMANDS.first
     end
   }
 
@@ -296,7 +292,7 @@ Hen :gem => :rdoc do
     extension_options[:lib_dir] ||= File.join(['lib', ext_name, ENV['FAT_DIR']].compact)
     extension_options[:ext_dir] ||= File.join(['ext', ext_name])
 
-    unless extension_options.has_key?(:cross_compile)
+    unless extension_options.key?(:cross_compile)
       extension_options[:cross_compile] = true
     end
 

data/lib/hens/rdoc.rake

@@ -3,6 +3,7 @@ Hen :rdoc do
   rdoc_options = {
     :rdoc_dir       => 'doc',
     :rdoc_files     => %w[README COPYING ChangeLog lib/**/*.rb ext/**/*.c],
+    :title          => '{name:%s }Application documentation{version: (v%s)}',
     :charset        => 'UTF-8',
     :inline_source  => true,
     :line_numbers   => true,
@@ -21,19 +22,13 @@ Hen :rdoc do
     Rake::RDocTask
   end
 
-  rdoc_options[:title] ||= begin
-    title = 'Application documentation'
-
-    if name = project_name(*config.values_at(:rubyforge, :gem))
-      title.insert(0, "#{name} ")
-    end
-
-    if version = config[:gem][:version]
-      title << " (v#{version})"
-    end
+  info = {
+    'name'    => project_name(*config.values_at(:rubyforge, :gem)),
+    'version' => config[:gem][:version],
+    'date'    => Date.today.to_s
+  }
 
-    title
-  end
+  rdoc_options[:title].gsub!(/\{(\w+):(.*?)\}/) { i = info[$1] and $2 % i }
 
   ### rdoc_dir
 
@@ -95,7 +90,7 @@ Hen :rdoc do
     }
   end
 
-  publish_desc = "Publish RDoc documentation"
+  publish_desc = 'Publish RDoc documentation'
 
   git do |git|
 

data/lib/hens/spec.rake

@@ -46,7 +46,7 @@ Hen :spec do
     spec_opts = map_options(spec_options)
 
     if opts_file && File.readable?(opts_file)
-      File.readlines(opts_file).each { |l| spec_opts << l.chomp }
+      File.readlines(opts_file).each { |line| spec_opts << line.chomp }
     end
 
     spec_block = lambda { |t|
@@ -69,12 +69,12 @@ Hen :spec do
     end
 
     #desc "Run specs with RCov"
-    spec_klass.new('spec:rcov') do |t|
+    spec_klass.new('spec:rcov') { |t|
       spec_block[t]
 
       t.rcov = true
       t.rcov_opts = rcov_opts
-    end
+    }
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hen
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-nuggets
@@ -74,22 +74,22 @@ files:
 - example/project/lib/__progname__/version.rb
 homepage: http://github.com/blackwinter/hen
 licenses:
-- AGPL
+- AGPL-3.0
 metadata: {}
 post_install_message: |2+
 
-  hen-0.4.9 [2013-10-25]:
+  hen-0.5.0 [2013-12-19]:
 
-  * Added post install message to gem spec.
-  * Refactored +hen+ executable into Hen::Command module.
+  * Added support for substitution directives in RDoc titles.
+  * General cleanup and refactoring.
 
 rdoc_options:
+- "--title"
+- hen Application documentation (v0.5.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
 - "--all"
-- "--title"
-- hen Application documentation (v0.4.9)
 - "--main"
 - README
 require_paths:
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Hoe or Echoe? No, thanks! Just a Rake helper that fits my own personal style.