bee 0.8.1 → 0.9.0

data/README

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

data/egg/source.yml

@@ -1,19 +1,19 @@
-- build: source
-  default: all
-  description: "Generate a sample Ruby source file"
+- build:       source
+  default:     all
+  description: Generate a sample Ruby source file
 
 - properties:
-  - name: source.rb
+  - name:        source.rb
   - description: This script will generate a sample Ruby source file.
 
-- target: welcome
-  description: "Print information message"
+- target:      welcome
+  description: Print information message
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
-  description: "Prompt for project information"
+- target:      prompt
+  depends:     welcome
+  description: Prompt for project information
   script:
   - print: "Please answer following questions to generate the project:"
   - prompt:
@@ -21,20 +21,24 @@
       default: :name
       property: name
 
-- target: generate
-  depends: prompt
-  description: "Generate project"
+- target:      generate
+  depends:     prompt
+  description: Generate source
   script:
-  - print: "Generating project..."
+  - print: "Generating source..."
   - erb:
       src:  "#{base}/source/source.rb"
       dest: "#{here}/#{name}"
+  - if: "RUBY_PLATFORM.split('-')[1] != 'mswin32'"
+    then:
+    - chmod: { files: "#{here}/#{name}", mode: 0755 }
 
-- target: customization
-  depends: generate
-  description: "Print information about project customization"
+- target:      customization
+  depends:     generate
+  description: Print information about project customization
   script:
   - print: Source file '#{name}' has been generated in this directory.
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]
+

data/lib/bee.rb

@@ -36,6 +36,7 @@ module Bee
       'description' => :optional,
       'context'     => :optional,
       'extends'     => :optional,
+      'includes'    => :optional,
       'abstract'    => :optional
     }
 
@@ -49,6 +50,8 @@ module Bee
     attr_reader :name
     # Parent build.
     attr_reader :extends
+    # Included builds
+    attr_reader :includes
     # Abstractness.
     attr_reader :abstract
     # Default target, specified with default entry or fist target in build file.
@@ -174,6 +177,13 @@ module Bee
         @properties.extend(@parent.properties)
         @targets.extend(@parent.targets)
       end
+      # manage included builds
+      if @included
+        for include in @included.reverse
+          @properties.include(include.properties)
+          @targets.include(include.targets)
+        end
+      end
     end
     
     # Parse a build entry.
@@ -190,6 +200,7 @@ module Bee
       @targets.default = @default
       @description = entry['description']
       @extends = entry['extends']
+      @includes = Array(entry['includes'])
       @abstract = entry['abstract']
       # load parent build if any
       if @extends
@@ -203,6 +214,18 @@ module Bee
         @targets.default = @default
         @description = @description || @parent.description
       end
+      # load included build files if any
+      if @includes
+        @included = []
+        for include in @includes
+          absolute_path = Bee::Util::absolute_path(include, @base)
+          begin
+            @included << Bee::Build::load(absolute_path)
+          rescue Exception
+            error "Error loading included build file '#{include}': #{$!}"
+          end
+        end
+      end
       # load context files if any
       context = entry['context']
       if context
@@ -243,6 +266,9 @@ module Bee
     # Key for properties entry.
     KEY = 'properties'
 
+    # List of system properties
+    SYSTEM_PROPERTIES = [:base, :here]
+
     # List of properties in order of evaluation.
     attr_reader :list
     # Hash of properties by name.
@@ -309,6 +335,12 @@ module Bee
       end
     end
 
+    # Include properties of included build.
+    # - properties: properties of parent build.
+    def include(properties)
+      extend(properties)
+    end
+
     # Evaluate properties in context.
     # - context: build context where properties must be evaluated.
     def evaluate(context)
@@ -438,6 +470,25 @@ module Bee
       @default = @default || parent.default
     end
 
+    # Include included build file targets.
+    # - included: included build file targets.
+    def include(included)
+      # set appropriate targets for targets of parent
+      for targets in included.hash.values
+        for target in targets
+          target.targets = self
+        end
+      end
+      # look for targets already defined
+      duplicates = @hash.keys & included.hash.keys
+      error "Included target(s) '#{duplicates.join('\', \'')}' already defined" if
+        duplicates.length > 0
+      # insert included targets
+      for name in included.hash.keys
+        @hash[name] = included.hash[name]
+      end
+    end
+
     # Run targets.
     # - targets: list of target names to run.
     def run(targets, dry)

data/lib/bee_console.rb

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

data/lib/bee_task_default.rb

@@ -1453,10 +1453,14 @@ EOF
         require 'zlib'
         # parse parameters
         params_desc = {
-          :root     => { :mandatory => false, :type => :string },
-          :includes => { :mandatory => true,  :type => :string_or_array },
-          :excludes => { :mandatory => false, :type => :string_or_array, :default => nil },
-          :dotmatch => { :mandatory => false, :type => :boolean, :default => false },
+          :root     => { :mandatory => false, :type => :string,
+                         :default => '.' },
+          :includes => { :mandatory => false, :type => :string_or_array,
+                         :default => '**/*' },
+          :excludes => { :mandatory => false, :type => :string_or_array,
+                         :default => nil },
+          :dotmatch => { :mandatory => false, :type => :boolean,
+                         :default => false },
           :dest     => { :mandatory => true,  :type => :string }
         }
         check_parameters(parameters, params_desc)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-06-03 00:00:00 +02:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyzip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: michel.casabianca@gmail.com
 executables: 
@@ -108,18 +125,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: bee
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: bee is a build tool