bee 0.10.2 → 0.11.0

data/README

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

data/bin/bash_completion_bee

@@ -19,6 +19,24 @@ _bee()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
+    case $prev in
+        -k)
+            tasks="`bee -x`"
+            COMPREPLY=( $(compgen -W "${tasks}" -- $cur ) )
+            return 0
+            ;;
+        -t)
+            templates="`bee -y`"
+            COMPREPLY=( $(compgen -W "${templates}" -- $cur ) )
+            return 0
+            ;;
+        -e)
+            templates="`bee -y`"
+            COMPREPLY=( $(compgen -W "${templates}" -- $cur ) )
+            return 0
+            ;;
+    esac
+
     if [[ ${cur} == -* ]] ; then
         opts="`bee -o`" 
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )

data/bin/bee

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/bin/bee.bat

@@ -7,7 +7,7 @@ goto endofruby
 goto endofruby
 #!/usr/bin/env ruby
 
-# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/egg/application/build.yml

@@ -11,11 +11,12 @@
     years:        ""
     platform:     "Gem::Platform::RUBY"
     summary:      ""
+    description:  ""
     email:        ""
     homepage:     ""
     rubyforge:    ""
     dependencies:
-      bee: [">= 0.7.0"]
+      bee: [">= 0.11.0"]
     lib_dir:      "lib"
     test_dir:     "test"
     build_dir:    "build"

data/egg/application/gem.spec.erb

@@ -9,6 +9,7 @@ SPEC = Gem::Specification.new do |spec|
   spec.rubyforge_project = '<%= rubyforge %>'
   spec.platform = <%= platform %>
   spec.summary = '<%= summary %>'
+  spec.description = '<%= description %>'
   spec.files = Dir.glob('{bin,lib}/**/*').delete_if do |file|
     file =~ /CVS/
   end

data/egg/package/bee_task.erb

@@ -1,4 +1,4 @@
-require 'bee_task'
+require 'bee_task_package'
 
 module Bee
   

data/egg/package/build.erb

@@ -12,6 +12,7 @@
     years:        ""
     platform:     "Gem::Platform::RUBY"
     summary:      ""
+    description:  ""
     email:        ""
     homepage:     "http://<%= project_name %>.rubyforge.org"
     rubyforge:    ""

data/egg/package/gem_spec.erb

@@ -9,6 +9,7 @@ SPEC = Gem::Specification.new do |spec|
   spec.rubyforge_project = '<%= rubyforge %>'
   spec.platform = <%= platform %>
   spec.summary = '<%= summary %>'
+  spec.description = '<%= description %>'
   spec.files = Dir.glob('{lib,test,egg}/**/*').delete_if do |file|
     file =~ /CVS/
   end

data/egg/package/test.erb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'bee'
+require 'bee_build'
 require 'test/unit'
 $:.unshift(File.join(File.expand_path(File.dirname(__FILE__))))
 require 'test_build'

data/egg/package/test_build.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/egg/package/test_build_listener.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,30 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Test build listener.
+require 'rubygems'
+
 class TestBuildListener
 
+  attr_reader :formatter
   attr_reader :started
   attr_reader :finished
   attr_reader :targets
   attr_reader :tasks
   attr_reader :success
   attr_reader :errors
-  attr_accessor :output
-  attr_reader :verbose
+  attr_accessor :throw_error
+  attr_accessor :prompt
   
-  def initialize
-    @targets = []
-    @tasks = []
-    @output = ''
-    @verbose = false
+  def initialize()
+    reset
   end
-  
-  def build_started(build)
+
+  def build_started(build, dry=false)
     @started = true
   end
 
-  def build_finished(build)
+  def build_finished()
     @finished = true
   end
 
@@ -44,11 +43,56 @@ class TestBuildListener
   end
 
   def task(task)
-    @tasks << tasks
+    @tasks << task
   end
 
   def error(exception)
