bee 0.5.1 → 0.5.2

data/README

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

data/bin/bee

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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.
@@ -19,4 +19,4 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'bee_console'
 
-Bee::Console.start_command_line
+Bee::Console.start_command_line(ARGV)

data/bin/bee.bat

@@ -7,7 +7,7 @@ goto endofruby
 goto endofruby
 #!/usr/bin/env ruby
 
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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.
@@ -26,7 +26,7 @@ goto endofruby
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'bee_console'
 
-Bee::Console.start_command_line
+Bee::Console.start_command_line(ARGV)
 
 __END__
 :endofruby

data/egg/package/test_build.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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_suite.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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/lib/bee.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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.
@@ -401,7 +401,7 @@ module Bee
     # Extend parent targets.
     # - parent: parent targets.
     def extend(parent)
-      # set appropriate targets
+      # set appropriate targets for targets of parent
       for targets in parent.hash.values
         for target in targets
           target.targets = self
@@ -411,16 +411,22 @@ module Bee
       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
-      # remove dependencies of the parent
-      for targets in parent.hash.values
-        for target in targets
-          target.depends.clear
-        end
-      end
       # set default default target to parent one if none was set
       @default = @default || parent.default
     end
@@ -504,7 +510,7 @@ module Bee
     # Target dependencies.
     attr_accessor :depends
     # Target description.
-    attr_reader :description
+    attr_accessor :description
     # Script that run in the target.
     attr_reader :script
     

data/lib/bee_console.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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.
@@ -37,6 +37,8 @@ module Bee
 -t egg         Run a given egg to generate a template project.
 -v             Enable verbose mode.
 -s style       Define style for output (see documentation).
+-c             Use color scheme for output (if running in color terminal).
+-w             Use black and white output (default).
 -f file        Build file to run (defaults to "build.yml").
 -r             Look for build file recursively up in file system.
 -l             Print bee logo on console.
@@ -53,16 +55,18 @@ targets        Targets to run (default target if omitted).'
     BEE_OPT_ENV = 'BEEOPT'
     # Bee text logo (generated with http://www.network-science.de/ascii/)
     BEE_LOGO = <<'EOF'
-         _                                                                 
-        | |__   ___  ___                                                   
- _____  | '_ \ / _ \/ _ \  _____ _____ _____ _____ _____ _____ _____ _____ 
-|_____| | |_) |  __/  __/ |_____|_____|_____|_____|_____|_____|_____|_____|
-        |_.__/ \___|\___|  0.5.0                   http://bee.rubyforge.org
+        _                                                                 
+       | |__   ___  ___                                                   
+ ____  | '_ \ / _ \/ _ \  _____ _____ _____ _____ _____ _____ _____ _____ _____
+|____| | |_) |  __/  __/ |_____|_____|_____|_____|_____|_____|_____|_____|_____|
+       |_.__/ \___|\___|  0.5.2                         http://bee.rubyforge.org
 
 EOF
 
     # Parse command line and return parsed arguments.
-    def self.parse_command_line
+    # - arguments: command line arguments.
+    def self.parse_command_line(arguments)
+      arguments = arguments.clone
       version = false
       help = false
       help_build = false
@@ -74,15 +78,18 @@ EOF
       template = nil
       verbose = false
       style = nil
+      color = false
       file = DEFAULT_BUILD_FILE
       recursive = false
       logo = false
       targets = []
       # read options in BEEOPT environment variable
       options = ENV[BEE_OPT_ENV]
-      options.split(' ').reverse.each { |option| ARGV.unshift(option) } if
+      options.split(' ').reverse.each { |option| arguments.unshift(option) } if
         options
       # parse command line arguments
