rook 0.1.0 → 0.2.0

data/doc-api/index.html

@@ -19,6 +19,6 @@
         <frame src="fr_class_index.html"  name="Classes" />
         <frame src="fr_method_index.html" name="Methods" />
     </frameset>
-    <frame src="files/__/README_txt.html" name="docwin" />
+    <frame src="files/rook_rb.html" name="docwin" />
 </frameset>
 </html>

data/examples/hello_c/Rookbook.rb

@@ -17,7 +17,7 @@ recipe command		, "#{command}.o"   			do
     end
 
 
-recipe '*.o'		, '$(1).c', :options=>['$(1).h']	do
+recipe '*.o'		, '$(1).c', :toppings=>['$(1).h']	do
 	sys "#{@cc} #{@cflags} -c #{@ingred}"
     end 
 

data/examples/hello_c/Rookbook.yaml

@@ -1,8 +1,8 @@
 ##
 ## Rookbook.yaml
 ##
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release$
+## $Copyright$
 ##
 
 
@@ -13,7 +13,7 @@ properties:
   - rook_product : :all
 
 
-variables:
+parameters:
   - command :  hello
 
 
@@ -21,25 +21,25 @@ recipes:
 
   - product:	$(command)
     ingreds:	[ $(command).o ]
-    method: |
+    method*: |
 	sys "$(cc) $(cflags) -o #{@product} #{@ingred}"
     
   - product:	*.o
     ingreds:	[ $(1).c ]
-    options:	[ $(1).h ]
-    method: |
+    toppings:	[ $(1).h ]
+    method*: |
 	sys "$(cc) $(cflags) -c #{@ingred}"
 
   - product:	:all
     ingreds:	[ $(command) ]
 
   - product:	:clean
-    method: |
+    method*: |
 	byprods = Dir.glob('*.o')
 	rm_f byprods unless byprods.empty?
 
   - product:	:clear
     ingreds:	[ :clean ]
-    method: |
+    method*: |
 	rm_f command
 

data/examples/project/README.txt

@@ -3,6 +3,6 @@
 This is an example project for Rook.
 
 Try the following command:
-* rook -b Rookbook.yaml --release=1.2.3 :pakcages
-* rook -b Rookbook.rb --release=1.2.3 :pakcages
+* rook -b Rookbook.yaml --release=1.2.3 :packages
+* rook -b Rookbook.rb --release=1.2.3 :packages
 

data/examples/project/Rookbook.rb

@@ -1,21 +1,21 @@
 ##
 ## Rookbook.yaml
 ##
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release$
+## $Copyright$
 ##
 
 
 ## properties
 
 property :release,   '0.0.0',    :desc=>'release number'
-#property :rook_product,  :packages
 
 
-## variables
+## parameters
 
 copyright = 'copyright(c) 2006 kuwata-lab all rights reserved'
 project   = 'example'
+#parameter :rook_product,  :packages
 
 
 ## recipes
@@ -28,45 +28,45 @@ recipe :packages		, "#{base}.tar.gz", "#{base}.zip", "#{base}.gem"
 desc 'create *.tar.gz'
 recipe "#{project}-*.tar.gz"	, "#{project}-$(1)"	do
 	comment @desc
-	tmpdir = @ingreds[0]   # or @ingred
+	dir = @ingred   # or @ingreds[0]
 	rm_f @product
-	tar_czf @product, tmpdir
+	tar_czf @product, dir
     end
 
 
 desc 'create *.zip'
 recipe "#{project}-*.zip"	, "#{project}-$(1)"	do
 	comment @desc
-	tmpdir = @ingreds[0]   # or @ingred
+	dir = @ingred   # or @ingreds[0]
 	rm_f @product
-	zip_r @product, tmpdir
+	zip_r @product, dir
     end
 
 
 desc 'generate *.gem package'
 recipe "#{project}-*.gem"	, "#{project}-$(1)"	do
 	comment @desc
-	tmpdir = @ingreds[0]   # or @ingred
-	chdir tmpdir do
+	dir = @ingred   # or @ingreds[0]
+	chdir dir do
 	  specfile = "#{project}.gemspec"
 	  #sys "gem build #{specfile}"
 	  Gem.manage_gems
 	  Gem::GemRunner.new.run ['build', specfile]
 	end
-	mv "#{tmpdir}/#{@product}", '.'
+	mv "#{dir}/#{@product}", '.'
     end
 
 
 recipe "#{project}-*"		, :doc			do
 	comment "create temporary directory"
