bones 3.5.5 → 3.6.0

data/History.txt

@@ -1,3 +1,14 @@
+== 3.6.0 / 2011-01-21
+
+Enhancements
+  - Use RDoc::Task if it's available. Otherwise fallback to Rake::RDoctask.
+  - Specify gem sources in the Bones configuration block.
+  - Initialize bones from an external gemspec file.
+  - Colorization of bones command output.
+
+Bug Fixes
+  - Excluding the "version.txt" file from rdoc processing.
+
 == 3.5.5 / 2011-01-10
 
 1 bug fix

data/default/Rakefile.bns

@@ -9,7 +9,7 @@ task :default => 'test:run'
 task 'gem:release' => 'test:run'
 
 Bones {
-  name  '<%= name %>'
+  name     '<%= name %>'
   authors  'FIXME (who is writing this software)'
   email    'FIXME (your e-mail)'
   url      'FIXME (project homepage)'

data/default/lib/NAME.rb.bns

@@ -4,24 +4,19 @@ module <%= classname %>
   # :stopdoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  VERSION = ::File.read(PATH + 'version.txt').strip
   # :startdoc:
 
-  # Returns the version string for the library.
-  #
-  def self.version
-    @version ||= File.read(path('version.txt')).strip
-  end
-
   # Returns the library path for the module. If any arguments are given,
   # they will be joined to the end of the libray path using
   # <tt>File.join</tt>.
   #
-  def self.libpath( *args, &block )
+  def self.libpath( *args )
     rv =  args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-    if block
+    if block_given?
       begin
         $LOAD_PATH.unshift LIBPATH
-        rv = block.call
+        rv = yield
       ensure
         $LOAD_PATH.shift
       end
@@ -33,12 +28,12 @@ module <%= classname %>
   # they will be joined to the end of the path using
   # <tt>File.join</tt>.
   #
-  def self.path( *args, &block )
+  def self.path( *args )
     rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
-    if block
+    if block_given?
       begin
         $LOAD_PATH.unshift PATH
-        rv = block.call
+        rv = yield
       ensure
         $LOAD_PATH.shift
       end

data/gem-development.txt

@@ -0,0 +1 @@
+https://github.com/radar/guides/blob/master/gem-development.md

data/lib/bones.rb

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require 'pathname'
 require 'fileutils'
 require 'find'
 require 'rbconfig'
@@ -32,12 +33,12 @@ module Bones
   # Returns the path for Mr Bones. If any arguments are given,
   # they will be joined to the end of the path using <tt>File.join</tt>.
   #
-  def self.path( *args, &block )
+  def self.path( *args )
     rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
-    if block
+    if block_given?
       begin
         $LOAD_PATH.unshift PATH
-        rv = block.call
+        rv = yield
       ensure
         $LOAD_PATH.shift
       end
@@ -48,12 +49,12 @@ module Bones
   # Returns the lib path for Mr Bones. If any arguments are given,
   # they will be joined to the end of the path using <tt>File.join</tt>.
   #
-  def self.libpath( *args, &block )
+  def self.libpath( *args )
     rv =  args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-    if block
+    if block_given?
       begin
         $LOAD_PATH.unshift LIBPATH
-        rv = block.call
+        rv = yield
       ensure
         $LOAD_PATH.shift
       end
@@ -87,7 +88,7 @@ Bones.libpath {
   each { |fn| require File.join('bones', fn) }
 
   Bones.config {}
-  Loquacious.remove :gem, :file, :test
+  Loquacious.remove :gem, :file, :test, :timeout
 }
 
 module Kernel
@@ -97,13 +98,14 @@ module Kernel
   # Configure Mr Bones using the given _block_ of code. If a block is not
   # given, the Bones module is returned.
   #
-  def Bones( &block )
+  def Bones( filename = nil, &block )
 
     # we absolutely have to have the bones plugin
     plugin_names = ::Bones.plugin_names
     ::Bones.plugin :bones_plugin unless plugin_names.empty? or plugin_names.include? :bones_plugin
 
     plugins = ::Bones.initialize_plugins.values
+    ::Bones::Plugins::Gem.import_gemspec(filename) if filename
     return ::Bones unless block
 
     extend_method = Object.instance_method(:extend).bind(::Bones.config)

data/lib/bones/annotation_extractor.rb

@@ -10,8 +10,8 @@ class Bones::AnnotationExtractor
     # will be included in the string.
     #
     def to_s( opts = {} )
-      s = "[%3d] " % line
-      s << "[#{tag}] " if opts[:tag]
+      s = "[#{Bones::Colors.colorize('%3d', :magenta)}] " % line
+      s << "[#{Bones::Colors.colorize(tag, :cyan)}] " if opts[:tag]
       s << text
     end
   }
