bee 0.6.0 → 0.6.1

data/README

@@ -25,4 +25,4 @@ or go to URL http://www.apache.org/licenses/LICENSE-2.0).
 
 = Copyright
 
-bee version 0.6.0 (C) Michel Casabianca & Contributors - 2006-2010
+bee version 0.6.1 (C) Michel Casabianca & Contributors - 2006-2010

data/lib/bee.rb

@@ -639,13 +639,19 @@ module Bee
     # - dry: tells if we run in dry mode.
     def construct_if(task, dry)
       # test entries
-      error "If construct must include 'then' entry" if
+      error "If-then-else construct must include 'then' entry" if
         not task.keys.include?('then')
       unknown_keys = task.keys - ['if', 'then', 'else']
-      error "If construct may only include 'if', 'then' and 'else' entries" if
+      error "If-then-else construct may only include 'if', 'then' and 'else' entries" if
         unknown_keys.length > 0
+      error "If entry in if-then-else construct must be a string" if
+        not task['if'].kind_of?(String)
+      error "Then entry in if-then-else construct must be a list" if
+        not task['then'].kind_of?(Array)
+      error "Else entry in if-then-else construct must be a list" if
+        task['else'] and not task['else'].kind_of?(Array)
       # evaluate condition in the build context
-      if evaluate(task['if'].to_s)
+      if evaluate(task['if'])
         run_block(task['then'], dry)
       else
         run_block(task['else'], dry) if task['else']
@@ -657,11 +663,15 @@ module Bee
     # - dry: tells if we run in dry mode.
     def construct_while(task, dry)
       # test entries
-      error "While construct must include 'do' entry" if
+      error "While-do construct must include 'do' entry" if
         not task.keys.include?('do')
       unknown_keys = task.keys - ['while', 'do']
-      error "While construct may only include 'while' and 'do' entries" if
+      error "While-do construct may only include 'while' and 'do' entries" if
         unknown_keys.length > 0
+      error "While entry in while-do construct must be a string" if
+        not task['while'].kind_of?(String)
+      error "Do entry in while-do construct must be a list" if
+        not task['do'].kind_of?(Array)
       # evaluate condition in the build context
       while evaluate(task['while'])
         run_block(task['do'], dry)
@@ -673,18 +683,21 @@ module Bee
     # - dry: tells if we run in dry mode.
     def construct_for(task, dry)
       # test entries
-      error "For construct must include 'in' and 'do' entries" if
+      error "For-in-do construct must include 'in' and 'do' entries" if
         not task.keys.include?('in') or not task.keys.include?('do')
       unknown_keys = task.keys - ['for', 'in', 'do']
-      error "For construct may only include 'for', 'in' and 'do' entries" if
+      error "For-in-do construct may only include 'for', 'in' and 'do' entries" if
         unknown_keys.length > 0
-      error "For entry in for construct must be a string" if
+      error "For entry in for-in-do construct must be a string" if
         not task['for'].kind_of?(String)
-      error "In entry in for construct must be a list or a string" if
+      error "In entry in for-in-do construct must be a list or a string" if
         not task['in'].kind_of?(Enumerable) and not task['in'].kind_of?(String)
+      error "Do entry in for-in-do construct must be a list" if
+        not task['do'].kind_of?(Array)
       # iterate over list
       if task['in'].kind_of?(String)
-        enumerable = evaluate(task['in'])
+        enumerable = evaluate(@targets.build.context.
+                              evaluate_object(task['in']))
       else
         enumerable = task['in']
       end
@@ -707,12 +720,12 @@ module Bee
       end   
     end
 
-    # Evaluate a given condition and raise a BuildError if an error happens.
-    def evaluate(condition)
+    # Evaluate a given expression and raise a BuildError if an error happens.
+    def evaluate(expression)
       begin
-        return @targets.build.context.evaluate_script(condition)
+        return @targets.build.context.evaluate_script(expression)
       rescue
-        error "Error evaluating condition: #{$!}"
+        error "Error evaluating expression: #{$!}"
       end
     end
 
@@ -783,11 +796,14 @@ module Bee
         # nil: return nil
         return nil
       when String
-        # string: replace property references
+        # string: replace embedded Ruby expressions
         object = object.gsub(/#\{.+?\}/) do |match|
-          property = match[2..-2]
-          value = get_property(property)
-          error "Property '#{property}' was not defined" unless value
+          expression = match[2..-2]
+          begin
+            value = evaluate_script(expression)
+          rescue
+            error "Error evaluating expression '#{expression}': #{$!}"
+          end
           value
         end
         return object 

data/lib/bee_console.rb

@@ -60,7 +60,7 @@ targets        Targets to run (default target if omitted).'
        | |__   ___  ___                                                   
  ____  | '_ \ / _ \/ _ \  _____ _____ _____ _____ _____ _____ _____ _____ _____
 |____| | |_) |  __/  __/ |_____|_____|_____|_____|_____|_____|_____|_____|_____|
-       |_.__/ \___|\___|  0.6.0                         http://bee.rubyforge.org
+       |_.__/ \___|\___|  0.6.1                         http://bee.rubyforge.org
 
 EOF
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-11 00:00:00 +01:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,28 +42,28 @@ extra_rdoc_files:
 - README
 - LICENSE
 files: 
-- bin/bee.bat
 - bin/bee
+- bin/bee.bat
+- lib/bee.rb
 - lib/bee_console.rb
 - lib/bee_task.rb
 - lib/bee_task_default.rb
 - lib/bee_util.rb
-- lib/bee.rb
-- egg/package.yml
-- egg/package/test.erb
-- egg/package/test_suite.rb
-- egg/package/gem_spec.erb
+- egg/package/bee_task.erb
 - egg/package/build.erb
+- egg/package/egg.yml
+- egg/package/egg_build.erb
+- egg/package/egg_launcher.erb
 - egg/package/egg_script.rb
+- egg/package/gem_spec.erb
 - egg/package/license
-- egg/package/egg_launcher.erb
 - egg/package/readme.erb
-- egg/package/bee_task.erb
-- egg/package/egg.yml
+- egg/package/test.erb
 - egg/package/test_build.erb
-- egg/package/egg_build.erb
-- egg/package/test_build_listener.rb
 - egg/package/test_build.rb
+- egg/package/test_build_listener.rb
+- egg/package/test_suite.rb
+- egg/package.yml
 - README
 - LICENSE
 has_rdoc: true