bones 2.0.1 → 2.0.2

data/History.txt

@@ -1,3 +1,12 @@
+== 2.0.2 / 2008-06-02
+
+* 2 minor enhancements
+  - Added a gem cleanup rake task
+  - Tasks to support Git projects
+* 2 bug fixes
+  - Check for Rakefile when creating a new project
+  - Failed dependency resolution when not using fully qualified task names
+
 == 2.0.1 / 2008-04-15
 
 * 1 minor enchancement

data/Manifest.txt

@@ -14,6 +14,7 @@ data/spec/spec_helper.rb.erb
 data/tasks/ann.rake
 data/tasks/bones.rake
 data/tasks/gem.rake
+data/tasks/git.rake
 data/tasks/manifest.rake
 data/tasks/notes.rake
 data/tasks/post_load.rake
@@ -32,6 +33,7 @@ lib/bones/smtp_tls.rb
 tasks/ann.rake
 tasks/bones.rake
 tasks/gem.rake
+tasks/git.rake
 tasks/manifest.rake
 tasks/notes.rake
 tasks/post_load.rake
@@ -39,5 +41,4 @@ tasks/rdoc.rake
 tasks/rubyforge.rake
 tasks/setup.rb
 tasks/spec.rake
-tasks/svn.rake
 tasks/test.rake

data/README.txt

@@ -100,6 +100,8 @@ Mr Bones provides the following rake tasks:
   gem:release       # Package and upload to RubyForge
   gem:repackage     # Force a rebuild of the package files
   gem:uninstall     # Uninstall the gem
+  git:create_tag    # Create a new tag in the Git repository
+  git:show_tags     # Show tags from the Git repository
   manifest          # Alias to manifest:check
   manifest:check    # Verify the manifest
   manifest:create   # Create a new manifest

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 596 2008-04-15 05:51:29Z tim_pease $
+# $Id$
 
 $:.unshift('lib')
 
@@ -10,7 +10,7 @@ PROJ.authors = 'Tim Pease'
 PROJ.email = 'tim.pease@gmail.com'
 PROJ.url = 'http://codeforpeople.rubyforge.org/bones'
 PROJ.version = Bones::VERSION
-PROJ.release_name = 'Happy Tax Day'
+PROJ.release_name = 'Haughty Hen'
 
 PROJ.rubyforge.name = 'codeforpeople'
 
@@ -30,11 +30,12 @@ PROJ.gem.extras[:post_install_message] = <<-MSG
 --------------------------
 MSG
 
-PROJ.ann.paragraphs = %w[install synopsis features requirements].unshift('version 2.0.0 changes')
+PROJ.ann.paragraphs = %w[install synopsis features requirements]
 PROJ.ann.text = <<-ANN
 == FUN FACT
 
-The number of left-handed men is double that of left-handed women.
+XML is much like violence --
+if it's not solving your problem then you are not using enough of it.
 
 == POST SCRIPT
 

data/data/tasks/gem.rake

@@ -91,7 +91,7 @@ namespace :gem do
   end
 
   desc 'Install the gem'
-  task :install => [:clobber, :package] do
+  task :install => [:clobber, 'gem:package'] do
     sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
 
     # use this version of the command for rubygems > 1.0.0
@@ -109,6 +109,11 @@ namespace :gem do
   desc 'Reinstall the gem'
   task :reinstall => [:uninstall, :install]
 
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+
 end  # namespace :gem
 
 desc 'Alias to gem:package'

data/data/tasks/git.rake

@@ -0,0 +1,41 @@
+# $Id$
+
+if HAVE_GIT
+
+namespace :git do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  desc 'Show tags from the Git repository'
+  task :show_tags => 'git:prereqs' do |t|
+    puts %x/git tag/
+  end
+
+  desc 'Create a new tag in the Git repository'
+  task :create_tag => 'git:prereqs' do |t|
+    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
+
+    tag = "%s-%s" % [PROJ.name, PROJ.version]
+    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
+
+    puts "Creating Git tag '#{tag}'"
+    unless system "git tag -a -m '#{msg}' #{tag}"
+      abort "Tag creation failed"
+    end
+
+    if %x/git remote/ =~ %r/^origin\s*$/
+      unless system "git push origin #{tag}"
+        abort "Could not push tag to remote Git repository"
+      end
+    end
+  end
+
+end  # namespace :git
+
+task 'gem:release' => 'git:create_tag'
+
+end  # if HAVE_GIT
+
+# EOF

data/data/tasks/rubyforge.rake

@@ -7,7 +7,7 @@ require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, :package] do |t|
+  task :release => [:clobber, 'gem:package'] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
     pkg = "pkg/#{PROJ.gem._spec.full_name}"

data/data/tasks/setup.rb

