bones 2.4.0 → 2.5.0

data/.autotest

@@ -0,0 +1 @@
+require 'autotest/redgreen'

data/History.txt

@@ -1,3 +1,21 @@
+== 2.5.0 / 2009-04-05
+
+* 1 minor enhancement
+  - added support for ZenTest autotest
+* 1 bug fix
+  - files without extensions are picked up when generating a new project
+
+== 2.4.2 / 2009-03-02
+
+* 2 bug fixes
+  - SMTP/TLS will not be used if openssl is not present
+  - fixed rdoc title generation
+
+== 2.4.1 / 2009-03-02
+
+* 1 minor enhancement
+  - jruby 1.2 compatability
+
 == 2.4.0 / 2009-02-01
 
 * 1 minor enhancement

data/README.rdoc

@@ -17,6 +17,7 @@ Mr Bones provides the following rake tasks:
   ann               # Alias to ann:announcement
   ann:announcement  # Create an announcement file
   ann:email         # Send an email announcement
+  autotest          # Run the autotest loop
   bones:debug       # Show the PROJ open struct
   clean             # Remove any temporary products.
   clobber           # Remove any generated file.

data/Rakefile

@@ -9,7 +9,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 = 'Zygomatic'
+PROJ.release_name = 'Maxilla'
 PROJ.ruby_opts = %w[-W0]
 PROJ.readme_file = 'README.rdoc'
 PROJ.ignore_file = '.gitignore'

data/lib/bones/app/command.rb

@@ -81,8 +81,7 @@ class Command
   def mrbones_dir
     return @mrbones_dir if defined? @mrbones_dir
 
-    path = (::Bones::WIN32 ? ENV['HOMEPATH'].tr("\\", "/") : ENV['HOME'])
-    path = File.join(path, '.mrbones')
+    path = File.join(::Bones::HOME, '.mrbones')
     @mrbones_dir = File.expand_path(path)
   end
 

data/lib/bones/app/create_command.rb

@@ -30,7 +30,7 @@ class CreateCommand < Command
         begin
           FileUtils.cd output_dir
           @out.puts "Now you need to fix these files"
-          system "rake notes"
+          system "#{::Bones::RUBY} -S rake notes"
         ensure
           FileUtils.cd pwd
         end

data/lib/bones/app/file_manager.rb

@@ -140,7 +140,7 @@ class FileManager
     rgxp = %r/\A#{source}\/?/
     exclude = %r/tmp$|bak$|~$|CVS|\.svn/
 
-    ary = Dir.glob(File.join(source, '**', '*.*'), File::FNM_DOTMATCH).map do |filename|
+    ary = Dir.glob(File.join(source, '**', '*'), File::FNM_DOTMATCH).map do |filename|
       next if exclude =~ filename
       next if test(?d, filename)
       filename.sub rgxp, ''

data/lib/bones/debug.rb

@@ -24,6 +24,7 @@ module Debug
 
     h = ostruct.instance_variable_get(:@table)
     h.keys.map {|k| k.to_s}.sort.each do |k|
+      sio.seek 0
       sio.truncate 0
       next if k =~ %r/^_/o
 

data/lib/bones/smtp_tls.rb

@@ -6,70 +6,75 @@
 # http://d.hatena.ne.jp/zorio/20060416
 # http://www.jamesbritt.com/2007/12/18/sending-mail-through-gmail-with-ruby-s-net-smtp
 
-require "openssl"
-require "net/smtp"
+begin
+  require "openssl"
+  require "net/smtp"
 
-Net::SMTP.class_eval do
-  private
-  def do_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
+  Net::SMTP.class_eval do
+    private
+    def do_start(helodomain, user, secret, authtype)
+      raise IOError, 'SMTP session already started' if @started
 
-    if user or secret
-      if 3 == self.method(:check_auth_args).arity
-        check_auth_args(user, secret, authtype)
-      else
-        check_auth_args(user, secret)
+      if user or secret
+        if 3 == self.method(:check_auth_args).arity
+          check_auth_args(user, secret, authtype)
+        else
+          check_auth_args(user, secret)
+        end
       end
-    end
 
-    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-    @socket = Net::InternetMessageIO.new(sock)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
+      sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+      @socket = Net::InternetMessageIO.new(sock)
+      @socket.read_timeout = 60 #@read_timeout
+      @socket.debug_output = STDERR #@debug_output
 
-    check_response(critical { recv_response() })
-    do_helo(helodomain)
+      check_response(critical { recv_response() })
+      do_helo(helodomain)
 
-    raise 'openssl library not installed' unless defined?(OpenSSL)
-    starttls
-    ssl = OpenSSL::SSL::SSLSocket.new(sock)
-    ssl.sync_close = true
-    ssl.connect
-    @socket = Net::InternetMessageIO.new(ssl)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-    do_helo(helodomain)
+      raise 'openssl library not installed' unless defined?(OpenSSL)
+      starttls
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.sync_close = true
+      ssl.connect
+      @socket = Net::InternetMessageIO.new(ssl)
+      @socket.read_timeout = 60 #@read_timeout
+      @socket.debug_output = STDERR #@debug_output
+      do_helo(helodomain)
 
