rook 0.1.0 → 0.2.0

data/lib/rook/main.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.
 ##
 
@@ -27,25 +27,24 @@ module Rook
   class Main
 
 
-    def initialize(argv=ARGV, stdout=$stdout, stderr=$stderr)
+    def initialize(argv=ARGV)
       @argv   = argv
-      @stdout = stdout
-      @stderr = stderr
       @options, @properties = parse_argv(@argv)
       @options[?h] = true if @properties['help'] == true
       @products = argv
     end
 
 
-    def self.main(argv=ARGV, stdout=$stdout, stderr=$stderr)
+    def self.main(argv=ARGV)
       status = 0
       begin
-        main = self.new(argv, stdout, stderr)
-        main.execute()
+        main = self.new(argv)
+        output = main.execute()
+        #print output if output
       rescue RookError => ex
         status = 1
         raise ex if $rook_debug
-        stderr.puts "*** error: #{ex.message}"
+        $stderr.puts "*** error: #{ex.message}"
       end
       exit status
     end
@@ -65,9 +64,9 @@ module Rook
         cmdname = File.basename($0)
         #desc = "#{cmdname} - a SCM (software configuration management) tool like Make, Rake, Ant, or Cook.\n"
         desc = "#{cmdname} - a SCM (Software Cooking Management) tool like Make, Rake, Ant, or Cook.\n"
-        @stdout.puts version() if @options[?v]
-        @stdout.puts desc      if @options[?h]
-        @stdout.puts help()    if @options[?h]
+        puts version() if @options[?v]
+        puts desc      if @options[?h]
+        puts help()    if @options[?h]
         return
       end
 
@@ -77,20 +76,20 @@ module Rook
       ## bookname
       bookname = @options[?f] || @options[?b]
       if bookname
-        test(?f, bookname) or raise CommandOptionError.new("cookbook '#{bookname}' not found.")
+        test(?f, bookname) or raise _error("cookbook '#{bookname}' not found.")
       else
         ['.yaml', '.yml', '.rb', ''].each do |suffix|
           break if test(?f, bookname = "Rookbook#{suffix}")
           break if test(?f, bookname = "rookbook#{suffix}")
           bookname = nil
         end
-        bookname  or raise CommandOptionError.new("cookbook 'Rookbook.yaml' or 'Rookbook.rb' not found.")
+        bookname  or raise _error("cookbook 'Rookbook.yaml' or 'Rookbook.rb' not found.")
       end
 
       ## properties filename
       propfile = @options[?P]
       if propfile
-        test(?f, propfile) or raise CommandOptionError.new("file '#{propfile}' not found.")
+        test(?f, propfile) or raise _error("file '#{propfile}' not found.")
       else
         %w[Rookbook.props properties.yaml].each do |f|
           break propfile = f if test(?f, f)
@@ -108,23 +107,33 @@ module Rook
       $rook_forced  = @options[?F]
       $rook_noexec  = @options[?n] ? 1 : (@options[?N] ? 2 : nil)
 
-      # kitchen
-      props = { :verbose=>$rook_verbose, :forced=>$rook_forced, :noexec=>$rook_noexec }
-      kitchen = Kitchen.new(@properties, props)
-
       ## cookbook
-      if bookname =~ /\.ya?ml\z/
+      style = bookname =~ /\.ya?ml\z/ ? :yaml : :ruby
+      if style == :yaml
         flag_expand_tab = !options[?T]
         begin
           cookbook = Cookbook.new(bookname, true, flag_expand_tab)
         rescue CookbookError => ex
-          @stderr.puts "validation error:"
+          $stderr.puts "validation error:"
           ex.errors.each do |error|
             e = error
-            @stderr.puts " - line #{e.linenum}: [#{e.path}] #{e.message}"
+            $stderr.puts "#{bookname}:#{e.linenum}: [#{e.path}] #{e.message}"
           end
           return
         end
