bee 0.11.3 → 0.11.4

data/README

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

data/lib/bee_build.rb

@@ -194,11 +194,19 @@ module Bee
       error "'default' entry of the 'build' block must be a string or an array" if
         entry['default'] and (!entry['default'].kind_of?(String) and
                               !entry['default'].kind_of?(Array))
-      @targets.default = Array(entry['default']) if entry['default']
+      if entry['default']
+        @targets.default = Array(entry['default'])
+        @targets.default_set = true
+      end
       # check that 'alias' entry is a hash
       error "'alias' entry of the 'build' block must be a hash" if
         entry['alias'] and !entry['alias'].kind_of?(Hash)
-      @targets.alias = entry['alias'] if entry['alias']
+      if entry['alias']
+        @targets.alias = entry['alias']
+        @targets.alias_set = @targets.alias.keys()
+      else
+        @targets.alias_set = []
+      end
       @description = entry['description']
       @abstract = entry['abstract']
       # load parents build if any

data/lib/bee_targets.rb

@@ -31,8 +31,12 @@ module Bee
     attr_reader :already_run
     # Default target.
     attr_accessor :default
+    # Tells if defautl target was set in build file
+    attr_accessor :default_set
     # Alias for targets
     attr_accessor :alias
+    # Tells if alias was set in build file
+    attr_accessor :alias_set
 
     # Constructor.
     # - build: build object.
@@ -85,16 +89,22 @@ module Bee
           @hash[name] = parent.hash[name]
         end
       end
-      # set default default target to parent one if none was set
+      # manage default target
+      if parent.default and !@default_set
+        @default = [] if !@default
+        @default += parent.default
+      end
       @default = @default || parent.default
-      # manage alias
+      # manage aliases
+      @alias = {} if !@alias
       if parent.alias
-        @alias = {} if !@alias
         for key in parent.alias.keys
-          if @alias.has_key?(key)
-            @alias[key] = Array(@alias[key]) + Array(parent.alias[key])
-          else
-            @alias[key] = Array(parent.alias[key])
+          if !@alias_set.include?(key)
+            if @alias.has_key?(key)
+              @alias[key] = Array(@alias[key]) + Array(parent.alias[key])
+            else
+              @alias[key] = Array(parent.alias[key])
+            end
           end
         end
       end

data/lib/bee_task_default.rb

@@ -560,9 +560,6 @@ EOF
       #   false.
       # - flatten: tells if included files should be copied in destination
       #   directory, ignoring their subdirectory. Optional, defaults to false.
-      # - sets: a single or list of sets made of root, includes, excludes,
-      #   dotmatch and flatten entries, as defined previously. Can be defined
-      #   only if no root, includes, excludes, dotmatch or flatten are defined.
       # - dest: destination directory for the copy, must be an existing
       #   directory.
       # - lenient: tells if copy is lenient, which will silently succeed on
@@ -580,18 +577,6 @@ EOF
       #       excludes: **/CVS/**/*
       #       dest:     destination
       # 
-      # Example:
-      # 
-      # With sets, you could write :
-      # 
-      #   - copy:
-      #       sets:
-      #         - root:     src
-      #           excludes: **/CVS/**/*
-      #         - root:     res
-      #           includes: **/*.properties
-      #       dest: destination
-      #
       # Note: this task only deals with files. Thus, 'includes' and 'excludes'
       # globs should be ones for files.
       def copy(params)
@@ -601,7 +586,6 @@ EOF
           :includes => { :mandatory => false, :type => :string_or_array },
           :excludes => { :mandatory => false, :type => :string_or_array },
           :dotmatch => { :mandatory => false, :type => :boolean },
-          :sets     => { :mandatory => false, :type => :hash_or_array },
           :dest     => { :mandatory => true,  :type => :string },
           :flatten  => { :mandatory => false, :type => :boolean,
                          :default   => false },
@@ -613,7 +597,6 @@ EOF
         includes = params[:includes]
         excludes = params[:excludes]
         dotmatch = params[:dotmatch]
-        sets     = params[:sets]
         dest     = params[:dest]
         flatten  = params[:flatten]
         lenient  = params[:lenient]
