bee 0.8.0 → 0.8.1

data/README

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

data/lib/bee_console.rb

@@ -52,6 +52,8 @@ targets        Targets to run (default target if omitted).'
     EXIT_BUILD_ERROR = 2
     # Exit value on unknown error
     EXIT_UNKNOWN_ERROR = 3
+    # Exit value on user interruption
+    EXIT_INTERRUPT_ERROR = 4
     # Bee options environment variable.
     BEE_OPT_ENV = 'BEEOPT'
     # Bee text logo (generated with http://www.network-science.de/ascii/)
@@ -60,7 +62,7 @@ targets        Targets to run (default target if omitted).'
        | |__   ___  ___                                                   
  ____  | '_ \ / _ \/ _ \  _____ _____ _____ _____ _____ _____ _____ _____ _____
 |____| | |_) |  __/  __/ |_____|_____|_____|_____|_____|_____|_____|_____|_____|
-       |_.__/ \___|\___|  0.8.0                         http://bee.rubyforge.org
+       |_.__/ \___|\___|  0.8.1                         http://bee.rubyforge.org
 
 EOF
 
@@ -210,6 +212,10 @@ EOF
         puts "#{formatter.format_error('ERROR')}: #{$!}"
         puts e.backtrace.join("\n") if verbose
         exit(EXIT_BUILD_ERROR)
+      rescue Interrupt => e
+        puts "#{formatter.format_error('ERROR')}: Build was interrupted!"
+        puts e.backtrace.join("\n") if verbose
+        exit(EXIT_INTERRUPT_ERROR)
       rescue Exception => e
         puts "#{formatter.format_error('ERROR')}: #{$!}"
         puts e.backtrace.join("\n")
@@ -562,6 +568,8 @@ EOF
       attr_reader :last_target
       # Last task met.
       attr_reader :last_task
+      # Minimum duration to print on console even if not verbose (in seconds)
+      AUTO_DURATION = 60
 
       # Constructor.
       # - formatter: the formatter to use to output on console.
@@ -650,7 +658,8 @@ EOF
       def duration
         @end_time = Time.now
         @duration = @end_time - @start_time
-        puts "Built in #{@duration} s" if @verbose        
+        @duration = (@duration * 1000).round / 1000
+        puts "Built in #{@duration} s" if @verbose or @duration >= AUTO_DURATION
       end
       
     end

data/lib/bee_task_default.rb

@@ -19,6 +19,8 @@ require 'bee_util'
 require 'erb'
 require 'fileutils'
 require 'net/smtp'
+require 'highline/import'
+require 'net/ftp'
 
 module Bee
   
@@ -82,6 +84,8 @@ module Bee
       # - error: the error message to print when pattern is not matched.
       # - attempts: number of allowed attempts. Optional, defaults to 0, which
       #   means an unlimited number of attempts.
+      # - echo: the character to echo while typing. Useful for passwords,
+      #   echoing '*' for instance.
       #
       # Example
       #
@@ -99,7 +103,9 @@ module Bee
           :pattern  => { :mandatory => false, :type => :string },
           :error    => { :mandatory => false, :type => :string },
           :attempts => { :mandatory => false, :type => :integer,
-                         :default   => 0 }
+                         :default   => 0 },
+          :echo     => { :mandatory => false, :type => :string,
+                         :default   => false }
         }
         check_parameters(params, params_desc)
         message = params[:message]
@@ -108,13 +114,17 @@ module Bee
         pattern = params[:pattern]
         error = params[:error]
         attempts = params[:attempts]
+        echo_char = params[:echo]
         message << " [#{default}]" if default
-        message << ':'
+        message << ': '
         ok = false
         nb_attempts = 1
         while not (ok or (nb_attempts > attempts and attempts != 0))
-          puts message
-          value = gets.strip
+          if echo_char
+            value = ask(message) {|q| q.echo=echo_char}
+          else
+            value = ask(message)
+          end
           value = default if default and value.length == 0
           if pattern
             if value =~ /#{pattern}/
@@ -210,6 +220,7 @@ module Bee
       # - subject: The subject of the email.
       # - message: The body of the email.
       # - smtp: The address of the SMTP server.
+      # - encoding: The message encoding. Defaults to ASCII.
       #
       # Example
       #
@@ -221,19 +232,24 @@ module Bee
       #       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 },
+          :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 },
+          :encoding => { :mandatory => false, :type => :string,
+                         :default   => 'UTF-8'}
         }
         check_parameters(parameters, params_desc)
-        from    = parameters[:from]
-        to      = Array(parameters[:to])
-        subject = parameters[:subject]
-        message = parameters[:message]
-        smtp    = parameters[:smtp]
+        from     = parameters[:from]
+        to       = Array(parameters[:to])
+        subject  = parameters[:subject]
+        message  = parameters[:message]
+        smtp     = parameters[:smtp]
+        encoding = parameters[:encoding]
         body = <<EOF
+MIME-Version: 1.0
+Content-Type: text/plain; charset=#{encoding}
 From: #{from}
 To: #{to.join(', ')}
 Subject: #{subject}
@@ -1509,6 +1525,189 @@ EOF
         end
       end
       
+      ######################################################################
+      #                             FTP TASKS                              #
+      ######################################################################
+
+      # Login to a remote FTP site. Useful to test a connection. Raises a
+      # build error if connection fails. Parameter is a hash with following
+      # entries:
+      #
+      # - username: the username to connect to FTP. Defaults to anonymous.
+      # - password: the password to connect to FTP. Defaults to no password.
+      # - host: the hostname to connect to.
+      #
+      # Example
+      #
+      #   - ftp_login:
+      #       username: foo
+      #       password: bar
+      #       host:     example.com
+      def ftp_login(params)
+        params_desc = {
+          :username => { :mandatory => false, :type => :string },
+          :password => { :mandatory => false, :type => :string },
+          :host     => { :mandatory => true,  :type => :string }
+        }
+        check_parameters(params, params_desc)
+        username = params[:username]
+        password = params[:password]
+        host     = params[:host]
+        begin
+          Net::FTP.open(host) do |ftp|
+            ftp.login(username, password)
+            ftp.close
+          end
+          puts "Connection to FTP host '#{host}' sucessful"
+        rescue
+          error "Error connecting to FTP host: #{$!}"
+        end
+      end
+
+      # Get a file from a remote FTP site. Raises a build error this operation
+      # fails. Parameter is a hash with following entries:
+      #
+      # - username: the username to connect to FTP. Defaults to anonymous.
+      # - password: the password to connect to FTP. Defaults to no password.
+      # - host: the hostname to connect to.
+      # - file: the FTP path to remote file to get.
+      # - output: the local path to file to write. Defaults to same file name
+      #   in current directory.
+      # - binary: sets the binary mode for download. Defaults to true.
+      #
+      # Example:
+      #
+      #   - ftp_get:
+      #       username: foo
+      #       password: bar
+      #       host: foo
+      #       file: test.txt
+      def ftp_get(params)
+        params_desc = {
+          :username => { :mandatory => false, :type => :string },
+          :password => { :mandatory => false, :type => :string },
+          :host     => { :mandatory => true,  :type => :string },
+          :file     => { :mandatory => true,  :type => :string },
+          :output   => { :mandatory => false, :type => :string },
+          :binary   => { :mandatory => false, :type => :boolean,
+                         :default   => true }
+        }
+        check_parameters(params, params_desc)
+        username = params[:username]
+        password = params[:password]
+        host     = params[:host]
+        file     = params[:file]
+        output   = params[:output]||File.basename(file)
+        binary   = params[:binary]
+        basename = File.basename(file)
+        puts "Getting file '#{basename}'..."
+        begin
+          Net::FTP.open(host) do |ftp|
+            ftp.login(username, password)
+            if binary
+              ftp.getbinaryfile(file, output)
+            else
+              ftp.gettextfile(file, output)
+            end
+            ftp.close
+          end
+        rescue
+          error "Error getting file '#{basename}': #{$!}"
+        end
+      end
+
+      # Put a file to a remote FTP site. Raises a build error this operation
+      # fails. Parameter is a hash with following entries:
+      #
+      # - username: the username to connect to FTP. Defaults to anonymous.
+      # - password: the password to connect to FTP. Defaults to no password.
+      # - host: the hostname to connect to.
+      # - file: locale file to send.
+      # - tofile: remote file to write on remote server. Defaults to base name
+      #   of local file.
+      # - binary: sets the binary mode for upload. Defaults to true.
+      #
+      # Example:
+      #
+      #   - ftp_put:
+      #       username: foo
+      #       password: bar
+      #       host: foo
+      #       file: test.txt
+      def ftp_put(params)
+        params_desc = {
+          :username => { :mandatory => false, :type => :string },
+          :password => { :mandatory => false, :type => :string },
+          :host     => { :mandatory => true,  :type => :string },
+          :file     => { :mandatory => true,  :type => :string },
+          :tofile   => { :mandatory => false, :type => :string },
+          :binary   => { :mandatory => false, :type => :boolean,
+                         :default   => true }
+        }
+        check_parameters(params, params_desc)
+        username = params[:username]
+        password = params[:password]
+        host     = params[:host]
+        file     = params[:file]
+        tofile   = params[:tofile]
+        binary   = params[:binary]
+        basename = File.basename(file)
+        puts "Putting file '#{basename}'..."
+        begin
+          Net::FTP.open(host) do |ftp|
+            ftp.login(username, password)
+            if binary
+              ftp.putbinaryfile(file, tofile)
+            else
+              ftp.puttextfile(file, tofile)
+            end
+            ftp.close
+          end
+        rescue
+          error "Error putting file '#{basename}': #{$!}"
+        end
+      end
+
+      # Make a directory on a remote FTP site. Raises a build error this
+      # operation fails. Parameter is a hash with following entries:
+      #
+      # - username: the username to connect to FTP. Defaults to anonymous.
+      # - password: the password to connect to FTP. Defaults to no password.
+      # - host: the hostname to connect to.
+      # - dir: the path of the remote directory to create.
+      #
+      # Example:
+      #
+      #   - ftp_mkdir:
+      #       username: foo
+      #       password: bar
+      #       host: foo
+      #       dir:  test
+      def ftp_mkdir(params)
+        params_desc = {
+          :username  => { :mandatory => false, :type => :string },
+          :password  => { :mandatory => false, :type => :string },
+          :host      => { :mandatory => true,  :type => :string },
+          :dir       => { :mandatory => true,  :type => :string }
+        }
+        check_parameters(params, params_desc)
+        username  = params[:username]
+        password  = params[:password]
+        host      = params[:host]
+        dir       = params[:dir]
+        basename  = File.basename(dir)
+        puts "Making directory '#{basename}'..."
+        begin
+          Net::FTP.open(host) do |ftp|
+            ftp.login(username, password)
+            ftp.mkdir(dir)
+            ftp.close
+          end
+        rescue
+          error "Error making directory '#{basename}': #{$!}"
+        end
+      end
+
       ######################################################################
       #                             CONSTRUCTS                             #
       ######################################################################
@@ -1602,3 +1801,4 @@ EOF
   end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +02:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   type: :runtime