+      end
+
+      ## check
+      if @options[?c]
+        style == :yaml or raise _error("-c: cannot check Ruby-DSL style cookbook.")
+        cookbook.validate_rubycode()
+        return
+      end
+
+      ## kitchen
+      props = { :verbose=>$rook_verbose, :forced=>$rook_forced, :noexec=>$rook_noexec }
+      kitchen = Kitchen.new(@properties, props)
+      if style == :yaml
         kitchen.load_book(cookbook)
       else
         kitchen.load_script(bookname)
@@ -134,15 +143,21 @@ module Rook
       if @options[?l] || @options[?L]
         show_all   = @options[?L] ? true : false
         list_properties(kitchen, show_all)
-        @stdout.puts
+        puts
         list_recipes(kitchen, @options[?L])
         return
       end
 
-      ## show property value
+      ## show property/parameter value
       if @options[?p]
-        @options[?p].split(/,/).each do |pname|
-          pp kitchen.get_property(pname)
+        @options[?p].split(/,/).each do |name|
+          if kitchen.has_parameter?(name)
+            pp kitchen.get_parameter(name)
+          elsif kitchen.has_property?(name)
+            pp kitchen.get_property(name)
+          else
+            raise _error("-p #{name}: no such parameter or property.")
+          end
         end
         return
       end
@@ -152,12 +167,12 @@ module Rook
         products = @products
       elsif kitchen.find_specific_recipe(:default)
         products = [ :default ]
-      elsif prod = kitchen.get_variable('rook_product')
+      elsif prod = kitchen.get_parameter('rook_product')
         products = [ prod ]
       elsif prod = kitchen.get_property('rook_product')
         products = [ prod ]
       else
-        @stderr.puts "*** no product specified."
+        $stderr.puts "*** no product specified."
         list_recipes(kitchen)
         return
       end
@@ -168,30 +183,37 @@ module Rook
         kitchen.start_cooking(product)
       end
 
+      return nil
+
     end
 
 
     private
 
 
+    def _error(message)
+      return CommandOptionError.new(message)
+    end
+
+
     def list_properties(kitchen, show_all=false)
-      @stdout.puts "properites:"
+      puts "properites:"
       kitchen.properties.each do |hash|
         next unless show_all || hash['access'] == 'public'
-        @stdout.puts "  %-18s = %s" % [hash['name'], hash['value'].inspect]
+        puts "  %-18s = %s" % [hash['name'], hash['value'].inspect]
       end
       return unless show_all
-      @stdout.puts "\nvariables:"
-      kitchen.variables.each do |hash|
-        @stdout.puts "  %-18s = %s" % [hash['name'], hash['value'].inspect]
+      puts "\nparameters:"
+      kitchen.parameters.each do |hash|
+        puts "  %-18s = %s" % [hash['name'], hash['value'].inspect]
       end
     end
 
 
     def list_recipes(kitchen, show_all=false)
-      @stdout.puts "recipes:"
+      puts "recipes:"
       kitchen.recipes.each do |r|
-        @stdout.puts "  %-18s : %s" % [Util.to_str(r.product), r.desc] if show_all || r.public?
+        puts "  %-18s : %s" % [Util.to_str(r.product), r.desc] if show_all || r.public?
       end
     end
 
@@ -203,19 +225,20 @@ module Rook
       s << "Usage: #{cmdname} [-hvTFnNqQVlLc] [-f bookname] [-k kanji] [-F[n]] product...\n"
       s << "  -h           :  help\n"
       s << "  -v           :  version\n"
-      s << "  -t           :  expand tab character in cookbook\n"
+      #s << "  -t           :  expand tab character in cookbook\n"
       s << "  -T           :  don't expand tab character in cookbook\n"
       s << "  -n           :  no execute\n"
       s << "  -N           :  never execute\n"
       s << "  -q           :  quiet\n"
       s << "  -Q           :  more quiet\n"
-      s << "  -V           :  verbose\n"
+      #s << "  -V           :  verbose\n"
       s << "  -l           :  list public recipes and properties\n"
-      s << "  -L           :  list all recipes, properties, and variables\n"
+      s << "  -L           :  list all recipes, properties, and parameters\n"
       s << "  -c           :  validation check of cookbook\n"
