bones 3.6.0 → 3.6.1

data/History.txt

@@ -1,3 +1,8 @@
+== 3.6.1 / 2011-01-25
+
+Bug Fixes
+  - Properly handle cases where the RDoc gem is not installed.
+
 == 3.6.0 / 2011-01-21
 
 Enhancements

data/Rakefile

@@ -29,8 +29,10 @@ Bones {
   depend_on  'little-plugger'
   depend_on  'loquacious'
 
-  depend_on  'bones-git',   :development => true
-  depend_on  'bones-rspec', :development => true
+  # These are commented out to avoid circular dependencies when install
+  # bones-git or bones-rspec in development mode
+  # depend_on  'bones-git',   :development => true
+  # depend_on  'bones-rspec', :development => true
 }
 
 # don't want to depend on ourself

data/lib/bones/plugins/rdoc.rb

@@ -1,5 +1,5 @@
 
-# since RDoc v 2.4.2 has RDoc::Task to replace Rake::RDoctask
+# since RDoc v 2.4.2 has RDoc::Task to replace Rake::RDocTask
 begin
   gem 'rdoc'
   require 'rdoc/task'
@@ -40,6 +40,7 @@ module Bones::Plugins::Rdoc
     }
 
     have?(:rdoc) { true }
+    have?(:rdoc_gem) { true } if defined? RDoc
   end
 
   def post_load
@@ -65,7 +66,8 @@ module Bones::Plugins::Rdoc
 
     rd.rdoc_files.push(*files)
 
-    if rd.class == RDoc::Task
+
+    if have? :rdoc_gem
       rd.title = title
     else
       rd.options << "-t #{title}"
@@ -81,11 +83,7 @@ module Bones::Plugins::Rdoc
       desc 'Generate RDoc documentation'
 
       # rdoc-2.4.2
-      begin
-        rd = RDoc::Task.new
-      rescue NameError
-        rd = Rake::RDoctask.new
-      end
+      rd = have?(:rdoc_gem) ? RDoc::Task.new : Rake::RDocTask.new
       rdoc_config(rd,config)
 
       desc 'Generate ri locally for testing'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 3
   - 6
-  - 0
-  version: 3.6.0
+  - 1
+  version: 3.6.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -07:00
+date: 2011-01-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,38 +66,6 @@ dependencies:
         version: 1.7.0
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bones-git
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bones-rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :development
-  version_requirements: *id005
 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