@@ -74,7 +74,7 @@ class Bones::AnnotationExtractor
 
       text = m[2]
       if text =~ @id_rgxp
-        text.gsub!(@id_rgxp) {|str| ::Bones::Colors.green(str)} if config.colorize
+        text.gsub!(@id_rgxp) {|str| Bones::Colors.colorize(str, :green)}
         list << Annotation.new(lineno, m[1], text)
       end
       list

data/lib/bones/app.rb

@@ -17,6 +17,7 @@ module Bones::App
   end
 
   class Main
+    include Bones::Colors
     attr_reader :stdout
     attr_reader :stderr
 
@@ -58,11 +59,11 @@ module Bones::App
       end
 
     rescue Bones::App::Error => err
-      stderr.puts "ERROR:  While executing bones ..."
-      stderr.puts "    #{err.message}"
+      stderr.puts "#{colorize('ERROR', :white, :on_red)}:  While executing bones ..."
+      stderr.puts "    #{err.message.split("\n").join("\n    ")}"
       exit 1
     rescue StandardError => err
-      stderr.puts "ERROR:  While executing bones ... (#{err.class})"
+      stderr.puts "#{colorize('ERROR', :white, :on_red)}:  While executing bones ... (#{colorize(err.class, :red)})"
       stderr.puts "    #{err.to_s}"
       exit 1
     end

data/lib/bones/app/command.rb

@@ -1,8 +1,10 @@
 
 class Bones::App::Command
+  include Bones::Colors
 
   # :stopdoc:
   DEFAULT_SKELETON = 'default'
+  Bones.config() { colorize = true }
   # :startdoc:
 
   attr_reader :stdout
@@ -17,7 +19,7 @@ class Bones::App::Command
       :skeleton_dir => File.join(mrbones_dir, DEFAULT_SKELETON),
       :verbose => false,
       :name => nil,
-      :output_dir => nil
+      :output_dir => nil,
     }
     @config[:skeleton_dir] = ::Bones.path(DEFAULT_SKELETON) unless test(?d, skeleton_dir)
   end
@@ -129,7 +131,8 @@ class Bones::App::Command
     return opts
   end
 
-  #
+  # Returns a hash of the standard options that can be used for individual
+  # commadns.
   #
   def self.standard_options
     @standard_options ||= {
@@ -155,7 +158,10 @@ class Bones::App::Command
 
       :repository => ['-r', '--repository URL', String,
           'svn or git repository path.',
-          lambda { |value| config[:repository] = value }]
+          lambda { |value| config[:repository] = value }],
+
+      :colorize => ['-c', '--color', '--no-color', 'Colorize output',
+          lambda { |value| Bones.config.colorize = value }]
     }
   end
 

data/lib/bones/app/create.rb

@@ -17,7 +17,7 @@ be used as the skeleton if the '--repository' flag is given.
     option(standard_options[:directory])
     option(standard_options[:skeleton])
     option(standard_options[:repository])
-    option(standard_options[:verbose])
+    option(standard_options[:colorize])
   end
 
   def self.in_output_directory( *args )
@@ -56,22 +56,20 @@ be used as the skeleton if the '--repository' flag is given.
       :destination => output_dir,
       :stdout => stdout,
       :stderr => stderr,
-      :verbose => verbose?
+      :verbose => true
     )
-
-    fm.copy
-    fm.finalize name
+    fm.template name
   rescue Bones::App::FileManager::Error => err
     FileUtils.rm_rf output_dir
     msg = "Could not create '#{name}'"
     msg << " in directory '#{output_dir}'" if name != output_dir
