bee 0.10.1 → 0.10.2

data/README

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

data/bin/bash_completion_bee

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# To enable bash completion for Bee, copy this file in directory 
+# /etc/bash_completion.d/ and rename it bee. Next time you open a terminal,
+# Bee completion should work:
+# 
+# $ bee --help[TAB]
+# --help           --help-build     --help-task      --help-template
+#
+# $ bee t[TAB]
+# tag test
+#
+# Completion works on long options (starting with --) and targets of the build
+# file.
+
+_bee()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    if [[ ${cur} == -* ]] ; then
+        opts="`bee -o`" 
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    else
+        opts="`bee -a`"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+}
+
+complete -F _bee bee
+complete -F _bee b
+

data/lib/bee.rb

@@ -392,6 +392,18 @@ module Bee
       return description
     end
     
-  end  
+  end
+  
+  # Return Bee version. Try to load bee_version file or return UNKNOWN.
+  def version
+    begin
+      require 'bee_version'
+      return Bee::VERSION
+    rescue Exception
+      return 'UNKNOWN'
+    end
+  end
+
+  module_function :version
   
 end

data/lib/bee_console.rb

@@ -43,7 +43,29 @@ module Bee
 -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.
+-a             Print list of available targets.
+-o             Print list of available options.
 targets        Targets to run (default target if omitted).'
+    # Options descriptions.
+    OPTIONS = [
+        ['--version', '-V', GetoptLong::NO_ARGUMENT],
+        ['--help', '-h', GetoptLong::NO_ARGUMENT],
+        ['--help-build', '-b', GetoptLong::NO_ARGUMENT],
+        ['--help-task','-k', GetoptLong::REQUIRED_ARGUMENT],
+        ['--help-template','-e', GetoptLong::REQUIRED_ARGUMENT],
+        ['--dry-run', '-n', GetoptLong::NO_ARGUMENT],
+        ['--property', '-p', GetoptLong::REQUIRED_ARGUMENT],
+        ['--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],
+        ['--targets', '-a', GetoptLong::NO_ARGUMENT],
+        ['--options', '-o', GetoptLong::NO_ARGUMENT],
+    ]
     # Name for default build file.
     DEFAULT_BUILD_FILE = 'build.yml'
     # Exit value on error parsing command line
@@ -57,12 +79,12 @@ targets        Targets to run (default target if omitted).'
     # Bee options environment variable.
     BEE_OPT_ENV = 'BEEOPT'
     # Bee text logo (generated with http://www.network-science.de/ascii/)
-    BEE_LOGO = <<'EOF'
+    BEE_LOGO = <<"EOF"
         _                                                                 
        | |__   ___  ___                                                   
- ____  | '_ \ / _ \/ _ \  _____ _____ _____ _____ _____ _____ _____ _____ _____
+ ____  | '_ \\ / _ \\/ _ \\  _____ _____ _____ _____ _____ _____ _____ _____ _____
 |____| | |_) |  __/  __/ |_____|_____|_____|_____|_____|_____|_____|_____|_____|
-       |_.__/ \___|\___|  0.10.0                        http://bee.rubyforge.org
+       |_.__/ \\___|\\___|  #{Bee.version.ljust(8)}                     http://bee.rubyforge.org
 
 EOF
 
@@ -85,6 +107,8 @@ EOF
       file = DEFAULT_BUILD_FILE
       recursive = false
       logo = false
+      print_targets = false
+      print_options = false
       targets = []
       # read options in BEEOPT environment variable
       options = ENV[BEE_OPT_ENV]
@@ -93,21 +117,7 @@ EOF
       # 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],
-                            ['--help-task','-k', GetoptLong::REQUIRED_ARGUMENT],
-                            ['--help-template','-e', GetoptLong::REQUIRED_ARGUMENT],
-                            ['--dry-run', '-n', GetoptLong::NO_ARGUMENT],
-                            ['--property', '-p', GetoptLong::REQUIRED_ARGUMENT],
-                            ['--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])
+      opts = GetoptLong.new(*OPTIONS)
       opts.each do |opt, arg|
         case opt
         when '--version'
@@ -144,13 +154,17 @@ EOF
           recursive = true
         when '--logo'
           logo = true
+        when '--targets'
+          print_targets = true
+        when '--options'
+          print_options = true
         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, color, file,
-              recursive, logo, targets]
+              recursive, logo, print_targets, print_options, targets]
     end
 
     # Parse a command line property.
@@ -175,8 +189,11 @@ EOF
       begin
         version, help, help_build, help_task, help_template, task,
           properties, dry_run, template, verbose, style, color, file,
-          recursive, logo, targets = parse_command_line(arguments)
+          recursive, logo, print_targets, print_options,
+          targets = parse_command_line(arguments)
       rescue
+        # DEBUG
+        puts $!.backtrace
         puts "ERROR: parsing command line (type 'bee -h' for help)"
         exit(EXIT_PARSING_CMDLINE)
       end
@@ -191,8 +208,7 @@ EOF
           puts BEE_LOGO
         end
         if version
-          copyright = Bee::Util::copyright
-          puts copyright if copyright
+          puts Bee.version
         elsif help
           puts HELP
         elsif help_build
@@ -208,6 +224,16 @@ EOF
           listener = Listener.new(formatter, verbose)
           build = Build.load(file, false, properties)
           build.run(targets, listener, dry_run)
+        elsif print_targets
+          begin
+            build = Build.load(file)
+            targets = build.targets.hash.keys
+          rescue Exception
+            targets = []
+          end
+          print targets.join(' ')
+        elsif print_options
+          print OPTIONS.map {|o| o[0]}.join(' ')
         else
           listener = Listener.new(formatter, verbose)
           build = Build.load(file, recursive, properties)

data/lib/bee_version.rb

@@ -0,0 +1,5 @@
+module Bee
+
+    VERSION = '0.10.2'
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +02:00
+date: 2010-11-30 00:00:00 +01:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,12 +46,14 @@ description:
 email: michel.casabianca@gmail.com
 executables: 
 - bee
+- bash_completion_bee
 extensions: []
 
 extra_rdoc_files: 
 - README
 - LICENSE
 files: 
+- bin/bash_completion_bee
 - bin/bee
 - bin/bee.bat
 - lib/bee.rb
@@ -62,6 +64,7 @@ files:
 - lib/bee_task.rb
 - lib/bee_task_default.rb
 - lib/bee_util.rb
+- lib/bee_version.rb
 - egg/application/bin/start
 - egg/application/bin/start.bat
 - egg/application/build.yml