bones 3.3.0 → 3.4.0

data/History.txt

@@ -1,3 +1,9 @@
+== 3.4.0 / 2010-03-10
+
+2 minor enhancement
+  - using an external version file by default
+  - added a gem:install_dependencies task (does what it says)
+
 == 3.3.0 / 2010-03-04
 
 1 minor enhancement

data/README.rdoc

@@ -96,7 +96,7 @@ Howard for letting me squat in the codeforpeople rubyforge project.
 == LICENSE:
 
 MIT License
-Copyright (c) 2007 - 2009
+Copyright (c) 2007 - 2010
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,7 +10,6 @@ Bones {
   authors      'Tim Pease'
   email        'tim.pease@gmail.com'
   url          'http://gemcutter.org/gems/bones'
-  version      Bones::VERSION
   ruby_opts    %w[-W0]
   readme_file  'README.rdoc'
   ignore_file  '.gitignore'

data/default/Rakefile.bns

@@ -5,18 +5,13 @@ rescue LoadError
   abort '### Please install the "bones" gem ###'
 end
 
-ensure_in_path 'lib'
-require '<%= name %>'
-
 task :default => 'test:run'
 task 'gem:release' => 'test:run'
 
 Bones {
   name  '<%= name %>'
   authors  'FIXME (who is writing this software)'
-  email  'FIXME (your e-mail)'
-  url  'FIXME (project homepage)'
-  version  <%= classname %>::VERSION
+  email    'FIXME (your e-mail)'
+  url      'FIXME (project homepage)'
 }
 
-# EOF

data/default/lib/NAME.rb.bns

@@ -2,7 +2,6 @@
 module <%= classname %>
 
   # :stopdoc:
-  VERSION = '1.0.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -10,7 +9,7 @@ module <%= classname %>
   # Returns the version string for the library.
   #
   def self.version
-    VERSION
+    @version ||= File.read(path('version.txt')).strip
   end
 
   # Returns the library path for the module. If any arguments are given,

data/default/version.txt

@@ -0,0 +1 @@
+0.0.0

data/lib/bones.rb

@@ -12,7 +12,6 @@ module Bones
   extend LittlePlugger
 
   # :stopdoc:
-  VERSION = '3.3.0'
   PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   LIBPATH = File.expand_path(File.join(PATH, 'lib'))
   HOME = File.expand_path(ENV['HOME'] || ENV['USERPROFILE'])
@@ -24,18 +23,42 @@ module Bones
   module Plugins; end
   # :startdoc:
 
+  # Returns the version of the Mr Bones library.
+  #
+  def self.version
+    @version ||= File.read(path('version.txt')).strip
+  end
+
   # 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 )
-    args.empty? ? PATH : File.join(PATH, args.flatten)
+  def self.path( *args, &block )
+    rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
+    if block
+      begin
+        $LOAD_PATH.unshift PATH
+        rv = block.call
+      ensure
+        $LOAD_PATH.shift
+      end
+    end
+    return rv
   end
 
   # 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 )
-    args.empty? ? LIBPATH : File.join(LIBPATH, args.flatten)
+  def self.libpath( *args, &block )
+    rv =  args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+    if block
+      begin
+        $LOAD_PATH.unshift LIBPATH
+        rv = block.call
+      ensure
+        $LOAD_PATH.shift
+      end
+    end
+    return rv
   end
 
   # call-seq:

data/lib/bones/app.rb

@@ -47,7 +47,7 @@ module Bones::App
         when nil, '-h', '--help'
           help
         when '-v', '--version'
-          stdout.puts "Mr Bones v#{::Bones::VERSION}"
+          stdout.puts "Mr Bones v#{::Bones.version}"
         else
           raise Error, "Unknown command #{cmd_str.inspect}"
         end
@@ -72,7 +72,7 @@ module Bones::App
     def help
       msg = <<-MSG
 NAME
-  bones v#{::Bones::VERSION}
+  bones v#{::Bones.version}
 
 DESCRIPTION
   Mr Bones is a handy tool that builds a skeleton for your new Ruby

data/lib/bones/app/command.rb

@@ -89,7 +89,7 @@ class Bones::App::Command
     opts = OptionParser.new
 
     opts.banner = 'NAME'
-    opts.separator "  bones v#{::Bones::VERSION}"
+    opts.separator "  bones v#{::Bones.version}"
     opts.separator ''
 
     if self.class.synopsis

data/lib/bones/app/freeze.rb

@@ -33,7 +33,7 @@ skeleton.
     fm.copy
 
     stdout.puts "Project skeleton #{name.inspect} " <<
-                "has been frozen to Mr Bones #{::Bones::VERSION}"
+                "has been frozen to Mr Bones #{::Bones.version}"
   end
 
   def parse( args )

data/lib/bones/plugins/bones_plugin.rb

@@ -56,7 +56,7 @@ module Bones::Plugins::BonesPlugin
         to your gem on gemcutter.org (soon to be rubygems.org).
       __
 
-      version  ENV['VERSION'] || '0.0.0', :desc => <<-__
+      version  nil, :desc => <<-__
         Version number to use when creating the gem. This can be set either
         in the Rakefile or on the command line by setting the VERSION flag to
         the desired value.
@@ -147,6 +147,12 @@ module Bones::Plugins::BonesPlugin
     config.description ||= paragraphs_of(config.readme_file, 'description').join("\n\n")
     config.summary     ||= config.description.split('.').first
 
+    config.version ||= ENV['VERSION']
+    if test(?f, 'version.txt') and !config.version
+      config.version = File.read('version.txt').strip
+    end
+    config.version ||= '0.0.0'
+
     if config.libs.empty?
       %w(lib ext).each { |dir| config.libs << dir if test ?d, dir }
     end

data/lib/bones/plugins/gem.rb

@@ -1,4 +1,6 @@
 
+require 'rubygems/dependency_installer'
+
 module Bones::Plugins::Gem
   include ::Bones::Helpers
   extend self
@@ -98,7 +100,7 @@ module Bones::Plugins::Gem
 
     config.gem.files ||= manifest
     config.gem.executables ||= config.gem.files.find_all {|fn| fn =~ %r/^bin/}
-    config.gem.development_dependencies << ['bones', ">= #{Bones::VERSION}"]
+    config.gem.development_dependencies << ['bones', ">= #{Bones.version}"]
 
     have?(:gemcutter) {
       Gem.searcher.instance_variable_get(:@gemspecs).
@@ -223,8 +225,21 @@ module Bones::Plugins::Gem
       task :cleanup do
         sh "#{SUDO} #{GEM} cleanup #{config.gem._spec.name}"
       end
-    end  # namespace :gem
 
+      desc 'Install gem dependencies'
+      task :install_dependencies => 'gem:prereqs' do
+        installer = Gem::DependencyInstaller.new
+        config.gem._spec.dependencies.each {|dep|
+          next if Gem.available? dep
+
+          $stdout.puts "Installing #{dep.name}"
+          installer.install dep
+          installer.installed_gems.each {|spec|
+            $stdout.puts "Successfully installed #{spec.full_name}"
+          }
+        }
+      end
+    end  # namespace :gem
 
     desc 'Alias to gem:package'
     task :gem => 'gem:package'

data/spec/bones/app_spec.rb

@@ -81,11 +81,11 @@ describe Bones::App do
 
   it 'should report a version number' do
     @app.run %w[--version]
-    @out.readline.should == "Mr Bones v#{Bones::VERSION}"
+    @out.readline.should == "Mr Bones v#{Bones.version}"
     @out.clear
 
     @app.run %w[-v]
-    @out.readline.should == "Mr Bones v#{Bones::VERSION}"
+    @out.readline.should == "Mr Bones v#{Bones.version}"
   end
 
 end  # describe Bones::App

data/version.txt

@@ -0,0 +1 @@
+3.4.0

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  version: 3.3.0
+  prerelease: false
+  segments: 
+  - 3
+  - 4
+  - 0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,69 +14,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -07:00
+date: 2010-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: little-plugger
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: loquacious
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bones-git
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bones-extras
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 2
         version: 1.2.2
-    version: 
+  type: :development
+  version_requirements: *id006
 description: |-
   Mr Bones is a handy tool that creates new Ruby projects from a code
   skeleton. The skeleton contains some starter code and a collection of rake
@@ -87,7 +116,9 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 - bin/bones
+- default/version.txt
 - spec/data/foo/README.txt
+- version.txt
 files: 
 - .autotest
 - History.txt
@@ -103,6 +134,7 @@ files:
 - default/spec/NAME_spec.rb.bns
 - default/spec/spec_helper.rb.bns
 - default/test/test_NAME.rb
+- default/version.txt
 - lib/bones.rb
 - lib/bones/annotation_extractor.rb
 - lib/bones/app.rb
@@ -135,6 +167,7 @@ files:
 - spec/data/foo/README.txt
 - spec/data/foo/Rakefile
 - spec/spec_helper.rb
+- version.txt
 has_rdoc: true
 homepage: http://gemcutter.org/gems/bones
 licenses: []
@@ -153,18 +186,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mr Bones is a handy tool that creates new Ruby projects from a code skeleton