-    msg << "\n\t#{err.message}"
+    msg << "\n#{err.message}"
     raise Error, msg
   rescue Exception => err
     FileUtils.rm_rf output_dir
     msg = "Could not create '#{name}'"
     msg << " in directory '#{output_dir}'" if name != output_dir
-    msg << "\n\t#{err.inspect}"
+    msg << "\n#{err.inspect}"
     raise Error, msg
   end
 
@@ -83,11 +81,14 @@ be used as the skeleton if the '--repository' flag is given.
 
   def fixme
     return unless test ?f, 'Rakefile'
+
+    stdout.puts
+    stdout.puts colorize('-'*31, :yellow)
     stdout.puts 'Now you need to fix these files'
+    stdout.puts colorize('-'*31, :yellow)
     system "#{::Bones::RUBY} -S rake notes"
   end
 
 end  # class Create
 end  # module Bones::App
 
-# EOF

data/lib/bones/app/file_manager.rb

@@ -3,6 +3,7 @@ require 'erb'
 
 module Bones::App
 class FileManager
+  include Bones::Colors
 
   Error = Class.new(StandardError)
 
@@ -45,7 +46,7 @@ class FileManager
   def archive_destination
     return false unless test(?e, destination)
 
-    @out.puts "archiving #{destination}" if verbose?
+    archiving(destination)
     FileUtils.rm_rf(archive)
     FileUtils.mv(destination, archive)
     true
@@ -59,17 +60,26 @@ class FileManager
     else
       _files_to_copy.each {|fn| _cp(fn)}
     end
+    self
   end
 
+  # Gernate a new destination folder by copying files from the source, rename
+  # files and directories that contain "NAME", and perform ERB templating on
+  # ".bns" files. The _name_ use used for file/folder renaming and ERB
+  # templating.
   #
-  #
-  def finalize( name )
+  def template( name )
     name = name.to_s
     return if name.empty?
 
+    if repository?
+      _checkout(repository)
+    else
+      _files_to_copy.each {|fn| _cp(fn, false)}
+    end
+
     self.destination = _rename(destination, name)
     _erb(name)
-
     self
   end
 
@@ -108,10 +118,16 @@ class FileManager
   def _erb( name )
     binding = _erb_binding(name)
     Dir.glob(File.join(destination, '**', '*'), File::FNM_DOTMATCH).each do |fn|
-      next unless test(?f, fn) and '.bns' == File.extname(fn)
+      next unless test(?f, fn)
+      if File.extname(fn) != '.bns'
+        creating(fn)
+        next
+      end
 
-      txt = ERB.new(File.read(fn), nil, '-').result(binding)
       new_fn = fn.sub(%r/\.bns$/, '')
+      creating(new_fn)
+
+      txt = ERB.new(File.read(fn), nil, '-').result(binding)
       File.open(new_fn, 'w') {|fd| fd.write(txt)}
       FileUtils.chmod(File.stat(fn).mode, new_fn)
       FileUtils.rm_f(fn)
@@ -156,19 +172,37 @@ class FileManager
   # specified project location. A message will be displayed to the screen
   # indicating that the file is being created.
   #
-  def _cp( file )
+  def _cp( file, msg = true )
     dir = File.dirname(file)
     dir = (dir == '.' ? destination : File.join(destination, dir))
     dst = File.join(dir,  File.basename(file))
     src = File.join(source, file)
 
-    @out.puts(test(?e, dst) ? "updating #{dst}" : "creating #{dst}") if verbose?
+    (test(?e, dst) ? updating(dst) : creating(dst)) if msg
+
     FileUtils.mkdir_p(dir)
     FileUtils.cp src, dst
 
     FileUtils.chmod(File.stat(src).mode, dst)
   end
 
+private
+
+  def archiving( filename )
+    return unless verbose?
+    @put.puts "    #{colorize('archiving', :cyan)} #{filename}"
+  end
+
+  def creating( filename )
+    return unless verbose?
+    @out.puts "    #{colorize('creating', :green)} #{filename}"
+  end
+
+  def updating( filename )
+    return unless verbose?
+    @out.puts "    #{colorize('updating', :yellow)} #{filename}"
+  end
+
 end  # class FileManager
 end  # module Bones::App
 