+      old_argv = ARGV
+      ARGV.replace(arguments)
       opts = GetoptLong.new(['--version', '-V', GetoptLong::NO_ARGUMENT],
                             ['--help', '-h', GetoptLong::NO_ARGUMENT],
                             ['--help-build', '-b', GetoptLong::NO_ARGUMENT],
@@ -93,6 +100,8 @@ EOF
                             ['--template', '-t', GetoptLong::REQUIRED_ARGUMENT],
                             ['--verbose', '-v', GetoptLong::NO_ARGUMENT],
                             ['--style', '-s', GetoptLong::REQUIRED_ARGUMENT],
+                            ['--color', '-c', GetoptLong::NO_ARGUMENT],
+                            ['--black-and-white', '-w', GetoptLong::NO_ARGUMENT],
                             ['--file', '-f', GetoptLong::REQUIRED_ARGUMENT],
                             ['--recursive', '-r', GetoptLong::NO_ARGUMENT],
                             ['--logo', '-l', GetoptLong::NO_ARGUMENT])
@@ -122,6 +131,10 @@ EOF
           verbose = true
         when '--style'
           style = arg
+        when '--color'
+          color = true
+        when '--black-and-white'
+          color = false
         when '--file'
           file = arg
         when '--recursive'
@@ -131,9 +144,10 @@ EOF
         end
       end
       targets = Array.new(ARGV)
+      ARGV.replace(old_argv)
       return [version, help, help_build, help_task, help_template, task,
-              properties, dry_run, template, verbose, style, file, recursive,
-              logo, targets]
+              properties, dry_run, template, verbose, style, color, file,
+              recursive, logo, targets]
     end
 
     # Parse a command line property.
@@ -152,17 +166,18 @@ EOF
     end
 
     # Start build from command line.
-    def self.start_command_line
+    # - arguments: command line arguments.
+    def self.start_command_line(arguments)
       STDOUT.sync = true
       begin
         version, help, help_build, help_task, help_template, task,
-          properties, dry_run, template, verbose, style, file, recursive,
-          logo, targets = parse_command_line
+          properties, dry_run, template, verbose, style, color, file,
+          recursive, logo, targets = parse_command_line(arguments)
       rescue
         puts "ERROR: parsing command line (type 'bee -h' for help)"
         exit(EXIT_PARSING_CMDLINE)
       end
-      formatter = Formatter.new(style)
+      formatter = Formatter.new(style, color)
       begin
         if logo
           puts BEE_LOGO
@@ -247,6 +262,16 @@ EOF
       DEFAULT_STYLE = {
         :line_character => '-'
       }