-    @errors = exception
+    if throw_error
+      raise exception
+    else
+      @errors << exception
+    end
+  end
+
+  def recover
+    @success = true
+  end
+
+  def reset
+    @formatter = TestBuildFormatter.new(self)
+    @started = false
+    @finished = false
+    @targets = []
+    @tasks = []
+    @success = false
+    @errors = []
+    @throw_error = false
+    @prompt = ''
+  end
+
+  def output()
+    return @formatter.output
+  end
+
+  def clear()
+    @formatter.clear()
+  end
+
+  def error?
+    return @errors.length > 0
+  end
+
+end
+
+class TestBuildFormatter
+
+  attr_reader :verbose
+  attr_reader :output
+
+  def initialize(listener)
+    @listener = listener
+    @verbose = false
+    @output = ''
   end
 
   def print(text)
@@ -59,4 +103,8 @@ class TestBuildListener
     @output << text + "\n"
   end
 
+  def clear()
+    @output = ''
+  end
+
 end

data/egg/package/test_suite.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/egg/script/build.yml

@@ -6,7 +6,7 @@
 # Build properties
 - properties:
     name:        "<%= name %>"
-    version:     "0.0.0"
+    version:     "0.0.1"
     build:       "build"
     clean_dirs:  [:build]
     clean_files: ["**/*~", "**/.#*", "**/.DS_Store"]

data/egg/sinatra/build.yml

@@ -4,7 +4,7 @@
 
 - properties:
     name:         "<%= name %>"
-    version:      "0.0.0"
+    version:      "0.0.1"
     build:        "build"
     zip_prefix:   "#{name}-#{version}"
     zip_file:     "#{build}/#{zip_prefix}.zip"

data/egg/xmlrpc/build.yml

@@ -6,7 +6,7 @@
 # Build properties
 - properties:
     name:        <%= project_name %>
-    version:     "0.0.0"
+    version:     "0.0.1"
     build:       "build"
     zip:         "#{build}/#{name}-#{version}.zip"
     clean_dirs:  [:build]

data/lib/{bee.rb → bee_build.rb}

@@ -1,4 +1,4 @@
-# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +14,16 @@
 
 require 'rubygems'
 require 'yaml'
-require 'bee_task'
-require 'bee_target'
 require 'bee_util'
 require 'bee_context'
 require 'bee_properties'
+require 'bee_target'
+require 'bee_targets'
+require 'bee_task_packagemanager'
 
-# Module for Bee core classes.
 module Bee
   
-  # Class for a build. This class is built from an object resulting from YAML
-  # build file parsing.
+  # Class for a build, built from an object resulting from YAML build file parsing.
   class Build
     
     include Bee::Util::BuildErrorMixin
@@ -54,8 +53,6 @@ module Bee
     attr_reader :extends
     # Abstractness.
     attr_reader :abstract
-    # Default target, specified with default entry or fist target in build file.
-    attr_accessor :default
     # Build description.
     attr_reader :description
     # Build properties.
@@ -86,15 +83,10 @@ module Bee
       end
       begin
         yaml = Bee::Util::get_file(file)
-      rescue
-        raise Bee::Util::BuildError.
-           new("Error loading build file '#{file}': #{$!}")
-      end
-      begin
         object = YAML::load(yaml)
       rescue
         raise Bee::Util::BuildError.
-          new("YAML syntax error in build file '#{file}': #{$!}")
+           new("Error loading build file '#{file}': #{$!}")
       end
       return Build.new(object, file, properties)
     end
@@ -108,42 +100,37 @@ module Bee
       @file = file
       @base = get_base(@file)
       @here = here
-      @properties = Properties.new(self)
-      @context = Context.new(@properties)
-      @properties.evaluate(@context)
+      @properties = Bee::Properties.new
+      @scripts = []
       @targets = Targets.new(self)
       parse(object)
       @properties.overwrite(properties)