data/lib/bones/app/freeze.rb

@@ -16,6 +16,7 @@ skeleton.
 
     option(standard_options[:repository])
     option(standard_options[:verbose])
+    option(standard_options[:colorize])
   end
 
   def run

data/lib/bones/app/info.rb

@@ -14,9 +14,9 @@ class Info < Command
 
     msg  = "\n"
     msg << "The default project skeleton will be copied from:\n"
-    msg << "    " << skeleton_dir << "\n\n"
+    msg << "    " << colorize(skeleton_dir, :cyan) << "\n\n"
 
-    fmt = "    %-12s => %s\n"
+    fmt = "    #{colorize('%-12s', :green)} #{colorize('=>', :yellow)} #{colorize('%s', :cyan)}\n"
     msg << "Available projects skeletons are:\n"
     Dir.glob(File.join(mrbones_dir, '*')).sort.each do |fn|
       next if fn =~ %r/\.archive$/
@@ -25,7 +25,7 @@ class Info < Command
       if test(?f, fn)
         msg << fmt % [File.basename(fn), File.read(fn).strip]
       else
-        msg << "    " << File.basename(fn) << "\n"
+        msg << "    " << colorize(File.basename(fn), :green) << "\n"
       end
     end
 

data/lib/bones/app/plugins.rb

@@ -14,6 +14,7 @@ gems are not installed.
     __
 
     option('-a', '--all', 'Show all plugins.', lambda { config[:all] = true })
+    option(standard_options[:colorize])
   end
 
   def run
@@ -46,7 +47,7 @@ gems are not installed.
     name = "bones-#{name}"
     name << "-#{version}" if version
 
-    stdout.puts("  [%s]  %s" % [installed?(name) ? 'installed' : 'available', name])
+    stdout.puts("  [%s]  %s" % [installed?(name) ? colorize('installed', :green) : colorize('available', :cyan), name])
   end
 
 private

data/lib/bones/app/unfreeze.rb

@@ -13,6 +13,7 @@ not given then the default skeleton is removed.
     __
 
     option(standard_options[:verbose])
+    option(standard_options[:colorize])
   end
 
   def run

data/lib/bones/colors.rb

@@ -2,53 +2,67 @@
 module Bones::Colors
   extend self
 
