bee 0.11.1 → 0.11.2

data/README

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

data/bin/bee

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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/clean.yml

@@ -0,0 +1,36 @@
+# Copyright 2006-2012 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Build info
+- build:       bee
+  default:     clean
+  description: Parent build file to clean
+  abstract:    true
+
+# Build properties
+- properties:
+    build_dir: ~
+    clean_dirs:
+    - :build_dir
+    clean_files:
+    - "**/*~"
+    - "**/.#*#"
+
+# Build targets
+- target:      clean
+  description: Clean generated files
+  script:
+  - rmdir: :clean_dirs
+  - rm:    :clean_files
+

data/egg/application.yml

@@ -1,5 +1,5 @@
-- build: application
-  default: all
+- build:       application
+  default:     all
   description: "Generate a sample Ruby application project"
 
 - properties:
@@ -9,13 +9,13 @@
       can run unit tests, generate API documentation, generate GEM archive
       and build a ZIP distribution file.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -24,8 +24,8 @@
       default: :name
       property: name
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -48,8 +48,8 @@
       excludes: ["build.yml", "bin/*"]
       dest:     "#{here}/#{name}"
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -57,5 +57,5 @@
       to print information about generated build file.
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/package.yml

@@ -1,5 +1,5 @@
-- build: package
-  default: all
+- build:       package
+  default:     all
   description: "Generate a bee package project"
 
 - properties:
@@ -12,13 +12,13 @@
       'clean' target to clean generated files and a 'install' target to build
       and install gem.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -27,8 +27,8 @@
       default: :project_name
       property: project_name
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -85,8 +85,8 @@
       src:  "#{base}/package/egg_script.rb"
       dest: "#{here}/#{project_name}/egg/#{project_short_name}/script.rb"
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -96,5 +96,5 @@
       generated build file.
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/package/test_build.rb

@@ -1,4 +1,4 @@
-# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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.yml

@@ -1,18 +1,18 @@
-- build: source
-  default: all
+- build:       source
+  default:     all
   description: "Generate a sample Ruby script project"
 
 - properties:
-    name: script
+    name:        script
     description: This script will generate a sample Ruby script project.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -21,8 +21,8 @@
       default: :name
       property: name
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -34,11 +34,11 @@
       src:  "#{base}/script/build.yml"
       dest: "#{here}/#{name}/build.yml"
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: Script project has been generated in directory '#{name}'.
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/sinatra.yml

@@ -1,5 +1,5 @@
-- build: package
-  default: all
+- build:       package
+  default:     all
   description: "Generate a Sinatra project"
 
 - properties:
@@ -9,13 +9,13 @@
       target 'run' to run the server, 'zip' to generate a distribution archive
       and 'clean' to delete generated files.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -24,8 +24,8 @@
       default: :name
       property: name
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -40,8 +40,8 @@
       src:  "#{base}/sinatra/server.rb"
       dest: "#{here}/#{name}/server.rb"
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -51,5 +51,5 @@
       'b call' for instance (which requires curl).
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/xmlrpc.yml

@@ -1,5 +1,5 @@
-- build: xmlrpc
-  default: all
+- build:       xmlrpc
+  default:     all
   description: "Generate a sample XML-RPC project"
 
 - properties:
@@ -8,13 +8,13 @@
       This script will create a sample XML-RPC project with a Ruby server and
       client.
 
-- target: welcome
+- target:      welcome
   description: "Print information message"
   script:
   - print: :description
 
-- target: prompt
-  depends: welcome
+- target:      prompt
+  depends:     welcome
   description: "Prompt for project information"
   script:
   - print: "Please answer following questions to generate the project:"
@@ -23,8 +23,8 @@
       default: :project_name
       property: project_name
 
-- target: generate
-  depends: prompt
+- target:      generate
+  depends:     prompt
   description: "Generate project"
   script:
   - print: "Generating project..."
@@ -42,8 +42,8 @@
       src:  "#{base}/xmlrpc/client.rb"
       dest: "#{here}/#{project_name}/client.rb"
 
-- target: customization
-  depends: generate
+- target:      customization
+  depends:     generate
   description: "Print information about project customization"
   script:
   - print: |
@@ -51,5 +51,5 @@
       to print information about generated build file.
       Enjoy!
 
-- target: all
+- target:  all
   depends: [welcome, prompt, generate, customization]

data/egg/xmlrpc/build.yml

@@ -13,17 +13,17 @@
     clean_files: ["**/*~", "**/.#*", "**/.DS_Store"]
 
 # Build targets
-- target: server
+- target:      server
   description: Run server
   script:
   - "ruby server.rb"
 
