bee 0.11.4 → 0.12.0

data/README

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

data/egg/application/gem.spec.erb

@@ -1,5 +1,7 @@
 require 'rubygems'
 
+remove_const(:SPEC) if defined?(SPEC)
+
 SPEC = Gem::Specification.new do |spec|
   spec.name = '<%= name %>'
   spec.version = '<%= version %>'

data/egg/package/egg_build.erb

@@ -9,6 +9,7 @@
     gem_spec: "#{build}/gem_spec"
     gem_erb: |
       require 'rubygems'
+      remove_const(:SPEC) if defined?(SPEC)
       SPEC = Gem::Specification.new do |spec|
         spec.name = '<%= name %>'
         spec.version = '0.0.1'

data/egg/package/gem_spec.erb

@@ -1,5 +1,7 @@
 require 'rubygems'
 
+remove_const(:SPEC) if defined?(SPEC)
+
 SPEC = Gem::Specification.new do |spec|
   spec.name = '<%= name %>'
   spec.version = '<%= version %>'

data/lib/bee_build.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'rubygems'
+require 'syck'
 require 'yaml'
 require 'bee_util'
 require 'bee_context'

data/lib/bee_console.rb

@@ -18,6 +18,7 @@ require 'bee_util'
 require 'bee_listener'
 require 'bee_console_formatter'
 require 'getoptlong'
+require 'syck'
 require 'yaml'
 
 module Bee
@@ -234,7 +235,7 @@ EOF
           puts formatter.help_template(template)
         elsif template
           file = Bee::Util::find_template(template)
-          listener = Listener.new(formatter)
+          listener = Bee::Listener.new(formatter)
           build = Build.load(file, false, properties)
           build.run(targets, listener, dry_run)
         elsif resource

data/lib/bee_console_formatter.rb

@@ -14,6 +14,7 @@
 
 require 'rubygems'
 require 'bee_console_style'
+require 'syck'
 require 'yaml'
 
 module Bee

data/lib/bee_target.rb

@@ -147,7 +147,7 @@ module Bee
 
     # Run a given construct.
     # - construct: construct to run as a Hash.
-    # -dry: tells if we are running in dry mode. Defaults to false.
+    # - dry: tells if we are running in dry mode. Defaults to false.
     def run_construct(construct, dry=false)
       @listener.task(construct) if @listener
       return if dry

data/lib/bee_targets.rb

@@ -124,6 +124,9 @@ module Bee
     # Run targets.
     # - targets: list of target names to run.
     def run(targets, dry)
+      targets = [] if targets == ''
+      targets = targets || []
+      targets = Array(targets)
       if targets.length == 0
         if @default
           targets = @default

data/lib/bee_task_default.rb

@@ -16,6 +16,7 @@ require 'rubygems'
 require 'bee_build'
 require 'bee_task_package'
 require 'bee_util'
+require 'bee_version_dependant'
 require 'erb'
 require 'fileutils'
 require 'net/smtp'
@@ -922,7 +923,7 @@ EOF
         check_parameters(params, params_desc)
         library = params[:library]
         message = params[:message]
-        available = Bee::Util::gem_available?(library)
+        available = Bee::VersionDependant::gem_available?(library)
         error message if not available
       end
 
@@ -946,6 +947,11 @@ EOF
       #      root:     :test
       #      includes: "**/tc_*.rb"
       #      dir:      "test"
+      #
+      # Notes
+      #
+      # For ruby 1.9 and later, you must install gem 'test-unit' to run this
+      # task.
       def test(params)
         require 'test/unit'
         params_desc = {
@@ -968,15 +974,19 @@ EOF
           not (File.exists?(dir) and File.directory?(dir))
         files = filter_files(root, includes, excludes, dotmatch)
         files.map! { |file| File.expand_path(File.join(root, file)) }
+        size = (files.kind_of?(Array) ? files.size : 1)
+        puts "Running #{size} unit test(s)"
         for file in files
           load file
         end
-        size = (files.kind_of?(Array) ? files.size : 1)
-        puts "Running #{size} unit test(s)"
         old_dir = Dir.pwd
         begin
           Dir.chdir(dir)
-          runner = Test::Unit::AutoRunner.new(false)
+          if Bee::VersionDependant::ruby_lower_than('1.9.2')
+            runner = Test::Unit::AutoRunner.new(false)
+          else
+            runner = MiniTest::Unit.new()
+          end
           ok = runner.run
           error "Test failure" if not ok
         ensure
@@ -1031,7 +1041,7 @@ EOF
           (not File.exists?(src) or not File.file?(src) or
            not File.readable?(src))
         # load ERB source
-        erb_source = source||File.read(src)
+        erb_source = source||File.open(src, 'r') {|f| f.read}
         if options
           template = ERB.new(erb_source, 0, options)
         else

data/lib/bee_task_packagemanager.rb

@@ -76,6 +76,8 @@ module Bee
           methods = package.class.public_instance_methods(false)
           if name
             methods.map! {|method| "#{name}.#{method}"}
+          else
+            methods.map! {|method| method.to_s}
           end
           tasks += methods
         end

data/lib/bee_util.rb

@@ -15,6 +15,7 @@
 
 require 'rubygems'
 require 'net/http'
+require 'bee_version_dependant'
 
 module Bee
   
@@ -259,58 +260,15 @@ module Bee
       end
       return hash
     end
-    
-    # Tells if a given gem is available.
+
+    # Aliases
+
     def self.gem_available?(gem)
-      if lower_version(Gem::RubyGemsVersion, [1, 3, 0])
-        begin
-          Gem::activate(gem, false)
-          return true
-        rescue LoadError
-          return false
-        end
-      elsif lower_version(Gem::RubyGemsVersion, [1, 8, 0])
-        return Gem::available?(gem)
-      else
-        begin
-          Gem::Specification::find_by_name(gem)
-          return true
-        rescue LoadError
-          return false
-        end
-      end
+      return Bee::VersionDependant::gem_available?(gem)
     end
 
-    # Find gems with name matching a given pattern. Returns the list of gem
-    # specifications.
     def self.find_gems(*patterns)
-      gems = []
-      if Bee::Util::lower_version(Gem::RubyGemsVersion, [1, 8, 0])
-        index = Gem::SourceIndex.from_installed_gems()
-        for pattern in patterns
-          gems += index.find_name(pattern)
-        end
-      else
-        for pattern in patterns
-          Gem::Specification::each do |spec|
-            gems << spec if spec.name =~ pattern
-          end
-        end
-      end
-      return gems.uniq
-    end
-    
-    # Tells if a given version is lower tah another.
-    def self.lower_version(v1, v2)
-      v1 = to_version(v1) if v1.kind_of?(String)
-      v2 = to_version(v2) if v2.kind_of?(String)
-      return ((v1 <=> v2) < 0)
-    end
-    
-    # Convert a string to a version number (array of integers). Thus will turn
-    # '1.2.3' to [1, 2, 3].
-    def self.to_version(string)
-      return string.split('.').map{|s| s.to_i}
+      return Bee::VersionDependant::find_gems(*patterns)
     end
 
     # Class that holds information about a given method.
@@ -456,7 +414,7 @@ module Bee
       end
       
     end
-    
+
   end
   
 end

data/lib/bee_version.rb

@@ -1,5 +1,5 @@
 module Bee
 
-    VERSION = '0.11.4'
+    VERSION = '0.12.0'
 
 end

data/lib/bee_version_dependant.rb

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+# 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.
+
+module Bee
+
+  module VersionDependant
+
+    # Convert a string to a version number (array of integers). Thus will turn
+    # '1.2.3' to [1, 2, 3].
+    def self.to_version(string)
+      return string.split('.').map{|s| s.to_i}
+    end
+
+    # Compares two versions.
+    # Returns:
+    # - < 0 if first is lower than second.
+    # - > 0 if first is greater than second.
+    # - = 0 if first is equal to second.
+    def self.compare_versions(v1, v2)
+      v1 = to_version(v1) if v1.kind_of?(String)
+      v2 = to_version(v2) if v2.kind_of?(String)
+      return (v1 <=> v2)
+    end
+
+    # Get Ruby version as an Array.
+    def self.ruby_version()
+      return to_version(RUBY_VERSION)
+    end
+
+    # Get Gems version.
+    def self.gems_version()
+      return Gem::RubyGemsVersion
+    end
+
+    # Tells if ruby version is greater than a given string version.
+    def self.ruby_greater_than(version)
+      return compare_versions(ruby_version, to_version(version)) > 0
+    end
+
+    # Tells if ruby version is lower than a given string version.
+    def self.ruby_lower_than(version)
+      return compare_versions(ruby_version, to_version(version)) < 0
+    end
+
+    # Tells if ruby version equals a given string version.
+    def self.ruby_equals_to(version)
+      return compare_versions(ruby_version, to_version(version)) == 0
+    end
+
+    # Tells if a given gem is available.
+    def self.gem_available?(gem)
+      if compare_versions(gems_version, [1, 3, 0]) < 0
+        begin
+          Gem::activate(gem, false)
+          return true
+        rescue LoadError
+          return false
+        end
+      elsif compare_versions(gems_version, [1, 8, 0]) < 0
+        return Gem::available?(gem)
+      else
+        begin
+          Gem::Specification::find_by_name(gem)
+          return true
+        rescue LoadError
+          return false
+        end
+      end
+    end
+
+    # Find gems with name matching a given pattern. Returns the list of gem
+    # specifications.
+    def self.find_gems(*patterns)
+      gems = []
+      if compare_versions(gems_version, [1, 8, 0]) < 0
+        index = Gem::SourceIndex.from_installed_gems()
+        for pattern in patterns
+          gems += index.find_name(pattern)
+        end
+      else
+        for pattern in patterns
+          Gem::Specification::each do |spec|
+            gems << spec if spec.name =~ pattern
+          end
+        end
+      end
+      return gems.uniq
+    end
+
+  end
+
+end
+
+# patch test/unit to disable autorun for Ruby 1.9.2 or 1.9.1
+if Bee::VersionDependant::ruby_equals_to('1.9.2') or Bee::VersionDependant::ruby_equals_to('1.9.1')
+
+  require 'minitest/unit'
+
+  module MiniTest
+
+    class Unit
+      def self.autorun
+      end
+    end
+
+  end
+
+end
+
+# patch test/unit to disable autorun for Ruby 1.9.3
+if Bee::VersionDependant::ruby_equals_to('1.9.3')
+
+  require 'test/unit'
+
+  class Test::Unit::Runner
+    @@stop_auto_run = true
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 47
   prerelease: 
   segments: 
   - 0
-  - 11
-  - 4
-  version: 0.11.4
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-16 00:00:00 +02:00
+date: 2013-05-15 00:00:00 +02:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - lib/bee_task_packagemanager.rb
 - lib/bee_util.rb
 - lib/bee_version.rb
+- lib/bee_version_dependant.rb
 - egg/application/bin/start
 - egg/application/bin/start.bat
 - egg/application/build.yml