+      # Color style (supposed to work on color terminals).
+      COLOR_STYLE = {
+        :line_character     => '-',
+        :target_foreground  => :yellow,
+        :task_foreground    => :blue,
+        :success_style      => :bright,
+        :success_foreground => :green,
+        :error_style        => :bright,
+        :error_foreground   => :red
+      }
       # Short style keys for command line
       SHORT_STYLE_KEYS = {
         'lc' => 'line_character',
@@ -267,14 +292,19 @@ EOF
 
       # Constructor.
       # - style: style as a Hash or a String.
-      def initialize(style)
+      # - color: a boolean telling if we use default color scheme.
+      def initialize(style, color=false)
+        # set default or color style
+        if color
+          @style = COLOR_STYLE.clone
+        else
+          @style = DEFAULT_STYLE.clone
+        end
         # if style is a String, this is command line argument
-        style = parse_style_from_command_line(style) if style.kind_of?(String)
-        # if style is nil, set default style
-        @style = style || DEFAULT_STYLE
-        # set default values for keys if nil
-        for key in DEFAULT_STYLE.keys
-          @style[key] = @style[key] || DEFAULT_STYLE[key]
+        if style.kind_of?(String)
+          @style.merge!(parse_style_from_command_line(style))
+        elsif style.kind_of?(Hash)
+          @style.merge!(style)
         end
       end
 
@@ -332,32 +362,32 @@ EOF
         help = ''
         # print build name and description
         if build.name
-          help << "- Build: #{build.name}\n"
+          help << "build: #{build.name}\n"
         end
         if build.extends
-          help << "  Extends: #{build.extends}\n"
+          help << "extends: #{build.extends}\n"
         end
         if build.description
-          help << format_description('Description', build.description, 2, false)
+          help << format_description('description', build.description, 0, false)
         end
         # print build properties
         if build.context.properties.length > 0
-          help << "- Properties:\n"
+          help << "properties:\n"
           for property in build.context.properties.sort
-            help << "  - #{property}: " +
+            help << "- #{property}: " +
               "#{build.context.get_property(property, true).inspect}\n"
           end
         end
         # print build targets
         description = build.targets.description
         if description.length > 0
-          help << "- Targets:\n"
+          help << "targets:\n"
           for name in description.keys.sort
-            help << format_description(name, description[name], 2)
+            help << format_description(name, description[name], 0)
           end
         end
         # print default target
-        help << "- Default: #{build.default}\n"
+        help << "default: #{build.default}\n"
         return help.strip
       end
 

data/lib/bee_task.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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.
@@ -83,10 +83,10 @@ module Bee
             end
             params[param.to_sym] = params[param.to_s]
           else
-            params[param.to_sym] = description[param][:default] if
-              description[param][:default]
-            params[param.to_s] = description[param][:default] if
-              description[param][:default]
+            if description[param][:default]
+              params[param.to_sym] = description[param][:default]
+              params[param.to_s] = description[param][:default]
+            end
           end
         end
         for param in params.keys

data/lib/bee_task_default.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 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.
@@ -454,6 +454,9 @@ module Bee
       #   false.
       # - flatten: tells if included files should be copied in destination
       #   directory, ignoring their subdirectory. Optional, defaults to false.
+      # - lenient: tells if copy is lenient, which will silently succeed on
+      #   errors (for instance if root or destination directory don't exist).
+      #   Optional, defaults to false.
       #
       # Example:
       #
@@ -476,7 +479,8 @@ module Bee
           :excludes => { :mandatory => false, :type => :string_or_array },
           :dest     => { :mandatory => true,  :type => :string },
           :flatten  => { :mandatory => false, :type => :boolean, :default => false },
-          :dotmatch => { :mandatory => false, :type => :boolean, :default => false }
+          :dotmatch => { :mandatory => false, :type => :boolean, :default => false },
+          :lenient  => { :mandatory => false, :type => :boolean, :default => false }
         }
         check_parameters(params, params_desc)
         root     = params[:root]
@@ -485,10 +489,22 @@ module Bee
         dest     = params[:dest]
         flatten  = params[:flatten]
         dotmatch = params[:dotmatch]
-        error "copy 'root' parameter must be an existing directory" unless
-          File.exists?(root) and File.directory?(root)
-        error "copy 'dest' parameter must be an existing directory" unless
-          File.exists?(dest) and File.directory?(dest)
+        lenient  = params[:lenient]
+        # check that root and dest are existing directories
+        if not (File.exists?(root) and File.directory?(root))
+          if lenient
+            return
+          else
+            error "copy 'root' parameter must be an existing directory"
+          end
+        end
+        if not (File.exists?(dest) and File.directory?(dest))
+          if lenient
+            return
+          else
+            error "copy 'dest' parameter must be an existing directory"
+          end
+        end
         # select files and copy
         files = filter_files(includes, excludes, root, dotmatch)
         puts "Copying #{files.length} file(s) to '#{dest}'"
@@ -517,6 +533,9 @@ module Bee
       #   directory, ignoring their subdirectory. Optional, defaults to false.
       # - dotmatch: tells if joker matches dot files. Optional, defaults to
       #   false.
+      # - lenient: tells if move is lenient, which will silently succeed on
+      #   errors (for instance if root or destination directory don't exist).
+      #   Optional, defaults to false.
       #
       # Example:
       #
@@ -540,7 +559,8 @@ module Bee
           :excludes => { :mandatory => false, :type => :string_or_array },
           :dest     => { :mandatory => true,  :type => :string },
           :flatten  => { :mandatory => false, :type => :boolean, :default => false },
-          :dotmatch => { :mandatory => false, :type => :boolean, :default => false }
+          :dotmatch => { :mandatory => false, :type => :boolean, :default => false },
+          :lenient  => { :mandatory => false, :type => :boolean, :default => false }
         }
         check_parameters(params, params_desc)
         root     = params[:root]