-- target: client
+- target:      client
   description: Run client
   script:
   - "ruby client.rb"
 
-- target: zip
+- target:      zip
   description: Generate ZIP distribution archive
   script:
   - mkdir: :build
@@ -31,12 +31,12 @@
       prefix: "#{name}-#{version}"
       dest:   :zip
 
-- target: clean
+- target:      clean
   description: Clean generated files
   script:
   - rmdir: :clean_dirs
   - rm:    :clean_files
 
-- target: all
-  depends: [clean, zip]
+- target:      all
+  depends:     [clean, zip]
   description: Generate the whole project

data/lib/bee_build.rb

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

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

@@ -1,4 +1,4 @@
-# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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,6 +14,7 @@
 
 require 'rubygems'
 require 'bee_console_style'
+require 'yaml'
 
 module Bee
 
@@ -224,7 +225,7 @@ module Bee
           help << "properties:\n"
           for property in build.context.properties.sort
             help << "- #{property}: " +
-              "#{build.context.get_property(property).inspect}\n"
+              "#{format_property_value(build.context.get_property(property))}\n"
           end
         end
         # print build targets
@@ -307,6 +308,18 @@ module Bee
         return "UNKNOWN CONSTRUCT"
       end
 
+      def format_property_value(data)
+        if data.kind_of?(Hash)
+          pairs = []
+          for key in data.keys()
+            pairs << "#{format_property_value(key)}: #{format_property_value(data[key])}"
+          end
+          return "{#{pairs.join(', ')}}"
+        else
+          return data.inspect
+        end
+      end
+
     end
 
   end

data/lib/bee_console_style.rb

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 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.
@@ -42,6 +42,7 @@ module Bee
       # 
       #  - echo: "Hello World!"
       def echo(message)
+        message = '' if message == nil
         case message
         when String
           puts message
@@ -1316,8 +1317,10 @@ EOF
         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 },
+          :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)

data/lib/bee_task_package.rb

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

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

@@ -1,4 +1,4 @@
-# Copyright 2006-2011 Michel Casabianca <michel.casabianca@gmail.com>
+# Copyright 2006-2012 Michel Casabianca <michel.casabianca@gmail.com>
 #           2006 Avi Bryant
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +25,7 @@ module Bee
     # Default package name.
     DEFAULT_PACKAGE = 'default'    
     # Compact pattern for resource (':gem.file[version]')
-    COMPACT_PATTERN  = /^:(.*?)\.(.*?)(\[(.*)\])?$/
+    COMPACT_PATTERN  = /^:(.*?):(.*?)(\[(.*)\])?$/
     # Expanded pattern for resource ('ruby://gem:version/file')
     EXPANDED_PATTERN = /^ruby:\/\/(.*?)(:(.*?))?\/(.*)$/
     # Default terminal width
@@ -168,6 +168,7 @@ module Bee
       case resource
       when COMPACT_PATTERN
         gem, version, path = $1, $4, $2
+        gem = "bee_#{gem}" if gem != 'bee'
       when EXPANDED_PATTERN
         gem, version, path = $1, $3, $4
       else
@@ -208,16 +209,14 @@ module Bee
     # - template: template to look for (like 'foo.bar').
     # return: found associated file.
     def self.find_template(template)
-      raise Bee::Util::BuildError.
-        new("Invalid template name '#{template}'") if
+      raise Bee::Util::BuildError.new("Invalid template name '#{template}'") if
         not template =~ /^([^.]+\.)?[^.]+$/
       package, egg = template.split('.')
       if not egg
         egg = package
         package = 'bee'
       end
-      prefix = (package == 'bee' ? '':'bee_')
-      resource = ":#{prefix}#{package}.egg/#{egg}.yml"
+      resource = ":#{package}:egg/#{egg}.yml"
       begin
         file = absolute_path(resource, Dir.pwd)
       rescue Exception
@@ -240,9 +239,8 @@ module Bee
         egg = package
         package = 'bee'
       end
-      prefix = (package == 'bee' ? '':'bee_')
       egg = '*' if egg == '?'
-      resource = ":#{prefix}#{package}.egg/#{egg}.yml"
+      resource = ":#{package}:egg/#{egg}.yml"
       begin
         glob = absolute_path(resource, nil)
       rescue

data/lib/bee_version.rb

@@ -1,5 +1,5 @@
 module Bee
 
-    VERSION = '0.11.1'
+    VERSION = '0.11.2'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 +01:00
+date: 2012-01-29 00:00:00 +01:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,7 @@ files:
 - egg/xmlrpc/client.rb
 - egg/xmlrpc/server.rb
 - egg/xmlrpc.yml
+- clean.yml
 - README
 - LICENSE
 has_rdoc: true