@@ -18,7 +18,7 @@ PROJ = OpenStruct.new(
   :email => nil,
   :url => "\000",
   :version => ENV['VERSION'] || '0.0.0',
-  :exclude => %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/),
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
   :release_name => ENV['RELEASE'],
 
   # System Defaults
@@ -58,7 +58,7 @@ PROJ = OpenStruct.new(
 
   # File Annotations
   :notes => OpenStruct.new(
-    :exclude => %w(^tasks/setup.rb$),
+    :exclude => %w(^tasks/setup\.rb$),
     :extensions => %w(.txt .rb .erb) << '',
     :tags => %w(FIXME OPTIMIZE TODO)
   ),
@@ -74,8 +74,8 @@ PROJ = OpenStruct.new(
   # Rdoc
   :rdoc => OpenStruct.new(
     :opts => [],
-    :include => %w(^lib/ ^bin/ ^ext/ .txt$),
-    :exclude => %w(extconf.rb$),
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :exclude => %w(extconf\.rb$),
     :main => nil,
     :dir => 'doc',
     :remote_dir => nil
@@ -159,6 +159,8 @@ GEM  = WIN32 ? 'gem.bat'  : 'gem'
 end
 HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
             system("svn --version 2>&1 > #{DEV_NULL}"))
+HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
+            system("git --version 2>&1 > #{DEV_NULL}"))
 
 # Reads a file at +path+ and spits out an array of the +paragraphs+
 # specified.

data/lib/bones.rb

@@ -1,9 +1,9 @@
-# $Id: bones.rb 593 2008-04-07 21:10:34Z tim_pease $
+# $Id$
 
 module Bones
 
   # :stopdoc:
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
   PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   WIN32 = %r/win32/ =~ RUBY_PLATFORM
   DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'

data/lib/bones/annotation_extractor.rb

@@ -1,4 +1,4 @@
-# $Id: annotation_extractor.rb 588 2008-04-07 20:43:07Z tim_pease $
+# $Id$
 
 begin
   require 'facets/ansicode'

data/lib/bones/debug.rb

@@ -1,4 +1,4 @@
-# $Id: debug.rb 579 2008-03-19 18:53:22Z tim_pease $
+# $Id$
 
 require 'pp'
 require 'stringio'

data/lib/bones/main.rb

@@ -1,4 +1,4 @@
-# $Id: main.rb 579 2008-03-19 18:53:22Z tim_pease $
+# $Id$
 
 require 'fileutils'
 require 'optparse'
@@ -115,16 +115,19 @@ class Main
       files_to_copy.each {|fn| cp fn}
 
       pwd = File.expand_path(FileUtils.pwd)
-      begin
-        FileUtils.cd output_dir
-        system "rake manifest:create 2>&1 > #{::Bones::DEV_NULL}"
-        msg = "created '#{name}'"
-        msg << " in directory '#{output_dir}'" if name != output_dir
-        msg << "\nnow you need to fix these files"
-        STDOUT.puts msg
-        system "rake notes"
-      ensure
-        FileUtils.cd pwd
+      msg = "created '#{name}'"
+      msg << " in directory '#{output_dir}'" if name != output_dir
+      STDOUT.puts msg
+
+      if test(?f, File.join(output_dir, 'Rakefile'))
+        begin
+          FileUtils.cd output_dir
+          system "rake manifest:create 2>&1 > #{::Bones::DEV_NULL}"
+          STDOUT.puts "now you need to fix these files"
+          system "rake notes"
+        ensure
+          FileUtils.cd pwd
+        end
       end
     rescue Exception => err
       FileUtils.rm_rf output_dir

data/lib/bones/smtp_tls.rb

@@ -1,4 +1,4 @@
-# $Id: smtp_tls.rb 536 2008-02-18 23:07:49Z tim_pease $
+# $Id$
 
 # This code enables SMTPTLS authentication requireed for sending mail
 # via the gmail servers. I found this code via a blog entry from James

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-# $Id: gem.rake 596 2008-04-15 05:51:29Z tim_pease $
+# $Id$
 
 require 'rake/gempackagetask'
 
@@ -91,7 +91,7 @@ namespace :gem do
   end
 
   desc 'Install the gem'
-  task :install => [:clobber, :package] do
+  task :install => [:clobber, 'gem:package'] do
     sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
 
     # use this version of the command for rubygems > 1.0.0
@@ -109,6 +109,11 @@ namespace :gem do
   desc 'Reinstall the gem'
   task :reinstall => [:uninstall, :install]
 
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+
 end  # namespace :gem
 
 desc 'Alias to gem:package'

data/tasks/git.rake

@@ -0,0 +1,41 @@
+# $Id$
+
+if HAVE_GIT
+
+namespace :git do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  desc 'Show tags from the Git repository'
+  task :show_tags => 'git:prereqs' do |t|
+    puts %x/git tag/
+  end
+
+  desc 'Create a new tag in the Git repository'
+  task :create_tag => 'git:prereqs' do |t|
+    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
+
+    tag = "%s-%s" % [PROJ.name, PROJ.version]
+    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
+
+    puts "Creating Git tag '#{tag}'"
+    unless system "git tag -a -m '#{msg}' #{tag}"
+      abort "Tag creation failed"
+    end
+
+    if %x/git remote/ =~ %r/^origin\s*$/
+      unless system "git push origin #{tag}"
+        abort "Could not push tag to remote Git repository"
+      end
+    end
+  end
+
+end  # namespace :git
+
+task 'gem:release' => 'git:create_tag'
+
+end  # if HAVE_GIT
+
+# EOF

data/tasks/rubyforge.rake

@@ -7,7 +7,7 @@ require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, :package] do |t|
+  task :release => [:clobber, 'gem:package'] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
     pkg = "pkg/#{PROJ.gem._spec.full_name}"

