bones 3.6.5 → 3.7.0

data/History.txt

@@ -1,3 +1,12 @@
+== 3.7.0 / 2011-06-01
+
+Enhancements
+  - updates to support rake 0.9.0 [gioele]
+  - support for rubygems 1.8.X
+
+Bug Fixes
+  - paragraph_of fixes [gioele]
+
 == 3.6.5 / 2011-02-07
 
 Bug Fixes

data/README.rdoc

@@ -1,6 +1,6 @@
 Mr Bones
     by Tim Pease
-    http://gemcutter.org/gems/bones
+    https://rubygems.org/gems/bones
 
 == DESCRIPTION:
 
@@ -45,7 +45,7 @@ common development tasks. These tasks include ...
 
 * release announcements
 * gem packaging and management
-* releasing to gemcutter and rubyforge
+* releasing to rubygems.org and rubyforge.org
 * documentation
 * annotation listing (TODO, FIXME, etc)
 * testing

data/Rakefile

@@ -27,7 +27,7 @@ Bones {
 
   use_gmail
 
-  depend_on  'rake'
+  depend_on  'rake', '>= 0.8.7'
   depend_on  'little-plugger'
   depend_on  'loquacious'
 

data/lib/bones/helpers.rb

@@ -1,5 +1,6 @@
 
 module Bones::Helpers
+  include Rake::DSL if defined?(Rake::DSL)
   extend self
 
   DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
@@ -47,25 +48,32 @@ module Bones::Helpers
     paragraphs = File.read(path).delete("\r").split(%r/\n\n+/)
 
     if title.nil? then
-      result = paragraphs
-
+      title = '.+'
+      single_section = false
     else
-      title = Regexp.escape title
-      start_rgxp = [%r/\A=+\s*#{title}/i, %r/\A#{title}\n[=-]+\s*\Z/i]
-      end_rgxp   = [%r/\A=+/i, %r/\A.+\n[=-]+\s*\Z/i]
-
-      result = []
-      matching = false
-      rgxp = start_rgxp
-
-      paragraphs.each do |p|
-        if rgxp.any? { |r| p =~ r }
-          break if matching
-          matching = true
-          rgxp = end_rgxp
-        elsif matching
-          result << p
+      title = Regexp.escape(title)
+      single_section = true
+    end
+
+    start_rgxp = [%r/\A=+\s*#{title}/i, %r/\A#{title}\n[=-]+\s*\Z/i]
+    end_rgxp   = [%r/\A=+/i, %r/\A.+\n[=-]+\s*\Z/i]
+
+    result = []
+    matching = false
+    rgxp = start_rgxp
+
+    paragraphs.each do |p|
+      if rgxp.any? { |r| p =~ r }
+        if matching && single_section
+          break
         end
+        matching = true
+        rgxp = end_rgxp
+        next
+      end
+
+      if matching
+        result << p
       end
     end
 

data/lib/bones/plugins/bones_plugin.rb

@@ -151,11 +151,13 @@ module Bones::Plugins::BonesPlugin
 
     config.exclude << "^#{Regexp.escape(config.ignore_file)}$"
     config.changes     ||= paragraphs_of(config.history_file, 0..1).join("\n\n")
+
+    first_readme_para = paragraphs_of(config.readme_file, 0..0).first.to_s
+    config.summary ||= first_readme_para[%r/^[^.]*\.?/]
     config.description ||= paragraphs_of(config.readme_file, 'description').join("\n\n")
     if config.description.empty?
-        config.description = paragraphs_of(config.readme_file, 1..1).first.to_s
+        config.description = first_readme_para
     end
-    config.summary ||= config.description[%r/^[^.]*\.?/]
 
     config.version ||= (ENV['VERSION'] ? ENV['VERSION'].dup : nil)
     if test(?f, 'version.txt') and !config.version

data/lib/bones/plugins/gem.rb

@@ -17,7 +17,17 @@ module Bones::Plugins::Gem
       version = args.first || opts[:version]
       development = opts.key?(:development) ? opts[:development] : opts.key?(:dev) ? opts[:dev] : false
 
-      spec = Gem.source_index.find_name(name).last
+      spec = nil
+      # FIXME: check for rubygems version 1.8.X
+      if Gem::Specification.respond_to? :find_by_name
+        begin
+          spec = Gem::Specification.find_by_name(name)
+        rescue Gem::LoadError => err
+        end
+      else
+        spec = Gem.source_index.find_name(name).last
+      end
+
       version = ">= #{spec.version.to_s}" if version.nil? and !spec.nil?
 
       dep = case version
@@ -176,7 +186,6 @@ module Bones::Plugins::Gem
                          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
@@ -246,7 +255,11 @@ module Bones::Plugins::Gem
 
       desc 'Uninstall the gem'
       task :uninstall do
-        installed_list = Gem.source_index.find_name(config.name)
+        # FIXME: check for rubygems version 1.8.X
+        installed_list = Gem::Specification.respond_to?(:find_all_by_name) ?
+            Gem::Specification.find_all_by_name(config.name) :
+            Gem.source_index.find_name(config.name)
+
         if installed_list and installed_list.collect { |s| s.version.to_s}.include?(config.version) then
           sh "#{SUDO} #{GEM} uninstall --version '#{config.version}' --ignore-dependencies --executables #{config.name}"
         end
@@ -264,7 +277,12 @@ module Bones::Plugins::Gem
       task :install_dependencies => 'gem:prereqs' do
         installer = Gem::DependencyInstaller.new
         config.gem._spec.dependencies.each {|dep|
-          next if Gem.available? dep
+          # FIXME: check for rubygems version 1.8.X
+          if dep.respond_to? :matching_specs
+            next unless dep.matching_specs(true).empty?
+          else
+            next if Gem.available? dep
+          end
 
           $stdout.puts "Installing #{dep.name}"
           installer.install dep

data/spec/bones/helpers_spec.rb

@@ -53,7 +53,7 @@ describe Bones::Helpers do
     it 'uses paragraph numbers' do
       filename = Bones.path %w[spec data markdown.txt]
 
-      ary = Bones::Helpers.paragraphs_of(filename, 1, 3..5)
+      ary = Bones::Helpers.paragraphs_of(filename, 0, 1..3)
       ary.length.should == 4
       ary.first.should == %Q{Mr Bones is a handy tool that creates new Ruby projects from a code\nskeleton. The skeleton contains some starter code and a collection of rake\ntasks to ease the management and deployment of your source code. Several Mr\nBones plugins are available for creating git repositories, creating GitHub\nprojects, running various test suites and source code analysis tools.}
       ary.last.should == %Q{When working with Rake, Mr Bones provides a set of tasks that help simplify\ncommon development tasks. These tasks include ...}

data/version.txt

@@ -1 +1 @@
-3.6.5
+3.7.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 3
-  - 6
-  - 5
-  version: 3.6.5
+  - 7
+  - 0
+  version: 3.7.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,6 @@ extra_rdoc_files:
 - README.rdoc
 - bin/bones
 - default/version.txt
-- gem-development.txt
 - spec/data/markdown.txt
 - spec/data/rdoc.txt
 files: 
@@ -118,7 +117,6 @@ 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

data/gem-development.txt

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