bee 0.11.0 → 0.11.1

data/README

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

data/egg/package/egg.yml

@@ -40,8 +40,8 @@
       src:  "#{base}/hello/build.erb"
       dest: "#{here}/#{project_name}/build.yml"
   - cp:
-      includes: "#{base}/hello/script.rb"
-      dest:     "#{here}/#{project_name}/lib/#{project_name}.rb"
+      src:  "#{base}/hello/script.rb"
+      dest: "#{here}/#{project_name}/lib/#{project_name}.rb"
   - erb:
       src:  "#{base}/hello/launcher.erb"
       dest: "#{here}/#{project_name}/bin/#{project_name}"

data/egg/sinatra/build.yml

@@ -1,6 +1,6 @@
-- build: <%= name %>
+- build:       <%= name %>
   description: Project <%= name %>
-  default: all
+  default:     all
 
 - properties:
     name:         "<%= name %>"
@@ -12,20 +12,20 @@
     clean_dirs:   [:build]
     clean_files:  ["**/*~", "**/.#*", "**/.DS_Store"]
 
-- target: run
+- target:      run
   description: Run server
   script:
   - "./server.rb"
 
-- target: call
+- target:      call
   description: Call server
   script:
-  - get:
+  - http_get:
       url:  "#{url}/World"
       prop: response
   - print: :response
 
-- target: zip
+- target:      zip
   description: Generate a ZIP archive
   script:
   - mkdir: :build
@@ -34,12 +34,12 @@
       prefix:   :zip_prefix
       dest:     :zip_file
 
-- 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_console.rb

@@ -46,8 +46,8 @@ Usage: bee [options] [targets]
 -l             Print bee logo on console.
 -a             Print list of available targets.
 -o             Print list of available options.
--f             Print list of available tasks.
--g             Print list of available templates.
+-x             Print list of available tasks.
+-y             Print list of available templates.
 targets        Targets to run (default target if omitted).
 EOF
     # Options descriptions.
@@ -239,9 +239,9 @@ EOF
           rescue Exception
             targets = []
           end
-          print targets.join(' ')
+          print targets.sort.join(' ')
         elsif print_options
-          print OPTIONS.map {|o| o[0]}.join(' ')
+          print OPTIONS.map {|o| o[0]}.sort.join(' ')
         elsif print_tasks
           print Bee::Task::PackageManager.list_tasks.join(' ')
         elsif print_templates

data/lib/bee_task_default.rb

@@ -169,6 +169,8 @@ module Bee
       # - 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.
+      # - username: username for HTTP basic authentication. Optional.
+      # - password: password for HTTP basic authentication. Optional.
       #
       # Example
       #
@@ -176,15 +178,20 @@ module Bee
       #       url: http://rubyforge.org/frs/download.php/22185/bee-0.4.0.zip
       def http_get(parameters)
         params_desc = {
-          :url   => { :mandatory => true,  :type => :string },
-          :dest  => { :mandatory => false, :type => :string },
-          :prop  => { :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 },
+          :username => { :mandatory => false, :type => :string },
+          :password => { :mandatory => false, :type => :string },
         }
         check_parameters(parameters, params_desc)
-        url = parameters[:url]
-        dest = parameters[:dest]
-        prop = parameters[:prop]
+        url      = parameters[:url]
+        dest     = parameters[:dest]
+        prop     = parameters[:prop]
+        username = parameters[:username]
+        password = parameters[:password]
         if not dest and not prop
           destination = File.basename(url)
         elsif dest and File.directory?(dest)
@@ -197,7 +204,7 @@ module Bee
         limit = parameters[:limit]
         puts "Getting URL '#{url}'..."
         begin
-          content = Util::fetch(url, limit)
+          content = Util::fetch(url, limit, username, password)
         rescue Exception
           error "Error getting URL: #{$!}"
         end
@@ -548,6 +555,8 @@ EOF
       #   '**/*' to include all files recursively.
       # - excludes: list of globs for files to exclude from copy. Optional,
       #   default to nil to exclude no file.
+      # - dest: destination directory for the copy, must be an existing
+      #   directory.
       # - dotmatch: tells if joker matches dot files. Optional, defaults to
       #   false.
       # - flatten: tells if included files should be copied in destination
@@ -924,16 +933,7 @@ EOF
         check_parameters(params, params_desc)
         library = params[:library]
         message = params[:message]
-        if Gem::RubyGemsVersion < '1.3.0'
-          begin
-            Gem::activate(library, false)
-            available = true
-          rescue LoadError
-            available = false
-          end
-        else
-          available = Gem::available?(library)
-        end
+        available = Bee::Util::gem_available?(library)
         error message if not available
       end
 