+      @properties.defaults({:base => @base, :here => @here})
+      @context = Context.new(@properties.expressions, @scripts)
       @package_manager = Bee::Task::PackageManager.new(self)
     end
 
-    # Evaluate properties.
-    def evaluate_properties
-      @properties.evaluate(@context)
-    end
-    
-    # Run build:
+    # Run build. Raise a BuildError exception on build error if no listener
+    # was given to be notified of the build failure:
     # - targets: list of targets to run.
     # - listener: listener for the build.
     def run(targets, listener=nil, dry=false)
       @listener = listener
       working_directory = Dir.getwd
-      @listener.build_started(self, dry) if @listener
+      @listener.start(self, dry) if @listener
       begin
         error "Abstract build file, must be extended to run" if @abstract
-        evaluate_properties
         if not Bee::Util::url?(@base)
           Dir.chdir(@base)
         end
+        @context.evaluate
         @targets.run(targets, dry)
-        @listener.build_finished(self, dry) if @listener
-      rescue Bee::Util::BuildError => e
-        if @listener
-          @listener.error(e)
-        else
-          raise e
-        end
+        @listener.success() if @listener
+      rescue Bee::Util::BuildError
+        @listener.error($!) if @listener
+        raise $!
       ensure
+        @listener.stop() if @listener
         Dir.chdir(working_directory)
         remove_instance_variable(:@listener)
       end
@@ -159,11 +146,22 @@ module Bee
       for entry in object
         if entry.key?(Build::KEY)
           parse_build(entry)
-          error "Build info entry must be first one in build file" if
-            not first
+          error "Build info entry must be first one in build file" if not first
           first = false
         elsif entry.key?(Properties::KEY)
-          @properties.write(entry)
+          properties = entry[Properties::KEY]
+          # if properties is a string, this is a YAML file to load as a Hash
+          if properties.kind_of?(String)
+            filename = properties
+            begin
+              properties = YAML::load(Bee::Util::get_file(filename, @base))
+              @properties.write(properties)
+            rescue Exception
+              error "Error loading properties file '#{filename}': #{$!}"
+            end
+          else
+            @properties.write(properties)
+          end
           first = false
         elsif entry.key?(Target::KEY)
           @targets.add(entry)
@@ -175,7 +173,7 @@ module Bee
       # manage extended builds
       if @extends
         for parent in @extends
-          @properties.extend(parent.properties)
+          @properties.extend(parent.properties.expressions)
           @targets.extend(parent.targets)
         end
       end
@@ -191,10 +189,12 @@ module Bee
       end
       error "Duplicate build info" if @name
       @name = entry['build']
-      @default = entry['default']
-      @targets.default = @default
+      @targets.default = entry['default']
       @description = entry['description']
       @abstract = entry['abstract']
+      # check that 'default' entry is a string
+      error "'default' entry of the 'build' block must be a string" if
+        @targets.default and !@targets.default.kind_of?(String)
       # load parents build if any
       parents = Array(entry['extends'])
       if parents.length > 0
@@ -217,7 +217,7 @@ module Bee
           collisions += properties & parent_properties
           properties += parent_properties
         end
-        collisions = collisions - Properties::SYSTEM_PROPERTIES
+        collisions = collisions - Bee::Properties::SYSTEM_PROPERTIES
         collisions = collisions.uniq.map { |e| e.to_s }.sort
         if collisions.length > 0
           error "Properties in parents are colliding: #{collisions.join(', ')}"
@@ -236,18 +236,7 @@ module Bee
       end
       # load context files if any
       context = entry['context']
-      if context
-        context = Array(context)
-        for script in context
-          begin
-            evaluated = @context.evaluate_object(script)
-            source = Bee::Util::get_file(evaluated, @base)
-            @context.evaluate_script(source)
-          rescue Exception
-            error "Error loading context '#{script}': #{$!}"
-          end
-        end
-      end
+      @scripts = Array(context) if context
     end
     
     # Get base for a given file.
