falsework 0.2.4 → 0.2.6

data/Rakefile

@@ -1,10 +1,12 @@
 # -*-ruby-*-
 
 require 'rake'
-require 'rake/gempackagetask'
 require 'rake/clean'
-require 'rake/rdoctask'
 require 'rake/testtask'
+require 'rubygems/package_task'
+
+gem 'rdoc'
+require 'rdoc/task'
 
 require_relative 'lib/falsework/meta'
 include Falsework
@@ -55,14 +57,14 @@ spec = Gem::Specification.new {|i|
   i.extra_rdoc_files = FileList['doc/*']
 
   i.add_dependency('git', '>=  1.2.5')
-  i.add_dependency('open4', '>= 1.0.1')
+  i.add_dependency('open4', '>= 1.1.0')
 }
 
-Rake::GemPackageTask.new(spec).define
+Gem::PackageTask.new(spec).define
 
 task default: [:naive, :repackage]
 
-Rake::RDocTask.new('doc') do |i|
+RDoc::Task.new('html') do |i|
   i.main = 'doc/README.rdoc'
   i.rdoc_files = FileList['doc/*', 'lib/**/*.rb']
   i.rdoc_files.exclude("lib/**/templates")

data/doc/NEWS.rdoc

@@ -1,3 +1,9 @@
+=== 0.2.6
+
+Fri Jul 15 20:07:45 EEST 2011
+
+- Updates for rubygems 1.8.5 and rake 0.9.2.
+
 === 0.2.4
 
 Thu May  5 23:45:24 EEST 2011

data/lib/falsework/meta.rb

@@ -1,7 +1,7 @@
 module Falsework
   module Meta
     NAME = 'falsework'
-    VERSION = '0.2.4'
+    VERSION = '0.2.6'
     AUTHOR = 'Alexander Gromnitsky'
     EMAIL = 'alexander.gromnitsky@gmail.com'
     HOMEPAGE = 'http://github.com/gromnitsky/' + NAME

data/lib/falsework/templates/naive/Gemfile.erb

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-gem "open4", "~>1.0.1"
+gem "open4", "~>1.1.0"
 gem "git", "~>1.2.5"

data/lib/falsework/templates/naive/Rakefile.erb

@@ -1,10 +1,12 @@
 # -*-ruby-*-
 
 require 'rake'
-require 'rake/gempackagetask'
 require 'rake/clean'
-require 'rake/rdoctask'
 require 'rake/testtask'
+require 'rubygems/package_task'
+
+gem 'rdoc'
+require 'rdoc/task'
 
 require_relative 'lib/<%= @project %>/meta'
 include <%= @project.capitalize %>
@@ -31,21 +33,20 @@ spec = Gem::Specification.new {|i|
   i.rdoc_options << '-m' << 'doc/README.rdoc'
   i.extra_rdoc_files = FileList['doc/*']
 
-  i.add_dependency('open4', '>= 1.0.1')
+  i.add_dependency('open4', '>= 1.1.0')
   i.add_development_dependency('git', '>= 1.2.5')
 }
 
-Rake::GemPackageTask.new(spec).define
+Gem::PackageTask.new(spec).define
 
 task default: [:repackage]
 
-Rake::RDocTask.new('doc') {|i|
+RDoc::Task.new('html') do |i|
   i.main = 'doc/README.rdoc'
   i.rdoc_files = FileList['doc/*', 'lib/**/*.rb']
 #  i.rdoc_files.exclude("lib/**/some-nasty-staff")
-}
+end
 
-Rake::TestTask.new {|i|
+Rake::TestTask.new do |i|
   i.test_files = FileList['test/test_*.rb']
-  i.libs << '.'
-}
+end

data/lib/falsework/templates/naive/lib/%%@project%%/trestle.rb.erb

@@ -89,7 +89,7 @@ module <%= @project.capitalize %>
       end
 
       if @conf[:verbose] >= level
-        nnl ? print(t) : puts(t)
+        nnl ? print(t) : print("#{t}\n")
         STDOUT.flush
       end
     end
@@ -188,10 +188,10 @@ module <%= @project.capitalize %>
           puts Meta::VERSION
           exit 0
         }