-      s << "  -F           :  execute forcelly\n"
+      s << "  -F           :  execute forcedly\n"
       s << "  -b bookname  :  cookbook name\n"
       s << "  -f bookname  :  equal to `-b bookname'\n"
+      s << "  -P propfile  :  property file (default 'Rookbook.props'/'Properties.yaml')\n"
       s << "  -p property  :  show property value in 'pp' format\n"
       s << "  -k kanji     :  kanji code (euc/sjis/utf8)\n"
       s << "  -r file[,..] :  require libraries\n"
@@ -225,11 +248,14 @@ module Rook
 
 
     def version
-      return ('$Release: 0.1.0 $' =~ /[\.\d]+/) && $&
+      return ('$Release: 0.2.0 $' =~ /[\.\d]+/) && $&
     end
 
 
     def parse_argv(argv)
+      single_opts = "hvcTnNqQVlL"
+      argument_opts = "fbkrpP"
+      optional_opts = "FD"
       options = {}
       properties = {}
       while !argv.empty? && argv[0][0] == ?-
@@ -237,7 +263,7 @@ module Rook
         break if optstr == '-'
         if optstr[1] == ?-     # property
           unless optstr =~ /\A--([a-zA-Z_]\w*)(?:=(.*))?\z/
-            raise CommandOptionError.new("#{optstr}: invalid option pattern.")
+            raise _error("#{optstr}: invalid option pattern.")
           end
           name = $1
           value = YAML.load($2)
@@ -247,24 +273,23 @@ module Rook
           while optstr && !optstr.empty?
             optch = optstr[0]
             optstr[0, 1] = ''
-            case optch
-            when ?h, ?v, ?c, ?t, ?T, ?n, ?N, ?q, ?Q, ?V, ?l, ?L
+            if single_opts.include?(optch)
               options[optch] = true
-            when ?f, ?b, ?k, ?r, ?p
+            elsif argument_opts.include?(optch)
               arg = optstr.empty? ? argv.shift : optstr
               unless arg
                 hash = { ?f => 'bookname', ?b => 'bookname', ?k => 'kanji code',
                          ?r => 'library',  ?p => 'property', }
-                raise CommandOptionError.new("-#{optch.chr}: #{hash[optch]} required.")
+                raise _error("-#{optch.chr}: #{hash[optch]} required.")
               end
               options[optch] = arg
               optstr = nil
-            when ?F, ?D
+            elsif optional_opts.include?(optch)
               arg = optstr.empty? ? true : optstr
               options[optch] = arg
               optstr = nil
             else
-              raise CommandOptionError.new("-#{optch.chr}: invalid option.")
+              raise _error("-#{optch.chr}: invalid option.")
             end
           end
         end

data/lib/rook/recipe.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 28 $
-## $Release: 0.1.0 $
+## $Rev: 35 $
+## $Release: 0.2.0 $
 ## copyright(c) 2006 kuwata-lab.com all rights reserved.
 ##
 
@@ -20,13 +20,13 @@ module Rook
   ##   hash = {
   ##     'product'=>'hello.o',
   ##     'ingreds'=>['hello.c'],
-  ##     'options'=>['hello.h'],
+  ##     'toppings'=>['hello.h'],
   ##   }
   ##
   ##   recipe1 = Recipe.new(hash) { gcc -o #{@product} #{@ingred} }
   ##   recipe1.invoke()
   ##
-  ##   hash['method'] = 'gcc -o #{@product} #{@ingred}'
+  ##   hash['method'] = 'sys "gcc -o #{@product} #{@ingred}"'
   ##   recipe2 = Recipe.new(hash)
   ##   recipe2.invoke()
   ##
@@ -44,10 +44,10 @@ module Rook
       @ingreds  = (hash['ingreds'] || []).flatten()
       @coprods  = (hash['coprods'] || []).flatten()
       @byprods  = (hash['byprods'] || []).flatten()
-      @options  = (hash['options'] || []).flatten()
+      @toppings = (hash['toppings'] || []).flatten()
+      @params   = hash['params']
       @kind     = hash['kind'] || _detect_kind(@product)