@@ -1475,6 +1475,7 @@ EOF
         dest     = parameters[:dest]
         files = filter_files(includes, excludes, root, dotmatch)
         # build the archive
+        puts "Building TARGZ archive '#{dest}'"
         begin
           current_dir = Dir.pwd
           abs_dest = File.expand_path(dest)

data/lib/bee_task_packagemanager.rb

@@ -69,7 +69,7 @@ module Bee
 
       # List all available tasks.
       def self.list_tasks
-        names = [nil] + self.find_gems(/^bee_/).map {|gem| gem.name[4..-1]}
+        names = [nil] + Bee::Util::find_gems(/^bee_/).map {|gem| gem.name[4..-1]}
         tasks = []
         for name in names
           package = self.load_package(name)
@@ -84,18 +84,17 @@ module Bee
 
       # List all available templates.
       def self.list_templates
-        gems = self.find_gems(/^bee$/, /^bee_/)
+        gems = Bee::Util::find_gems(/^bee$/, /^bee_/)
         templates = []
         for gem in gems
-          package = gem.name == 'bee' ? nil : gem.name[4..-1]
-          for file in gem.files
-            if file =~ /egg\/(\w+?).yml/
-              if package
-                templates << "#{package}.#{$1}"
-              else
-                templates << $1
-              end
-            end
+          gem_path = gem.full_gem_path
+          eggs = Dir.glob("#{gem_path}/egg/*.yml").
+            map{|p| p[gem_path.length+5..-5]}
+          if gem.name != 'bee'
+            package = gem.name[4..-1]
+            templates += eggs.map{|e| "#{package}.#{e}"}
+          else
+            templates += eggs
           end
         end
         return templates.sort
@@ -119,15 +118,6 @@ module Bee
         end
       end
 
-      def self.find_gems(*patterns)
-        gems = []
-        index = Gem::SourceIndex.from_installed_gems()
-        for pattern in patterns
-          gems += index.find_name(pattern)
-        end
-        return gems
-      end
-
     end
 
   end

data/lib/bee_util.rb

@@ -138,7 +138,8 @@ module Bee
     # Get a given URL.
     # - url: URL to get.
     # - limit: redirectrion limit (defaults to HTTP_REDIRECTIONS_LIMIT).
-    def self.fetch(url, limit=HTTP_REDIRECTIONS_LIMIT)
+    def self.fetch(url, limit=HTTP_REDIRECTIONS_LIMIT,
+                   username=nil, password=nil)
       raise 'HTTP redirect too deep' if limit == 0
       response = Net::HTTP.get_response(URI.parse(url))
       case response
@@ -146,6 +147,14 @@ module Bee
         response.body
       when Net::HTTPRedirection
         fetch(response['location'], limit-1)
+      when Net::HTTPUnauthorized
+        uri = URI.parse(url)
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          request = Net::HTTP::Get.new("#{uri.path}?#{uri.query}")
+          request.basic_auth(username, password)
+          response = http.request(request)
+          return response.body
+        end
       else
         response.error!
       end
@@ -166,11 +175,27 @@ module Bee
       end
       # get gem descriptor
       if version
-        gem_descriptor = Gem.source_index.find_name(gem, version)[0]
+        if Gem::Specification.respond_to?(:find_by_name)
+          begin
+            gem_descriptor = Gem::Specification.find_by_name(gem, version)
+          rescue Exception
+            gem_descriptor = nil
+          end
+        else
+          gem_descriptor = Gem.source_index.find_name(gem, version)[0]
+        end
         raise "Gem '#{gem}' was not found in version '#{version}'" if
           not gem_descriptor
       else
-        gem_descriptor = Gem.source_index.find_name(gem)[0]
+        if Gem::Specification.respond_to?(:find_by_name)
+          begin
+            gem_descriptor = Gem::Specification::find_by_name(gem)
+          rescue Exception
+            gem_descriptor = nil
+          end
+        else
+          gem_descriptor = Gem.source_index.find_name(gem)[0]
+        end
         raise "Gem '#{gem}' was not found" if not gem_descriptor
       end
       # get resource path
@@ -195,7 +220,7 @@ module Bee
       resource = ":#{prefix}#{package}.egg/#{egg}.yml"
       begin
         file = absolute_path(resource, Dir.pwd)
-      rescue
+      rescue Exception
         raise BuildError.new("Template '#{template}' not found")
       end
       raise BuildError.new("Template '#{template}' not found") if
@@ -236,6 +261,59 @@ module Bee
       end
       return hash
     end
+    
+    # Tells if a given gem is available.
+    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
+    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}
+    end
 
     # Class that holds information about a given method.
     class MethodInfo

data/lib/bee_version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bee
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Michel Casabianca & Contributors
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: bee
 dependencies: 
 - !ruby/object:Gem::Dependency