-        o.on('--config NAME', "Set a config name (default is #{@conf[:config]})") {|i|
+        o.on('--config NAME', "Set a config name (default is #{@conf[:config]}).") {|i|
           @conf[:config] = i
         }
-        o.on('--config-dirs', 'Show possible config locations') {
+        o.on('--config-dirs', 'Show possible config locations.') {
           @conf[:config_dirs].each { |j|
             f = j + '/' + @conf[:config]
             puts (File.readable?(f) ? '* ' : '  ') +  f
@@ -213,4 +213,4 @@ module <%= @project.capitalize %>
   end # trestle
 end
 
-# Don't remove this: falsework/0.2.4/naive/2011-04-30T01:22:46+03:00
+# Don't remove this: falsework/0.2.6/naive/2011-04-30T02:11:00+03:00

data/lib/falsework/templates/naive/test/helper_trestle.rb.erb

@@ -7,23 +7,20 @@ include FileUtils
 require_relative '../lib/<%= @project %>/trestle'
 include <%= @project.capitalize %>
 
-# don't run tests automatically if they were invoked as 'gem check -t ...'
-if $0 =~ /gem/
-  require 'minitest/unit'
-else
-  require 'minitest/autorun'
-end
+require 'minitest/autorun'
 
-# Return the right directory for (probably executable) _c_.
+# Return an absolute path of a _c_.
 def cmd(c)
   case File.basename(Dir.pwd)
   when Meta::NAME.downcase
     # test probably is executed from the Rakefile
     Dir.chdir('test')
+    STDERR.puts('*** chdir to ' + Dir.pwd)
   when 'test'
     # we are in the test directory, there is nothing special to do
   else
     # tests were invoked by 'gem check -t <%= @project %>'
+    # (for a classic rubygems 1.3.7)
     begin
       Dir.chdir(Trestle.gem_libdir + '/../../test')
     rescue
@@ -31,7 +28,7 @@ def cmd(c)
     end
   end
 
-  '../bin/' + c
+  File.absolute_path('../bin/' + c)
 end
 
-# Don't remove this: falsework/0.2.4/naive/2011-04-30T01:22:46+03:00
+# Don't remove this: falsework/0.2.6/naive/2011-04-30T02:11:00+03:00

data/lib/falsework/templates/naive/test/rake_git.rb.erb

@@ -33,4 +33,4 @@ end
 
 pp git_ls('.') if __FILE__ == $0
 
-# Don't remove this: falsework/0.2.4/naive/2011-04-30T01:22:46+03:00
+# Don't remove this: falsework/0.2.6/naive/2011-04-30T02:11:00+03:00

data/lib/falsework/templates/naive/test/test_%%@project%%.rb.erb

@@ -1,10 +1,9 @@
 require_relative 'helper'
 
 class Test<%= @project.capitalize %>_<%= rand 2**32 %> < MiniTest::Unit::TestCase
-  CMD = cmd('<%= @project %>') # get path to the exe & cd to tests directory
-  
   def setup
     # this runs every time before test_*
+    @cmd = cmd('<%= @project %>') # get path to the exe & cd to tests directory
   end
 
   def test_foobar

data/lib/falsework/trestle.rb

@@ -89,7 +89,7 @@ module Falsework
       end
 
       if @conf[:verbose] >= level
-        nnl ? print(t) : puts(t)
+        nnl ? print(t) : print("#{t}\n")
         STDOUT.flush
       end
     end
@@ -188,10 +188,10 @@ module Falsework
           puts Meta::VERSION
           exit 0
         }
-        o.on('--config NAME', "Set a config name (default is #{@conf[:config]})") {|i|
+        o.on('--config NAME', "Set a config name (default is #{@conf[:config]}).") {|i|
           @conf[:config] = i
         }
-        o.on('--config-dirs', 'Show possible config locations') {
+        o.on('--config-dirs', 'Show possible config locations.') {
           @conf[:config_dirs].each { |j|
             f = j + '/' + @conf[:config]
             puts (File.readable?(f) ? '* ' : '  ') +  f

data/test/helper_trestle.rb

@@ -7,23 +7,20 @@ include FileUtils
 require_relative '../lib/falsework/trestle'
 include Falsework
 
-# don't run tests automatically if they were invoked as 'gem check -t ...'
-if $0 =~ /gem/
-  require 'minitest/unit'
-else
-  require 'minitest/autorun'
-end
+require 'minitest/autorun'
 
-# Return the right directory for (probably executable) _c_.
+# Return an absolute path of a _c_.
 def cmd(c)
   case File.basename(Dir.pwd)
   when Meta::NAME.downcase
     # test probably is executed from the Rakefile
     Dir.chdir('test')
+    STDERR.puts('*** chdir to ' + Dir.pwd)
   when 'test'
     # we are in the test directory, there is nothing special to do
   else
     # tests were invoked by 'gem check -t falsework'
+    # (for a classic rubygems 1.3.7)
     begin
       Dir.chdir(Trestle.gem_libdir + '/../../test')
     rescue
@@ -31,5 +28,5 @@ def cmd(c)
     end
   end
 
-  '../bin/' + c
+  File.absolute_path('../bin/' + c)
 end

data/test/test_exe.rb

@@ -1,14 +1,13 @@
 require_relative 'helper'
 
 class TestFalsework < MiniTest::Unit::TestCase
-  CMD = cmd('falsework') # get path to the exe & cd to tests directory
-  
   def setup
     # this runs every time before test_*
+    @cmd = cmd('falsework') # get path to the exe & cd to tests directory
   end
 
   def test_project_list
-    r = Trestle.cmd_run "#{CMD} list"
+    r = Trestle.cmd_run "#{@cmd} list"
     assert_equal(0, r[0])
     assert_match(/naive\n/, r[2])
   end
@@ -21,7 +20,7 @@ class TestFalsework < MiniTest::Unit::TestCase
   
   def test_project_new
     rm_rf 'templates/foo'
-    r = Trestle.cmd_run "#{CMD} new templates/foo -v"
+    r = Trestle.cmd_run "#{@cmd} new templates/foo -v"
 #    pp r
     assert_equal(0, r[0], r)
 
@@ -32,6 +31,7 @@ class TestFalsework < MiniTest::Unit::TestCase
 
     tree = ["templates/foo/.git",
             "templates/foo/.gitignore",
+            "templates/foo/Gemfile",
             "templates/foo/README.rdoc",
             "templates/foo/Rakefile",
             "templates/foo/bin",
@@ -61,35 +61,35 @@ class TestFalsework < MiniTest::Unit::TestCase
     origdir = pwd
     cd 'templates/foo'
 
-    r = Trestle.cmd_run "../../#{CMD} exe qqq"
+    r = Trestle.cmd_run "#{@cmd} exe qqq"
     assert_equal(0, r[0])
     assert_equal(true, File.executable?('bin/qqq'))
     assert_equal(true, File.exist?('doc/qqq.rdoc'))
 
-    r = Trestle.cmd_run "../../#{CMD} test qqq"
+    r = Trestle.cmd_run "#{@cmd} test qqq"
     assert_equal(0, r[0])
     assert_equal(true, File.exist?('test/test_qqq.rb'))
 
     # upgrade
-    r = Trestle.cmd_run "../../#{CMD} upgrade -b"
+    r = Trestle.cmd_run "#{@cmd} upgrade -b"
     assert_equal(0, r[0])
     rm ['test/helper_trestle.rb', 'test/rake_git.rb']
-    r = Trestle.cmd_run "../../#{CMD} upgrade -b"
+    r = Trestle.cmd_run "#{@cmd} upgrade -b"
     assert_equal(0, r[0])
     sed 'test/helper_trestle.rb',
     /^(# Don't.+falsework\/)\d+\.\d+\.\d+(\/.+)$/, '\1999.999.999\2'
-    r = Trestle.cmd_run "../../#{CMD} upgrade -b"
+    r = Trestle.cmd_run "#{@cmd} upgrade -b"
     assert_equal(1, r[0])
     assert_match(/file .+ is from .+ falsework: 999.999.999/, r[1])
     mv('test', 'ttt')
-    r = Trestle.cmd_run "../../#{CMD} upgrade -b"
+    r = Trestle.cmd_run "#{@cmd} upgrade -b"
     assert_equal(0, r[0])
     
     cd origdir
   end
 
   def test_project_invalid_name
-    r = Trestle.cmd_run "#{CMD} new 123"
+    r = Trestle.cmd_run "#{@cmd} new 123"
     assert_equal(1, r[0])
     assert_match(/project name cannot start with a digit/, r[1])
   end

metadata

@@ -2,7 +2,7 @@
 name: falsework
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors: 
 - Alexander Gromnitsky
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   version_requirements: *id002
 description: A primitive scaffold generator for writing CLI programs in Ruby.
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.0
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A primitive scaffold generator for writing CLI programs in Ruby