@@ -625,44 +608,17 @@ EOF
             error "copy 'dest' parameter must be an existing directory"
           end
         end
-        # if no sets defined
-        if sets == nil
-          root = '.' if root == nil
-          dotmatch = false if dotmatch == nil
-          if not (File.exists?(root) and File.directory?(root))
-            if lenient
-              return
-            else
-              error "copy 'root' parameter must be an existing directory"
-            end
-          end
-          files = filter_files(root, includes, excludes, dotmatch)
-          copy_files(root, files, dest, flatten)
-        # if sets are defined
-        else
-          for _set in sets
-            _unknown = _set.keys - ['root', 'includes', 'excludes', 'dotmatch', 'flatten']
-            error "copy 'sets' parameter has unknown entry #{_unknown.join(', ')}" if
-              _unknown.size > 0
-            _root = _set['root']
-            _root = '.' if _root == nil
-            if not (File.exists?(_root) and File.directory?(_root))
-              if lenient
-                continue
-              else
-                error "copy 'root' entries of 'sets' parameter must be an existing directory"
-              end
-            end
-            _includes = _set['includes']
-            _excludes = _set['excludes']
-            _dotmatch = _set['dotmatch']
-            _dotmatch = false if _dotmatch == nil
-            _flatten  = _set['flatten']
-            _flatten  = false if _flatten == nil
-            _files = filter_files(_root, _includes, _excludes, _dotmatch)
-            copy_files(_root, _files, dest, _flatten)
+        root = '.' if root == nil
+        dotmatch = false if dotmatch == nil
+        if not (File.exists?(root) and File.directory?(root))
+          if lenient
+            return
+          else
+            error "copy 'root' parameter must be an existing directory"
           end
         end
+        files = filter_files(root, includes, excludes, dotmatch)
+        copy_files(root, files, dest, flatten)
       end
 
       # Move filtered files. Parameter is a hash with following entries:

data/lib/bee_task_package.rb

@@ -164,53 +164,6 @@ module Bee
         end
       end
 
-      def evaluate_sets(root, includes, excludes, dotmatch, flatten, sets, lenient)
-        response = []
-        # check that no root and sets are defined at the same time
-        if (root || includes || excludes || dotmatch || flatten) && sets
-          error "Sets might not be used along with root, includes, excludes, dotmatch or flatten"
-        end
-        # if no sets defined
-        if sets == nil
-          root = '.' if root == nil
-          dotmatch = false if dotmatch == nil
-          flatten = false if flatten == nil
-          if not (File.exists?(root) and File.directory?(root))
-            if lenient
-              return
-            else
-              error "'root' parameter must be an existing directory"
-            end
-          end
-          response << {:files => filter_files(root, includes, excludes, dotmatch), :flatten => flatten}
-        # if sets are defined
-        else
-          for _set in sets
-            _unknown = _set.keys - ['root', 'includes', 'excludes', 'dotmatch', 'flatten']
-            error "'sets' parameter has unknown entry #{_unknown.join(', ')}" if
-              _unknown.size > 0
-            _root = _set['root']
-            _root = '.' if _root == nil
-            if not (File.exists?(_root) and File.directory?(_root))
-              if lenient
-                continue
-              else
-                error "'root' entries of 'sets' parameter must be an existing directory"
-              end
-            end
-            _includes = _set['includes']
-            _excludes = _set['excludes']
-            _dotmatch = _set['dotmatch']
-            _dotmatch = false if _dotmatch == nil
-            _flatten  = _set['flatten']
-            _flatten  = false if _flatten == nil
-            files += filter_files(_root, _includes, _excludes, _dotmatch)
-          end
-          response << {:files => files, :flatten => _flatten}
-        end
-        return response
-       end
-
       # Copy a list of files to a given diretory:
       # - root: root directory of source files.
       # - files: a list of files to copy relative to root.

data/lib/bee_version.rb

@@ -1,5 +1,5 @@
 module Bee
 
-    VERSION = '0.11.3'
+    VERSION = '0.11.4'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 11
-  - 3
-  version: 0.11.3
+  - 4
+  version: 0.11.4
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 +02:00
+date: 2012-08-16 00:00:00 +02:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency