bee 0.6.1 → 0.7.0

data/README

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

data/egg/sinatra.yml

@@ -0,0 +1,55 @@
+- build: package
+  default: all
+  description: "Generate a Sinatra project"
+
+- properties:
+  - name: sinatra
+  - description: |
+      This script will create a Sinatra project. Generated build file has a 
+      target 'run' to run the server, 'zip' to generate a distribution archive
+      and 'clean' to delete generated files.
+
+- target: welcome
+  description: "Print information message"
+  script:
+  - print: :description
+
+- target: prompt
+  depends: welcome
+  description: "Prompt for project information"
+  script:
+  - print: "Please answer following questions to generate the project:"
+  - prompt:
+      message: "What is the project's name?"
+      default: :name
+      property: name
+
+- target: generate
+  depends: prompt
+  description: "Generate project"
+  script:
+  - print: "Generating project..."
+  - rb: |
+      error "A directory named '#{name}' already exists, aborting" if
+        File.exists?("#{here}/#{name}")
+  - mkdir: "#{here}/#{name}"
+  - erb:
+      src:  "#{base}/sinatra/build.yml"
+      dest: "#{here}/#{name}/build.yml"
+  - cp:
+      src:  "#{base}/sinatra/server.rb"
+      dest: "#{here}/#{name}/server.rb"
+
+- target: customization
+  depends: generate
+  description: "Print information about project customization"
+  script:
+  - print: |
+      Project has been generated in directory '#{name}'. Type 'bee -b' to print
+      information about generated build file. To start server, type 'b run'. To
+      send a request, call URL 'http://localhost:4567/hello/world', typing
+      'b call' for instance (which requires curl).
+      Enjoy!
+
+- target: all
+  depends: [welcome, prompt, generate, customization]

data/egg/sinatra/build.yml

@@ -0,0 +1,45 @@
+- build: <%= name %>
+  description: Project <%= name %>
+  default: all
+
+- properties:
+  - name:         "<%= name %>"
+  - version:      "0.0.0"
+  - build:        "build"
+  - zip_prefix:   "#{name}-#{version}"
+  - zip_file:     "#{build}/#{zip_prefix}.zip"
+  - url:          "http://localhost:4567/hello"
+  - clean_dirs:   [:build]
+  - clean_files:  ["**/*~", "**/.#*", "**/.DS_Store"]
+
+- target: run
+  description: Run server
+  script:
+  - "./server.rb"
+
+- target: call
+  description: Call server
+  script:
+  - get:
+      url:  "#{url}/World"
+      prop: response
+  - print: :response
+
+- target: zip
+  description: Generate a ZIP archive
+  script:
+  - mkdir: :build
+  - zip:
+      includes: "server.rb"
+      prefix:   :zip_prefix
+      dest:     :zip_file
+
+- target: clean
+  description: Clean generated files
+  script:
+  - rmdir: :clean_dirs
+  - rm:    :clean_files
+
+- target: all
+  depends: [clean, zip]
+  description: Generate the whole project

data/egg/sinatra/server.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+#
+# Sample Sinatra server. You can get sinatra typing: 'gem install sinatra'.
+
+require 'rubygems'
+require 'sinatra'
+
+get '/hello/:name' do
+  "Hello #{ params[:name]}!"
+end

data/lib/bee.rb

@@ -629,6 +629,9 @@ module Bee
       # for construct
       elsif construct.keys.include?('for')
         construct_for(construct, dry)
+      # try construct
+      elsif construct.keys.include?('try')
+        construct_try(construct, dry)
       else
         error "Unknown construct '#{construct.keys.join('-')}'"
       end
@@ -711,6 +714,29 @@ module Bee
       end
     end
 
+    # Run try-catch construct.
+    # - task: the construct as a hash.
+    # - dry: tells if we run in dry mode.
+    def construct_try(task, dry)
+      # test entries
+      error "Try-catch construct must include 'catch' entry" if
+        not task.keys.include?('catch')
+      unknown_keys = task.keys - ['try', 'catch']
+      error "Try-catch construct may only include 'try' and 'catch' entries" if
+        unknown_keys.length > 0
+      error "Try entry in try-catch construct must be a list" if
+        not task['try'].kind_of?(Array)
+      error "Catch entry in try-catch construct must be a list" if
+        not task['catch'].kind_of?(Array)
+      # try and catch errors
+      begin
+        run_block(task['try'], dry)
+      rescue
+        @targets.build.listener.recover if @targets.build.listener
+        run_block(task['catch'], dry)
+      end
+    end
+
     # Run a block, that is a list of tasks.
     # - block: the block to run as a list of tasks.
     # - dry: tells if we run in dry mode.
@@ -776,7 +802,7 @@ module Bee
     
     # Return list of properties (as local variables of binding).
     def properties
-      return eval('local_variables', @context_binding)
+      return eval('local_variables', @context_binding).map{ |var| var.to_s }
     end
     
     # Evaluate a script in context.

data/lib/bee_console.rb

@@ -60,7 +60,7 @@ targets        Targets to run (default target if omitted).'
        | |__   ___  ___                                                   
  ____  | '_ \ / _ \/ _ \  _____ _____ _____ _____ _____ _____ _____ _____ _____
 |____| | |_) |  __/  __/ |_____|_____|_____|_____|_____|_____|_____|_____|_____|
-       |_.__/ \___|\___|  0.6.1                         http://bee.rubyforge.org
+       |_.__/ \___|\___|  0.7.0                         http://bee.rubyforge.org
 
 EOF
 
@@ -621,6 +621,11 @@ EOF
         raise Bee::Util::BuildError.new(message)
       end
 
+      # Recover from a previous error (catching it for instance).
+      def recover
+        @success = true
+      end
+
       # Print text on the console.
       # - text: text to print.
       def print(text)

data/lib/bee_task.rb

@@ -73,6 +73,7 @@ module Bee
             when :string_or_array
               error "#{task} '#{param}' parameter must be a string or an array" unless
                 params[param.to_s].kind_of?(String) or params[param.to_s].kind_of?(Array)
+              params[param.to_s] = Array(params[param.to_s])
             when :string_or_integer
               error "#{task} '#{param}' parameter must be a string or an integer" unless
                 params[param.to_s].kind_of?(String) or params[param.to_s].kind_of?(Integer)
@@ -119,6 +120,7 @@ module Bee
           Dir.chdir(root) if root
           included = []
           includes = '**/*' if not includes
+          includes = Array(includes)
           for include in includes
             error "includes must be a glob or a list of globs" unless
               include.kind_of?(String)

data/lib/bee_task_default.rb

@@ -18,6 +18,7 @@ require 'bee_task'
 require 'bee_util'
 require 'erb'
 require 'fileutils'
+require 'net/smtp'
 
 module Bee
   
@@ -130,6 +131,21 @@ module Bee
         @build.context.set_property(property, value)
       end
 
+      # Trow a build error with a given message.
+      #
+      # - message: the error message. Will be printed on the console as the
+      #   build failure reason.
+      #
+      # Example
+      #
+      #   - if: "not File.exists?('/etc/config')"
+      #     then:
+      #     - throw: "No /etc/config file found!"
+      def throw(message)
+        error "throw parameter must be a string" if not message.kind_of?(String)
+        error message
+      end
+
       # Get a given URL and store its content in a given file. Parameters
       # is a Hash with following entries:
       #
@@ -137,6 +153,8 @@ module Bee
       # - dest: destination file. Optional, defaults to retrieved file name
       #   in current directory. If destination is a directory, file is saved
       #   in destination directory with the name of the retrieved file.
+      # - prop: Property to set with content of the response body. Optional
+      #   defaults to output in a file.
       # - limit: the redirections limit. Optional, defaults to 10.
       #
       # Example
@@ -145,19 +163,23 @@ module Bee
       #       url: http://rubyforge.org/frs/download.php/22185/bee-0.4.0.zip
       def get(parameters)
         params_desc = {
-          :url   => { :mandatory => true,   :type => :string },
-          :dest  => { :mandatory => false,  :type => :string },
-          :limit => { :mandatory => false,  :type => :integer, :default => 10 }
+          :url   => { :mandatory => true,  :type => :string },
+          :dest  => { :mandatory => false, :type => :string },
+          :prop  => { :mandatory => false, :type => :string },
+          :limit => { :mandatory => false, :type => :integer, :default => 10 }
         }
         check_parameters(parameters, params_desc)
         url = parameters[:url]
         dest = parameters[:dest]
-        if not dest
+        prop = parameters[:prop]
+        if not dest and not prop
           destination = File.basename(url)
-        elsif File.directory?(dest)
+        elsif dest and File.directory?(dest)
           destination = File.join(dest, File.basename(url))
-        else
+        elsif dest
           destination = dest
+        else
+          destination = nil
         end
         limit = parameters[:limit]
         puts "Getting URL '#{url}'..."
@@ -166,12 +188,65 @@ module Bee
         rescue Exception
           error "Error getting URL: #{$!}"
         end