-	tmpdir = @product
-	rm_rf tmpdir
-	mkdir_p tmpdir
+	dir = @product
+	rm_rf dir
+	mkdir_p dir
 
 	comment "store all files but CVS directory"
 	files = %W[lib/**/*.rb bin/* test/* doc
                     README.txt setup.rb #{project}.gemspec]
-	store files, tmpdir do |file| file !~ /\bCVS\b/ end
+	store files, dir do |file| file !~ /\bCVS\b/ end
 
 	### `store' is equivarent to the following:
 	# files = %w[lib/**/*.rb bin/* test/**/* doc README.txt setup.rb]
@@ -75,16 +75,17 @@ recipe "#{project}-*"		, :doc			do
 	# list.each do |file|
 	#   next if file !~ /\bCVS\b/   # filter
 	#   srcdir = File.dirname(file)
-	#   destdir = "#{tmpdir}/#{srcdir}"
+	#   destdir = "#{dir}/#{srcdir}"
 	#   mkdir_p(destdir) unless test(?e, destdir)
 	#   cp_r(file, destdir)
 	# end
 
 	comment "replace '$Release\$' and '$Copyright\$'"
-	edit "#{tmpdir}/**/*" do |content, filename|
-	  next if filename == "#{tmpdir}/setup.rb"
-	  content.gsub!(/\$Release\$/,  @release)
+	edit "#{dir}/**/*" do |content, filename|
+	  next if filename == "#{dir}/setup.rb"
+	  content.gsub!(/\$Release\$/, "$Release: #{@release} $")
 	  content.gsub!(/\$Copyright\$/, copyright)
+	  content
 	end
 
     end

data/examples/project/Rookbook.yaml

@@ -1,21 +1,21 @@
 ##
 ## Rookbook.yaml
 ##
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release$
+## $Copyright$
 ##
 
 
 properties:
   - release   :  0.0.0
-  #- rook_product : :packages
 
 
-variables:
+parameters:
   - copyright :  copyright(c) 2006 kuwata-lab all rights reserved.
   - project   :  example
   - base      :  $(project)-$(release)
   - pkglist   :  [ $(base).tar.gz, $(base).zip, $(base).gem ]
+  #- rook_product : :packages
 
 
 recipes:
@@ -23,53 +23,54 @@ recipes:
   - product:	:packages
     desc:	create packages
     ingreds:	[ $(pkglist) ]
-    
+
 
   - product:	$(project)-*.tar.gz
     desc:	create *.tar.gz
     ingreds:	[ $(project)-$(1) ]
-    method: |
+    method*: |
 	comment @desc
-	tmpdir = @ingreds[0]
-	tar_czf @product, tmpdir
+	dir = @ingred   # or ingreds[0]
+	tar_czf @product, dir
 
 
   - product:	$(project)-*.zip
     desc:	create *.zip
     ingreds:	[ $(project)-$(1) ]
-    method: |
+    method*: |
 	comment @desc
-	tmpdir = @ingreds[0]
-	zip_r @product, tmpdir
+	rm_f @product
+	dir = @ingred   # or ingreds[0]
+	zip_r @product, dir
 
 
   - product:	$(project)-*.gem
     desc:	generate *.gem package
     ingreds:	[ $(project)-$(1) ]
-    method: |
+    method*: |
 	comment @desc
-	tmpdir = @ingreds[0]
-	chdir tmpdir do
+	dir = @ingred   # or ingreds[0]
+	chdir dir do
 	  specfile = "$(project).gemspec"
 	  #sys "gem build #{specfile}"
 	  Gem.manage_gems
 	  Gem::GemRunner.new.run ['build', specfile]
 	end
-	mv "#{tmpdir}/#{@product}", '.'
+	mv "#{dir}/#{@product}", '.'
 
 
   - product:	$(project)-*
     ingreds:	[ :doc ]
-    method: |
+    method*: |
 	comment "create temporary directory"
-	tmpdir = @product
-	rm_rf tmpdir
-	mkdir_p tmpdir
+	dir = @product
+	rm_rf dir
+	mkdir_p dir
 
 	comment "store all files but CVS directory"
 	files = %w[lib/**/*.rb bin/* test/**/* doc
                     README.txt setup.rb $(project).gemspec]
-	store files, tmpdir do |file| file !~ /\bCVS\b/ end
+	store files, dir do |file| file !~ /\bCVS\b/ end
 
 	### `store' is equivarent to the following:
 	# files = %w[lib/**/*.rb bin/* test/**/* doc README.txt setup.rb]
@@ -78,22 +79,23 @@ recipes:
 	# list.each do |file|
 	#   next if file !~ /\bCVS\b/   # filter
 	#   srcdir = File.dirname(file)