-    authenticate user, secret, authtype if user
-    @started = true
-  ensure
-    unless @started
-      # authentication failed, cancel connection.
-        @socket.close if not @started and @socket and not @socket.closed?
-      @socket = nil
+      authenticate user, secret, authtype if user
+      @started = true
+    ensure
+      unless @started
+        # authentication failed, cancel connection.
+          @socket.close if not @started and @socket and not @socket.closed?
+        @socket = nil
+      end
     end
-  end
 
-  def do_helo(helodomain)
-    begin
-      if @esmtp
-        ehlo helodomain
-      else
-        helo helodomain
-      end
-    rescue Net::ProtocolError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
+    def do_helo(helodomain)
+      begin
+        if @esmtp
+          ehlo helodomain
+        else
+          helo helodomain
+        end
+      rescue Net::ProtocolError
+        if @esmtp
+          @esmtp = false
+          @error_occured = false
+          retry
+        end
+        raise
       end
-      raise
     end
-  end
 
-  def starttls
-    getok('STARTTLS')
+    def starttls
+      getok('STARTTLS')
+    end
   end
+
+# We cannot do TLS if we do not have 'openssl'
+rescue LoadError
 end
 
 # EOF

data/lib/bones/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/lib/bones/tasks/setup.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'ostruct'
 require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -124,9 +124,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -139,23 +137,17 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}

data/lib/bones/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

data/lib/bones.rb

@@ -1,11 +1,17 @@
 
+require 'rbconfig'
+
 module Bones
 
   # :stopdoc:
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
   PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  WIN32 = %r/win32/ =~ RUBY_PLATFORM
-  DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+  HOME = File.expand_path(ENV['HOME'] || ENV['USERPROFILE'])
+  DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
+
+  # Ruby Interpreter location - taken from Rake source code
+  RUBY = File.join(Config::CONFIG['bindir'],
+                   Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
   # :startdoc:
 
   # Returns the path for Mr Bones. If any arguments are given,
@@ -48,7 +54,7 @@ module Bones
     load bones_setup
 
     rakefiles = Dir.glob(File.join(Dir.pwd, %w[tasks *.rake])).sort
-    import(*rakefiles)
+    import(*rakefiles) unless rakefiles.empty?
   end
 
   # TODO: fix file lists for Test::Unit and RSpec

data/spec/bones/app/file_manager_spec.rb

@@ -36,21 +36,18 @@ describe Bones::App::FileManager do
   end
 
   it "should return a list of files to copy" do
-    @fm.source = Bones.path 'data'
+    @fm.source = Bones.path %w[spec data data]
 
     ary = @fm._files_to_copy
-    ary.length.should == 9
+    ary.length.should == 6
 
     ary.should == %w[
       .bnsignore
-      History.txt.bns
+      History
+      NAME/NAME.rb.bns
       README.txt.bns
       Rakefile.bns
-      bin/NAME.bns
       lib/NAME.rb.bns
-      spec/NAME_spec.rb.bns
-      spec/spec_helper.rb.bns
-      test/test_NAME.rb
     ]
   end
 

data/spec/data/data/.bnsignore

@@ -0,0 +1,16 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   PROJ.ignore_file = '.gitignore'
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg

data/spec/data/data/History

@@ -0,0 +1 @@
+This file has no extension

data/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/setup.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'ostruct'
 require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -124,9 +124,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -139,23 +137,17 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -07:00
+date: 2009-04-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 0.8.4
     version: 
 description: Mr Bones is a handy tool that builds a skeleton for your new Ruby projects. The skeleton contains some starter code and a collection of rake tasks to ease the management and deployment of your source code. Mr Bones is not viral -- all the code your project needs is included in the skeleton (no gem dependency required).
 email: tim.pease@gmail.com
@@ -43,8 +43,10 @@ extra_rdoc_files:
 - lib/bones/tasks/spec.rake
 - lib/bones/tasks/svn.rake
 - lib/bones/tasks/test.rake
+- lib/bones/tasks/zentest.rake
 - spec/data/foo/README.txt
 files: 
+- .autotest
 - History.txt
 - README.rdoc
 - Rakefile
@@ -82,9 +84,12 @@ files:
 - lib/bones/tasks/spec.rake
 - lib/bones/tasks/svn.rake
 - lib/bones/tasks/test.rake
+- lib/bones/tasks/zentest.rake
 - spec/bones/app/file_manager_spec.rb
 - spec/bones/app_spec.rb
 - spec/bones_spec.rb
+- spec/data/data/.bnsignore
+- spec/data/data/History
 - spec/data/data/NAME/NAME.rb.bns
 - spec/data/data/README.txt.bns
 - spec/data/data/Rakefile.bns
@@ -104,6 +109,7 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
+- tasks/zentest.rake
 has_rdoc: true
 homepage: http://codeforpeople.rubyforge.org/bones
 post_install_message: |