@@ -549,10 +569,22 @@ module Bee
         dest     = params[:dest]
         flatten  = params[:flatten]
         dotmatch = params[:dotmatch]
-        error "move 'root' parameter must be an existing directory" unless
-          File.exists?(root) and File.directory?(root)
-        error "move 'dest' parameter must be an existing directory" unless
-          File.exists?(dest) and File.directory?(dest)
+        lenient  = params[:lenient]
+        # check that root and dest are existing directories
+        if not (File.exists?(root) and File.directory?(root))
+          if lenient
+            return
+          else
+            error "move 'root' parameter must be an existing directory"
+          end
+        end
+        if not (File.exists?(dest) and File.directory?(dest))
+          if lenient
+            return
+          else
+            error "move 'dest' parameter must be an existing directory"
+          end
+        end
         # select files and make move
         files = filter_files(includes, excludes, root, dotmatch)
         puts "Moving #{files.length} file(s) to '#{dest}'"
@@ -779,16 +811,25 @@ module Bee
         excludes = params[:excludes]
         dotmatch = params[:dotmatch]
         dir      = params[:dir]
+        error "Test directory '#{dir}' not found" if 
+          not (File.exists?(dir) and File.directory?(dir))
         files = filter_files(includes, excludes, root, dotmatch)
         for file in files
-          load file
+          load File.join(root || '.', file)
         end
         size = (files.kind_of?(Array) ? files.size : 1)
         puts "Running #{size} unit test(s)"
-        ok = Test::Unit::AutoRunner.run(false, dir)
-        error "Tests failed" if not ok
+        old_dir = Dir.pwd
+        begin
+          Dir.chdir(dir)
+          runner = Test::Unit::AutoRunner.new(false)
+          ok = runner.run
+          error "Test failure" if not ok
+        ensure
+          Dir.chdir(old_dir)
+        end
       end
-      
+
       # Run an ERB file or source in bee context and store result in a file or
       # property. Parameter is a Hash with following entries:
       # 

data/lib/bee_util.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2009 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2010 Michel Casabianca <michel.casabianca@gmail.com>
 #           2006 Avi Bryant
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ module Bee
     # Expanded pattern for resource
     EXPANDED_PATTERN = /^ruby:\/\/(.*?)(:(.*?))?\/(.*)$/
     # Default terminal width
-    DEFAULT_TERM_WIDTH = 80
+    DEFAULT_TERM_WIDTH = (RUBY_PLATFORM =~ /win32/ ? 79 : 80)
 
     # Get line length calling IOCTL. Return DEFAULT_TERM_WIDTH if call failed.
     def self.term_width

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 +01:00
+date: 2010-01-13 00:00:00 +01:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,33 +42,34 @@ extra_rdoc_files:
 - README
 - LICENSE
 files: 
-- bin/bee
 - bin/bee.bat
-- lib/bee.rb
+- bin/bee
 - lib/bee_console.rb
 - lib/bee_task.rb
 - lib/bee_task_default.rb
 - lib/bee_util.rb
-- egg/package
-- egg/package/bee_task.erb
+- lib/bee.rb
+- egg/package.yml
+- egg/package/test.erb
+- egg/package/test_suite.rb
+- egg/package/gem_spec.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/test.erb
+- egg/package/bee_task.erb
+- egg/package/egg.yml
 - egg/package/test_build.erb
-- egg/package/test_build.rb
+- egg/package/egg_build.erb
 - egg/package/test_build_listener.rb
-- egg/package/test_suite.rb
-- egg/package.yml
+- egg/package/test_build.rb
 - README
 - LICENSE
 has_rdoc: true
 homepage: http://bee.rubyforge.org
+licenses: []
+
 post_install_message: Enjoy bee!
 rdoc_options: []
 
@@ -89,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bee
-rubygems_version: 1.3.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: bee is a build tool
 test_files: []