-  COLOR_CODES = {
-    :clear         =>   0,
-    :reset         =>   0,     # synonym for :clear
-    :bold          =>   1,
-    :dark          =>   2,
-    :italic        =>   3,     # not widely implemented
-    :underline     =>   4,
-    :underscore    =>   4,     # synonym for :underline
-    :blink         =>   5,
-    :rapid_blink   =>   6,     # not widely implemented
-    :negative      =>   7,     # no reverse because of String#reverse
-    :concealed     =>   8,
-    :strikethrough =>   9,     # not widely implemented
-    :black         =>  30,
-    :red           =>  31,
-    :green         =>  32,
-    :yellow        =>  33,
-    :blue          =>  34,
-    :magenta       =>  35,
-    :cyan          =>  36,
-    :white         =>  37,
-    :on_black      =>  40,
-    :on_red        =>  41,
-    :on_green      =>  42,
-    :on_yellow     =>  43,
-    :on_blue       =>  44,
-    :on_magenta    =>  45,
-    :on_cyan       =>  46,
-    :on_white      =>  47
-  }
+  COLORS = {
+    # Embed in a String to clear all previous ANSI sequences.  This *MUST* be
+    # done before the program exits!
+    #
+    :clear      => "\e[0m",
+    :erase_line => "\e[K",
+    :erase_char => "\e[P",
+    :bold       => "\e[1m",
+    :dark       => "\e[2m",
+    :underline  => "\e[4m",
+    :blink      => "\e[5m",
+    :reverse    => "\e[7m",
+    :concealed  => "\e[8m",
+
+    # Terminal's foreground ANSI colors
+    :black      => "\e[30m",
+    :red        => "\e[31m",
+    :green      => "\e[32m",
+    :yellow     => "\e[33m",
+    :blue       => "\e[34m",
+    :magenta    => "\e[35m",
+    :cyan       => "\e[36m",
+    :white      => "\e[37m",
 
-  COLOR_CODES.each { |name,code|
-    module_eval <<-CODE
-      def #{name.to_s}( str )
-        "\e[#{code}m\#{str}\e[0m"
-      end
-    CODE
+    # Terminal's background ANSI colors
+    :on_black   => "\e[40m",
+    :on_red     => "\e[41m",
+    :on_green   => "\e[42m",
+    :on_yellow  => "\e[43m",
+    :on_blue    => "\e[44m",
+    :on_magenta => "\e[45m",
+    :on_cyan    => "\e[46m",
+    :on_white   => "\e[47m"
   }
+  COLORS[:reset]      = COLORS[:clear]
+  COLORS[:underscore] = COLORS[:underline]
+
+  # This method provides easy access to ANSI color sequences, without the user
+  # needing to remember to CLEAR at the end of each sequence.  Just pass the
+  # _string_ to color, followed by a list of _colors_ you would like it to
+  # be affected by.  The _colors_ can be class constants, or symbols (:blue
+  # for BLUE, for example).  A CLEAR will automatically be embedded to the
+  # end of the returned String.
+  #
+  # This method returns the original _string_ unchanged if colorize? is
+  # +false+.
+  #
+  def colorize( string, *colors )
+    return string unless colorize?
 
-  def colorize( str, *args )
-    args.each { |name|
-      code = COLOR_CODES[name]
-      next if code.nil?
-      str = "\e[#{code}m#{str}\e[0m"
+    colors.map! { |c|
+      c.is_a?(Symbol) ? COLORS[c] : c
     }
-    str
+    "#{colors.flatten.join}#{string}#{COLORS[:clear]}"
   end
+
+  # Returns true if Bones is currently using color escapes.
+  #
+  def colorize?
+    Bones.config.colorize
+  end
+
 end  # module Bones::Colors
 
-# EOF

data/lib/bones/plugins/gem.rb

@@ -5,6 +5,8 @@ module Bones::Plugins::Gem
   include ::Bones::Helpers
   extend self
 
+  GemspecError = Class.new(StandardError)
+
   module Syntax
     # Adds the given gem _name_ to the current project's dependency list. An
     # optional gem _version_ can be given. If omitted, the newest gem version
@@ -26,10 +28,21 @@ module Bones::Plugins::Gem
       development ?
           ::Bones.config.gem.development_dependencies << dep :
           ::Bones.config.gem.dependencies << dep
+      nil
+    end
+
+    # Add the given _url_ to the list of gem sources.
+    #
+    def source( url )
+      sources = ::Bones.config.gem.sources
+      sources << url unless sources.include? url
+      nil
     end
   end
 
   def initialize_gem
+    Gem.configuration
+
     ::Bones.config {
       desc 'Configuration settings for gem packaging.'
       gem {
@@ -89,6 +102,14 @@ module Bones::Plugins::Gem
           provided for by Mr Bones. You will need to refer to the rubygems
           documentation for a complete list of specification settings.
         __
+
+        sources  Gem.sources.dup, :desc => <<-__
+          An array of sources to fetch remote gems from. A convenience method
+          is provided to add new gem sources to this list.
+
+          |  source 'http://gems.example.com'
+          |  source 'http://rubygems.org'
+        __
       }
     }
 
@@ -98,79 +119,85 @@ module Bones::Plugins::Gem
   def post_load
     config = ::Bones.config
 
-    config.gem.files ||= manifest
-    config.gem.executables ||= config.gem.files.find_all {|fn| fn =~ %r/^bin/}
-    config.gem.development_dependencies << ['bones', ">= #{Bones.version}"]
+    Gem.sources = config.gem.sources
+
+    unless $bones_external_spec
+      config.gem.files ||= manifest
+      config.gem.executables ||= config.gem.files.find_all {|fn| fn =~ %r/^bin/}
+      config.gem.development_dependencies << ['bones', ">= #{Bones.version}"]
+    end
   end
 
   def define_tasks
     config = ::Bones.config
 
     namespace :gem do
-      config.gem._spec = Gem::Specification.new do |s|
-        s.name = config.name
-        s.version = config.version
-        s.summary = config.summary
-        s.authors = Array(config.authors)
-        s.email = config.email
-        s.homepage = Array(config.url).first
-        s.rubyforge_project = config.name
-
-        if !config.rubyforge.nil? and config.rubyforge.name
-          s.rubyforge_project = config.rubyforge.name
-        end
+      if config.gem._spec.nil?
+        config.gem._spec = Gem::Specification.new do |s|
+          s.name = config.name
+          s.version = config.version
+          s.summary = config.summary
+          s.authors = Array(config.authors)
+          s.email = config.email
+          s.homepage = Array(config.url).first
+          s.rubyforge_project = config.name
+
+          if !config.rubyforge.nil? and config.rubyforge.name
+            s.rubyforge_project = config.rubyforge.name
+          end
 
-        s.description = config.description
+          s.description = config.description
 
-        config.gem.dependencies.each do |dep|
-          s.add_dependency(*dep)
-        end
+          config.gem.dependencies.each do |dep|
+            s.add_dependency(*dep)
+          end
 
-        config.gem.development_dependencies.each do |dep|
-          s.add_development_dependency(*dep)
-        end
+          config.gem.development_dependencies.each do |dep|
+            s.add_development_dependency(*dep)
+          end
 
-        s.files = config.gem.files
-        s.executables = config.gem.executables.map {|fn| File.basename(fn)}
-        s.extensions = config.gem.files.grep %r/extconf\.rb$/
-
-        s.bindir = 'bin'
-        dirs = Dir["{#{config.libs.join(',')}}"]
-        s.require_paths = dirs unless dirs.empty?
-
-        if have? :rdoc
-          incl = Regexp.new(config.rdoc.include.join('|'))
-          excl = config.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
-          excl = Regexp.new(excl.join('|'))
-          rdoc_files = config.gem.files.find_all do |fn|
-                         case fn
-                         when excl; false
-                         when incl; true
-                         else false end
-                       end
-          s.rdoc_options = config.rdoc.opts + ['--main', config.rdoc.main]
-          s.extra_rdoc_files = rdoc_files
-          s.has_rdoc = true
-        end
+          s.files = config.gem.files
+          s.executables = config.gem.executables.map {|fn| File.basename(fn)}
+          s.extensions = config.gem.files.grep %r/extconf\.rb$/
+
+          s.bindir = 'bin'
+          dirs = Dir["{#{config.libs.join(',')}}"]
+          s.require_paths = dirs unless dirs.empty?
+
+          if have? :rdoc
+            incl = Regexp.new(config.rdoc.include.join('|'))
+            excl = config.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+            excl = Regexp.new(excl.join('|'))
+            rdoc_files = config.gem.files.find_all do |fn|
+                           case fn
+                           when excl; false
+                           when incl; true
+                           else false end
+                         end
+            s.rdoc_options = config.rdoc.opts + ['--main', config.rdoc.main]
+            s.extra_rdoc_files = rdoc_files
+            s.has_rdoc = true
+          end
 
-        if config.test
-          if test ?f, config.test.file
-            s.test_file = config.test.file
-          else
-            s.test_files = config.test.files.to_a
+          if config.test
+            if test ?f, config.test.file
+              s.test_file = config.test.file
+            else
+              s.test_files = config.test.files.to_a
+            end
           end
-        end
 
-        # Do any extra stuff the user wants
-        config.gem.extras.each do |msg, val|
-          case val
-          when Proc
-            val.call(s.send(msg))
-          else
-            s.send "#{msg}=", val
+          # Do any extra stuff the user wants
+          config.gem.extras.each do |msg, val|
+            case val
+            when Proc
+              val.call(s.send(msg))
+            else
+              s.send "#{msg}=", val
+            end
           end
-        end
-      end  # Gem::Specification.new
+        end  # Gem::Specification.new
+      end  # if gem._spec.nil?
 
       ::Bones::GemPackageTask.new(config.gem._spec) do |pkg|
         pkg.need_tar = config.gem.need_tar
@@ -192,10 +219,13 @@ module Bones::Plugins::Gem
         puts config.gem._spec.to_ruby
       end
 
-      desc 'Write the gemspec'
-      task :spec => 'gem:prereqs' do
-        File.open("#{config.name}.gemspec", 'w') do |f|
-          f.write config.gem._spec.to_ruby
+      # don't use the "spec" task if we have an external gemspec
+      unless $bones_external_spec
+        desc 'Write the gemspec'
+        task :spec => 'gem:prereqs' do
+          File.open("#{config.name}.gemspec", 'w') do |f|
+            f.write config.gem._spec.to_ruby
+          end
         end
       end
 
@@ -288,6 +318,78 @@ module Bones::Plugins::Gem
     files.sort!
   end
 
+  # Import configuration from the given gemspec file.
+  #
+  def import_gemspec( filename )
+    $bones_external_spec = false
+    spec = load_gemspec(filename)
+    return if spec.nil?
+
+    config = ::Bones.config
+    config.gem._spec = spec
+    $bones_external_spec = true
+
+    config.name               = spec.name
+    config.version            = spec.version
+    config.summary            = spec.summary
+    config.authors            = spec.authors
+    config.email              = spec.email
+    config.url                = spec.homepage
+    config.description        = spec.description
+    config.files              = spec.files
+    config.libs               = spec.require_paths
+    config.rubyforge_project  = spec.rubyforge_project
+
+    config.gem.executables    = spec.executables
+    config.rdoc.opts          = spec.rdoc_options
+    config.test.file          = spec.test_file if spec.test_file
+    config.test.files         = spec.test_files if spec.test_files
+
+    spec.runtime_dependencies.each do |dep|
+      config.gem.dependencies << [dep.name, dep.requirements_list].flatten
+    end
+
+    spec.development_dependencies.each do |dep|
+      config.gem.development_dependencies << [dep.name, dep.requirements_list].flatten
+    end
+
+    [:signing_key, :cert_chain, :post_install_message, :licenses].each { |key|
+      value = spec.send(key)
+      next if value.nil? or value.empty?
+      config.gem.extras[key] = value
+    }
+
+    nil
+  end
+
+  # This method is stolen from the Bundler gem. It loads the gemspec from a
+  # file if available.
+  #
+  def load_gemspec( filename )
+    path = Pathname.new(filename)
+    # Eval the gemspec from its parent directory
+    Dir.chdir(path.dirname) do
+      begin
+        Gem::Specification.from_yaml(path.basename)
+        # Raises ArgumentError if the file is not valid YAML
+      rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
+        begin
+          eval(File.read(path.basename), TOPLEVEL_BINDING, path.expand_path.to_s)
+        rescue LoadError => e
+          original_line = e.backtrace.find { |line| line.include?(path.to_s) }
+          msg  = "There was a LoadError while evaluating #{path.basename}:\n  #{e.message}"
+          msg << " from\n  #{original_line}" if original_line
+          msg << "\n"
+
+          if RUBY_VERSION >= "1.9.0"
+            msg << "\nDoes it try to require a relative path? That doesn't work in Ruby 1.9."
+          end
+
+          raise GemspecError, msg
+        end
+      end
+    end
+  end
+
 end  # Bones::Plugins::Gem
 
-# EOF

data/lib/bones/plugins/rdoc.rb

@@ -1,5 +1,11 @@
 
-require 'rake/rdoctask'
+# since RDoc v 2.4.2 has RDoc::Task to replace Rake::RDoctask
+begin
+  gem 'rdoc'
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 
 module Bones::Plugins::Rdoc
   include ::Bones::Helpers
@@ -18,7 +24,7 @@ module Bones::Plugins::Rdoc
           will be converted in regular expressions.
         __
 
-        exclude  %w(extconf\.rb$), :desc => <<-__
+        exclude  %w(extconf\.rb$ ^version.txt), :desc => <<-__
           An array of patterns that will be used to exclude files from rdoc
           processing. This is an array of strings that will be converted in
           regular expressions.
@@ -43,31 +49,44 @@ module Bones::Plugins::Rdoc
     config.rdoc.main ||= config.readme_file
   end
 
+  def rdoc_config(rd, config)
+    rdoc = config.rdoc
+    incl = Regexp.new(rdoc.include.join('|'))
+    excl = Regexp.new(rdoc.exclude.join('|'))
+    files = config.gem.files.find_all do |fn|
+              case fn
+              when excl; false
+              when incl; true
+              else false end
+            end
+    title = "#{config.name}-#{config.version} Documentation"
+    rd.main = rdoc.main
+    rd.rdoc_dir = rdoc.dir
+
+    rd.rdoc_files.push(*files)
+
+    if rd.class == RDoc::Task
+      rd.title = title
+    else
+      rd.options << "-t #{title}"
+    end
+
+    rd.options.concat(rdoc.opts)
+  end
+
   def define_tasks
     config = ::Bones.config
 
     namespace :doc do
       desc 'Generate RDoc documentation'
-      Rake::RDocTask.new do |rd|
-        rdoc = config.rdoc
-        rd.main = rdoc.main
-        rd.rdoc_dir = rdoc.dir
-
-        incl = Regexp.new(rdoc.include.join('|'))
-        excl = Regexp.new(rdoc.exclude.join('|'))
-        files = config.gem.files.find_all do |fn|
-                  case fn
-                  when excl; false
-                  when incl; true
-                  else false end
-                end
-        rd.rdoc_files.push(*files)
-
-        title = "#{config.name}-#{config.version} Documentation"
-
-        rd.options << "-t #{title}"
-        rd.options.concat(rdoc.opts)
+
+      # rdoc-2.4.2
+      begin
+        rd = RDoc::Task.new
+      rescue NameError
+        rd = Rake::RDoctask.new
       end
+      rdoc_config(rd,config)
 
       desc 'Generate ri locally for testing'
       task :ri => :clobber_ri do
@@ -92,4 +111,3 @@ module Bones::Plugins::Rdoc
 
 end  # module Bones::Plugins::Rdoc
 
-# EOF

data/spec/bones/app/file_manager_spec.rb

@@ -87,8 +87,7 @@ describe Bones::App::FileManager do
   it "should perform ERb templating on '.bns' files" do
     @fm.source = Bones.path(%w[spec data default])
     @fm.destination = Bones.path(%w[spec data bar])
-    @fm.copy
-    @fm.finalize('foo_bar')
+    @fm.template('foo_bar')
 
     dir = @fm.destination
     test(?e, File.join(dir, 'Rakefile.bns')).should == false
@@ -114,8 +113,7 @@ end
   it "preserves the executable status of .bns files" do
     @fm.source = Bones.path(%w[spec data default])
     @fm.destination = Bones.path(%w[spec data bar])
-    @fm.copy
-    @fm.finalize('foo_bar')
+    @fm.template('foo_bar')
 
     dir = @fm.destination
     test(?e, File.join(dir, 'bin/foo_bar')).should == true

data/spec/bones/app_spec.rb

@@ -74,7 +74,7 @@ describe Bones::App do
 
   it 'should report an error for unrecognized commands' do
     lambda {@app.run %w[foo]}.should raise_error(SystemExit)
-    @err.readline.should == 'ERROR:  While executing bones ...'
+    @err.readline.should == "\e[37m\e[41mERROR\e[0m:  While executing bones ..."
     @err.readline.should == '    Unknown command "foo"'
   end
 

data/version.txt

@@ -1 +1 @@
-3.5.5
+3.6.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 3
-  - 5
-  - 5
-  version: 3.5.5
+  - 6
+  - 0
+  version: 3.6.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -07:00
+date: 2011-01-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,9 +114,9 @@ extra_rdoc_files:
 - README.rdoc
 - bin/bones
 - default/version.txt
+- gem-development.txt
 - spec/data/markdown.txt
 - spec/data/rdoc.txt
-- version.txt
 files: 
 - .autotest
 - History.txt
@@ -133,6 +133,7 @@ files:
 - default/spec/spec_helper.rb.bns
 - default/test/test_NAME.rb
 - default/version.txt
+- gem-development.txt
 - lib/bones.rb
 - lib/bones/annotation_extractor.rb
 - lib/bones/app.rb