@@ -257,7 +246,7 @@ module Bee
         if Bee::Util::url?(file)
           return File.dirname(file)
         else
-          return File.expand_path(File.dirname(Bee::Util::absolute_path(file, Dir.pwd)))
+          return File.expand_path(File.dirname(file))
         end
       else
         return File.expand_path(Dir.pwd)
@@ -266,134 +255,6 @@ module Bee
 
   end
 
-  # Class to manage targets in a build.
-  class Targets
-
-    include Bee::Util::BuildErrorMixin
-
-    # Parent build.
-    attr_reader :build
-    # Targets hash by name.
-    attr_reader :hash
-    # Targets already run.
-    attr_reader :already_run
-    # Default target.
-    attr_accessor :default
-
-    # Constructor.
-    # - build: build object.
-    def initialize(build)
-      @build = build
-      @hash = {}
-      @already_run = []
-    end
-
-    # Add a new target.
-    # - object: object tree resulting from YAML build file parsing.
-    def add(object)
-      begin
-        target = Target.new(object, self)
-      rescue
-        error "Error parsing target '#{object[Target::KEY]}': #{$!}"
-      end
-      error "Duplicate target definition: '#{target.name}'" if
-        @hash.has_key?(target.name)
-      @hash[target.name] = [target]
-      if !@default
-        @default = target.name
-        @build.default = target.name
-      end
-    end
-
-    # Extend parent targets.
-    # - parent: parent targets.
-    def extend(parent)
-      # set appropriate targets for targets of parent
-      for targets in parent.hash.values
-        for target in targets
-          target.targets = self
-        end
-      end
-      # insert parent targets before current ones
-      for name in parent.hash.keys
-        if @hash[name]
-          @hash[name] = parent.hash[name] + @hash[name]
-          # clean dependencies for redefined targets
-          for target in parent.hash[name]
-            target.depends.clear
-          end
-          # copy documentation of parent if target not documented
-          if not @hash[name].last.description
-            description = nil
-            for target in parent.hash[name]
-              description = target.description || description
-            end
-            @hash[name].last.description = description
-          end
-        else
-          @hash[name] = parent.hash[name]
-        end
-      end
-      # set default default target to parent one if none was set
-      @default = @default || parent.default
-    end
-
-    # Run targets.
-    # - targets: list of target names to run.
-    def run(targets, dry)
-      error "No default target given" if (!@default and targets.length == 0)
-      targets = [@default] if targets.length == 0
-      for target in targets
-        run_target(target, dry)
-        @already_run.clear
-      end
-    end
- 
-    # Call super target.
-    # - target: target that calls super.
-    def call_super(target, dry=false)
-      index = @hash[target.name].index(target)
-      error "No super target to call for '#{target.name}'" if index == 0
-      index -= 1
-      @hash[target.name][index].run(dry)
-    end
-
-    # Tells if a given target is last in hierarchy.
-    # - target: given target.
-    def is_last(target)
-      index = @hash[target.name].index(target)
-      last = @hash[target.name].size - 1
-      return index == last
-    end
-    
-    # Run a given target.
-    # - target: the target to run.
-    def run_target(target, dry=false)
-      error "Target '#{target}' not found" if not @hash[target]
-      if not @already_run.include?(target)
-        @already_run << target
-        @hash[target].last.run(dry)
-      end
-    end
-
-    # Return targets description as a hash of descriptions indexed by
-    # target name. Dependencies are added after target description.
-    def description
-      description = {}
-      for name in @hash.keys
-        text = @hash[name].last.description
-        if @hash[name].last.depends and @hash[name].last.depends.length > 0
-          depends = ' [' + @hash[name].last.depends.join(', ') + ']'
-        else
-          depends = nil
-        end
-        description[name] = (text ? text : '') + (depends ? depends : '')
-      end
-      return description
-    end
-    
-  end
-  
   # Return Bee version. Try to load bee_version file or return UNKNOWN.
   def version
     begin