data/tasks/setup.rb

@@ -18,7 +18,7 @@ PROJ = OpenStruct.new(
   :email => nil,
   :url => "\000",
   :version => ENV['VERSION'] || '0.0.0',
-  :exclude => %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/),
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
   :release_name => ENV['RELEASE'],
 
   # System Defaults
@@ -58,7 +58,7 @@ PROJ = OpenStruct.new(
 
   # File Annotations
   :notes => OpenStruct.new(
-    :exclude => %w(^tasks/setup.rb$),
+    :exclude => %w(^tasks/setup\.rb$),
     :extensions => %w(.txt .rb .erb) << '',
     :tags => %w(FIXME OPTIMIZE TODO)
   ),
@@ -74,8 +74,8 @@ PROJ = OpenStruct.new(
   # Rdoc
   :rdoc => OpenStruct.new(
     :opts => [],
-    :include => %w(^lib/ ^bin/ ^ext/ .txt$),
-    :exclude => %w(extconf.rb$),
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :exclude => %w(extconf\.rb$),
     :main => nil,
     :dir => 'doc',
     :remote_dir => nil
@@ -159,6 +159,8 @@ GEM  = WIN32 ? 'gem.bat'  : 'gem'
 end
 HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
             system("svn --version 2>&1 > #{DEV_NULL}"))
+HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
+            system("git --version 2>&1 > #{DEV_NULL}"))
 
 # Reads a file at +path+ and spits out an array of the +paragraphs+
 # specified.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-14 00:00:00 -06:00
+date: 2008-06-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - data/tasks/ann.rake
 - data/tasks/bones.rake
 - data/tasks/gem.rake
+- data/tasks/git.rake
 - data/tasks/manifest.rake
 - data/tasks/notes.rake
 - data/tasks/post_load.rake
@@ -66,6 +67,7 @@ files:
 - tasks/ann.rake
 - tasks/bones.rake
 - tasks/gem.rake
+- tasks/git.rake
 - tasks/manifest.rake
 - tasks/notes.rake
 - tasks/post_load.rake
@@ -73,7 +75,6 @@ files:
 - tasks/rubyforge.rake
 - tasks/setup.rb
 - tasks/spec.rake
-- tasks/svn.rake
 - tasks/test.rake
 has_rdoc: true
 homepage: http://codeforpeople.rubyforge.org/bones

data/tasks/svn.rake

@@ -1,48 +0,0 @@
-# $Id$
-
-if HAVE_SVN
-
-unless PROJ.svn.root
-  info = %x/svn info ./
-  m = %r/^Repository Root:\s+(.*)$/.match(info)
-  PROJ.svn.root = (m.nil? ? '' : m[1])
-end
-PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
-
-namespace :svn do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  desc 'Show tags from the SVN repository'
-  task :show_tags => 'svn:prereqs' do |t|
-    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
-    tags.gsub!(%r/\/$/, '')
-    tags = tags.split("\n").sort {|a,b| b <=> a}
-    puts tags
-  end
-
-  desc 'Create a new tag in the SVN repository'
-  task :create_tag => 'svn:prereqs' do |t|
-    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
-    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
-
-    svn = PROJ.svn
-    trunk = File.join(svn.root, svn.trunk)
-    tag = "%s-%s" % [PROJ.name, PROJ.version]
-    tag = File.join(svn.root, svn.tags, tag)
-    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
-
-    puts "Creating SVN tag '#{tag}'"
-    unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
-      abort "Tag creation failed" 
-    end
-  end
-
-end  # namespace :svn
-
-task 'gem:release' => 'svn:create_tag'
-
-end  # if PROJ.svn.path
-
-# EOF