-      @desc     = hash['desc']
-      @method   = hash['method']
+      @method   = hash['method*']
       @block    = block || hash['block']
       @desc     = hash['desc'] || _default_desc(@product)
       @access   = hash['access'] || (@desc ? 'public' : 'private')
@@ -59,14 +59,19 @@ module Rook
       @linenum  = hash['linenum']    # start linenumber of method part
       @pattern  = _compile_pattern(@product) if @kind == 'generic'
     end
-    attr_accessor :product, :ingreds, :coprods, :byprods, :options, :kind, :desc, :method
-    attr_accessor :block, :access, :forced, :symbolic, :verbose, :fingerprint
-    attr_accessor :bookname, :linenum, :pattern, :matches
+    attr_accessor :product, :ingreds, :coprods, :byprods, :toppings, :params
+    attr_accessor :kind, :method, :block, :desc, :access, :forced, :symbolic
+    attr_accessor :verbose, :fingerprint, :bookname, :linenum, :pattern, :matched
+
+
+    def matched=(val)
+      @matched = @m = val
+    end
 
 
     #--
     #def _member_names
-    #  return %w[product ingreds coprods byprods options desc kind method
+    #  return %w[product ingreds coprods byprods toppings desc kind method
     #            block access forced symbolic verbose bookname linenum]
     #end
     #private :_member_names
@@ -109,7 +114,7 @@ module Rook
     def all_ingredients
       list = []
       list.concat @ingreds if @ingreds
-      list.concat @options if @options
+      list.concat @toppings if @toppings
       return list
     end
 
@@ -156,23 +161,22 @@ module Rook
 
     def to_specific(product)
       return self unless @pattern
-      matches = @pattern.match(product)
-      matches  or raise RookError.new("product '#{product}' doesn't match to /#{@pattern.source}/")
-      hash = { 'product' => product }
+      matched = @pattern.match(product)
+      matched  or raise RookError.new("product '#{product}' doesn't match to /#{@pattern.source}/")
+      recipe = self.dup
       instance_variables.each do |var|
-        next if var == '@product'
-        w = var[1, var.length-1]    # '@name' => 'name'
-        hash[w] = Util.expand_matches(instance_variable_get(var), matches)
+        val = Util.expand_matches(instance_variable_get(var), matched)
+        recipe.instance_variable_set(var, val)
       end
-      hash['kind'] = 'specific'
-      recipe = Recipe.new(hash)
-      recipe.matches = matches
+      recipe.instance_variable_set('@product', product)
+      recipe.kind = 'specific'
+      recipe.matched = matched
       return recipe
     end
 
 
-    def invoke(parameters)
-      Oven.new(self).bake(parameters)
+    def invoke(kitchen)
+      Oven.new(self).bake(kitchen)
     end
 
 
@@ -185,21 +189,22 @@ module Rook
 
 
     def initialize(recipe)
+      @recipe = recipe
       recipe.instance_variables.each do |name|
         value = recipe.instance_variable_get(name)
         instance_variable_set(name, value)
       end
-      @ingred = @ingreds.first if @ingreds
-      @coprod = @coprods.first if @coprods
-      @byprod = @byprods.first if @byprods
-      @option = @options.first if @options
+      @ingred  = @ingreds.first if @ingreds
+      @coprod  = @coprods.first if @coprods
+      @byprod  = @byprods.first if @byprods
+      @topping = @toppings.first if @toppings
     end
 
 
-    def bake(_parameters)
+    def bake(_kitchen)
       ## copy properties as instance variable
-      _parameters.property_names.each do |name|
-        instance_variable_set("@#{name}", _parameters.get_property(name))
+      _kitchen.property_names.each do |name|
+        instance_variable_set("@#{name}", _kitchen.get_property(name))
       end
       ## invoke @block or @method
       if @block
@@ -208,10 +213,21 @@ module Rook
         ## set variables as local vars
         @_vars = {}
         _code = []