-        todir = File.dirname(destination)
+        if destination
+          todir = File.dirname(destination)
+          begin
+            FileUtils.makedirs(todir) if not File.exists?(todir)
+            File.open(destination, 'w') { |file| file.write(content) }
+          rescue Exception
+            error "Error saving file: #{$!}"
+          end
+        end
+        if prop
+          @build.context.set_property(prop, content)
+        end
+      end
+
+      
+      # Send an email using SMTP.
+      #
+      # - from: The sender of the email.
+      # - to: Recipient of the email. This may be a list of recipients.
+      # - subject: The subject of the email.
+      # - message: The body of the email.
+      # - smtp: The address of the SMTP server.
+      #
+      # Example
+      #
+      #   - mail:
+      #       from:    "foo@bee.com"
+      #       to:      "bar@bee.com"
+      #       subject: "Bee Release 0.6.2"
+      #       message: "Hi! There is a new Bee release!"
+      #       smtp:    "smtp.bee.com"
+      def mail(parameters)
+        params_desc = {
+          :from    => { :mandatory => true, :type => :string },
+          :to      => { :mandatory => true, :type => :string_or_array },
+          :subject => { :mandatory => true, :type => :string },
+          :message => { :mandatory => true, :type => :string },
+          :smtp    => { :mandatory => true, :type => :string },
+        }
+        check_parameters(parameters, params_desc)
+        from    = parameters[:from]
+        to      = Array(parameters[:to])
+        subject = parameters[:subject]
+        message = parameters[:message]
+        smtp    = parameters[:smtp]
+        body = <<EOF
+From: #{from}
+To: #{to.join(', ')}
+Subject: #{subject}
+
+#{message}
+EOF
+        puts "Sending email about '#{subject}'..."
         begin
-          FileUtils.makedirs(todir) if not File.exists?(todir)
-          File.open(destination, 'w') { |file| file.write(content) }
+          Net::SMTP.start(smtp) do |smtp_server|
+            smtp_server.send_message(body, from, to)
+          end
         rescue Exception
-          error "Error saving file: #{$!}"
+          error "Error sending email: #{$!}"
         end
       end
 
@@ -364,6 +439,7 @@ module Bee
       def mkdir(dirs)
         error "mkdir parameter must a String or an array of Strings" unless
           dirs.kind_of?(String) or dirs.kind_of?(Array)
+        dirs = Array(dirs)
         for dir in dirs
           error "mkdir parameter must a String or an array of Strings" unless
             dir.kind_of?(String)
@@ -623,6 +699,7 @@ module Bee
       def rm(globs)
         error "rm parameter is a String or Array of Strings" unless
           globs.kind_of?(String) or globs.kind_of?(Array)
+        globs = Array(globs)
         for glob in globs
           error "rm parameter is a String or Array of Strings" unless
             glob.kind_of?(String)
@@ -646,9 +723,9 @@ module Bee
       # 
       #  - rmrf: :build
       def rmrf(globs)
-        globs = [globs] if globs.kind_of?(String)
         error "rmrf parameter is a String or an Array of Strings" unless
           globs.kind_of?(String) or globs.kind_of?(Array)
+        globs = Array(globs)
         for glob in globs
           error "rmrf parameter is a String or an Array of Strings" unless
             glob.kind_of?(String)
@@ -676,9 +753,9 @@ module Bee
       # 
       #   - touch: '#{target}/classes/**/*.class'
       def touch(globs)
-        globs = [globs] if globs.kind_of?(String)
         error "touch parameter is a String or an Array of Strings" unless
           globs.kind_of?(String) or globs.kind_of?(Array)
+        globs = Array(globs)
         files = []
         for glob in globs
           error "touch parameter is a String or an Array of Strings" unless
@@ -864,7 +941,6 @@ module Bee
       #      dir:      "test"
       def test(params)
         require 'test/unit'
-        require 'test/unit/testresult'
         params_desc = {
           :root     => { :mandatory => false, :type => :string },
           :includes => { :mandatory => true,  :type => :string },
@@ -1000,7 +1076,8 @@ module Bee
           :root     => { :mandatory => false, :type => :string },
           :includes => { :mandatory => true,  :type => :string_or_array },
           :excludes => { :mandatory => false, :type => :string_or_array },
-          :dotmatch => { :mandatory => false, :type => :boolean, :default => false },
+          :dotmatch => { :mandatory => false, :type => :boolean,
+                         :default   => false },
           :dest     => { :mandatory => true,  :type => :string },
           :options  => { :mandatory => false, :type => :string_or_array }
         }
@@ -1013,7 +1090,7 @@ module Bee
         options  = params[:options]
         files = filter_files(includes, excludes, root, dotmatch)
         command_line = ['-S', '-o', dest]
-        command_line << options if options
+        command_line += options if options
         command_line += files
         begin
           rdoc = RDoc::RDoc.new
@@ -1501,6 +1578,22 @@ module Bee
       def for
       end
 
+      # Try construct will run the block in the 'try' entry and will switch to
+      # block in the 'catch' entry if an error occurs.
+      #
+      # - try: the block to run.
+      # - catch: the block to switch to if an error occurs.
+      #
+      # Example:
+      #
+      #   - try:
+      #       - print: "In the try block"
+      #       - throw: "Something went terribly wrong!"
+      #     catch:
+      #       - print: "An error occured"
+      def try
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,9 @@ files:
 - egg/package/test_build_listener.rb
 - egg/package/test_suite.rb
 - egg/package.yml
+- egg/sinatra/build.yml
+- egg/sinatra/server.rb
+- egg/sinatra.yml
 - README
 - LICENSE
 has_rdoc: true