-	#   destdir = "#{tmpdir}/#{srcdir}"
+	#   destdir = "#{dir}/#{srcdir}"
 	#   mkdir_p(destdir) unless test(?e, destdir)
 	#   cp_r(file, destdir)
 	# end
 
 	comment "replace '$Release\$' and '$Copyright\$'"
-	edit "#{tmpdir}/**/*" do |content, filename|
-	  next if filename == "#{tmpdir}/setup.rb"
-	  content.gsub!(/\$Release\$/,  @release)
+	edit "#{dir}/**/*" do |content, filename|
+	  next if filename == "#{dir}/setup.rb"
+	  content.gsub!(/\$Release\$/,  "$Release: #{@release} $")
 	  content.gsub!(/\$Copyright\$/, copyright)
+	  content
 	end
 
 
   - product:	:doc
     desc:	create api-document by RDoc
-    method: |
+    method*: |
 	comment @desc
 	rm_rf 'doc'
 	chdir 'lib' do
@@ -102,16 +104,16 @@ recipes:
 
 
   - product:	:test
-    method: |
+    method*: |
 	sys "ruby -I lib test/test.rb"
 
 
   - product:	:clean
-    method: |
+    method*: |
 	rm_rf "$(project)-*/"
 
 
   - product:	:clear
-    method: |
+    method*: |
 	rm_rf "$(project)-*", 'doc'
 

data/examples/project/bin/example

@@ -2,8 +2,8 @@
 
 ##
 ## $Id$
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release$
+## $Copyright$
 ##
 
 require 'example'

data/examples/project/example.gemspec

@@ -6,7 +6,7 @@ spec = Gem::Specification.new do |s|
   ## package information
   s.name        = 'example'
   s.author      = 'foobar'
-  s.version     = '$Release: 0.1.0 $'
+  s.version     = ('$Release$' =~ /[.\d]+/) && $&
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'http://www.example.com'
   s.summary     = 'example project for Rook'

data/examples/project/lib/example.rb

@@ -1,7 +1,7 @@
 ##
 ## $Id$
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release$
+## $Copyright$
 ##
 require 'example/foo'
 require 'example/bar'

data/examples/project/test/test.rb

@@ -1,7 +1,7 @@
 ##
 ## $Id$
-## $Release: 0.1.0 $
-## copyright(c) 2006 kuwata-lab.com all rights reserved.
+## $Release$
+## $Copyright$
 ##
 
 $LOAD_PATH << 'lib' if test(?f, 'lib/example.rb')

data/lib/rook.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 29 $
-## $Release: 0.1.0 $
+## $Rev: 37 $
+## $Release: 0.2.0 $
 ## copyright(c) 2006 kuwata-lab.com all rights reserved.
 ##
 
@@ -25,6 +25,8 @@ require 'fileutils'
 ##
 module Rook
 
+  RELEASE = ('$Release: 0.2.0 $' =~ /\$Release: 0.2.0 $/) && $1
+
   class RookError < StandardError
   end
 
@@ -38,6 +40,7 @@ module Rook
     def assert_failed(message)
       raise AssertionError.new(message)
     end
+    alias assert! assert_failed
   end
 
 end

data/lib/rook/commands.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 29 $
-## $Release: 0.1.0 $
+## $Rev: 36 $
+## $Release: 0.2.0 $
 ## copyright(c) 2006 kuwata-lab.com all rights reserved.
 ##
 
@@ -113,21 +113,23 @@ module Rook
       end
     end
 
-    def cmd(str)  # :doc:
-      _system(:cmd, str, false)
-    end
-
-    def cmd!(str)  # :doc:
-      _system(:'cmd!', str, true)
-    end
-
-    def system(str)  # :doc:
-      _system(:system, str, false)
-    end
-
-    def system!(str)  # :doc:
-      _system(:'system!', str, true)
-    end
+    #--
+    #def cmd(str)  # :doc:
+    #  _system(:cmd, str, false)
+    #end
+    #
+    #def cmd!(str)  # :doc:
+    #  _system(:'cmd!', str, true)
+    #end
+    #
+    #def system(str)  # :doc:
+    #  _system(:system, str, false)
+    #end
+    #
+    #def system!(str)  # :doc:
+    #  _system(:'system!', str, true)
+    #end
+    #++
 
     def sys(str)  # :doc:
       _system(:sys, str, false)
@@ -355,6 +357,15 @@ module Rook
     end
 
 
+    def replace(*args, &block)  # :doc:
+      args, opts = _handle_args(:edit, args)
+      return if $rook_noexec
+      args.each do |filename|
+        File.replace(filename, &block) if test(?f, filename)
+      end
+    end
+
+
     def _zip(method_name, args)   # :nodoc:
       args, opts = _handle_args(method_name, args)
       return if $rook_noexec