-        _parameters.variable_names.each do |name|
-          @_vars[name] = _parameters.get_variable(name)
-          _code << "#{name}=@_vars['#{name}'];"
+        _kitchen.parameter_names.each do |_name|
+          @_vars[_name] = _kitchen.get_parameter(_name)
+          _code << "#{_name}=@_vars['#{_name}'];"
         end
+        @recipe.params.each do |_param|
+          _name = _param['name']
+          if _name[-1] == ?*
+            _name = _name[0, _name.length-1]
+            _expr = _param['value']
+            _code << "#{_name}=(#{_expr});"
+          else
+            @_vars[_name] = _param['value']
+            _code << "#{_name}=@_vars['#{_name}'];"
+          end
+        end if @recipe.params
         _code << @method
         self.instance_eval(_code.join, @bookname, @linenum)
       end
@@ -245,10 +261,10 @@ module Rook
 #      @pattern =~ product
 #    end
 #    def to_specific(product)
-#      matches = @pattern.match(product)
+#      matched = @pattern.match(product)
 #      hash = { 'product' => product }
 #      _member_names.each do |name|
-#        hash[name] = Util.expand_matches(instance_variable_get(name), matches)
+#        hash[name] = Util.expand_matches(instance_variable_get(name), matched)
 #      end
 #      SpecificRecipe.new(hash)
 #    end

data/lib/rook/rookbook.schema.yaml

@@ -1,6 +1,6 @@
 ##
 ## $Rev$
-## $Release: 0.1.0 $
+## $Release: 0.2.0 $
 ## copyright(c) 2006 kuwata-lab.com all rights reserved.
 ##
 
@@ -34,10 +34,11 @@ mapping:
 # "desc":
 #    type:   str
 
- "precooking":
+ "preparation*":
     type:   text
 
  "libraries":
+    desc:   (not implemented)
     type:   seq
     sequence:
       - type:   str
@@ -48,32 +49,30 @@ mapping:
     sequence:
       - type:   str
 
- "properties*": &props1
-    type:   seq
-    sequence:
-      - type:   map
-        name:   PROPERTY
-        mapping:
-         "name":
-            type:   str
-            required:  yes
-            unique: yes
-         "desc":
-            type:   str
-         "value":
-            type:   any
-         "expr":
-            type:   str
-         "access":
-            type:   str
-            enum:
-              - public
-              - private
-              - protected
-
- "variables*": *props1
+# "properties": &props1
+#    type:   seq
+#    sequence:
+#      - type:   map
+#        name:   PROPERTY
+#        mapping:
+#         "name":
+#            type:   str
+#            required:  yes
+#            unique: yes
+#         "desc":
+#            type:   str
+#         "value":
+#            type:   any
+#         "expr":
+#            type:   str
+#         "access":
+#            type:   str
+#            enum:
+#              - public
+#              - private
+#              - protected
 
- "properties": &props2
+ "properties": &props
     type:   seq
     sequence:
       - type:   map
@@ -90,52 +89,33 @@ mapping:
          "=":
             type:   any
 
- "variables": *props2
+ "parameters": *props
 
  "recipes":
     type:   seq
     sequence:
       - type:   map
         mapping:
-         "product*":
-            type:   str
          "product":
             type:   any       # str or symbol
             name:   MATERIAL
-         "ingreds*":
-            type:   str
-         "ingreds":
-            type:   seq
-            sequence:
-              - type:   any   # str or symbol
-                name:   MATERIAL
-         "coprods*":
-            type:   str
-         "coprods":
-            type:   seq
-            sequence:
-              - type:   any   # str or symbol
-                name:   MATERIAL
-         "byprods*":
-            type:   str
-         "byprods":
+         "ingreds": &ingreds
             type:   seq
             sequence:
               - type:   any   # str or symbol
                 name:   MATERIAL
-         "options*":
-            type:   str
-         "options":
+         "coprods": *ingreds
+         "byprods": *ingreds
+         "toppings":
             type:   seq
             sequence:
               - type:   str
                 name:   MATERIAL
+         "params":  *props
          "method*":
             type:   text
-         "method":
-            type:   text
-         "desc":
-            type:   str
+#         "method":
+#            type:   text
          "desc":
             type:   str
          "access":