iron_worker_ng 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/bin/iron_worker

@@ -23,8 +23,12 @@ command = 'tasks.create' if command == 'queue'
 command = 'schedules.create' if command == 'schedule'
 command = 'tasks.log' if command == 'log'
 
-if level = ENV['LOG_LEVEL']
-  IronCore::Logger.logger.level = eval "::Logger::#{level}"
+IronCore::Logger.logger.datetime_format = ''
+
+if $*.include?('--debug')
+  IronCore::Logger.logger.level = ::Logger::DEBUG
+
+  $*.reject! { |p| p == '--debug' }
 end
 
 client = IronWorkerNG::Client.new

data/lib/iron_worker_ng/feature/base.rb

@@ -21,7 +21,13 @@ module IronWorkerNG
           raise IronCore::IronError.new("Can't find src with path='#{src}'")
         end
 
-        zip.add(dest, src)
+        if File.directory?(src)
+          Dir.glob(src + '/**/**') do |path|
+            zip.add(dest + path[src.length .. -1], path)
+          end
+        else
+          zip.add(dest, src)
+        end
       end
 
       def hash_string

data/lib/iron_worker_ng/feature/common/merge_dir.rb

@@ -29,9 +29,7 @@ module IronWorkerNG
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling dir with path='#{@path}' and dest='#{@dest}'"
 
-            Dir.glob(rebase(@path) + '/**/**') do |path|
-              zip_add(zip, @dest + File.basename(@path) + path[rebase(@path).length .. -1], path)
-            end
+            zip_add(zip, @dest + File.basename(@path), rebase(@path))
           end
         end
 

data/lib/iron_worker_ng/feature/ruby/merge_gem.rb

@@ -46,10 +46,6 @@ module IronWorkerNG
 
               zip_add(zip, '__gems__/gems/' + @spec.full_name, gem_path)
               zip_add(zip, "__gems__/specifications/#{@spec.full_name}.gemspec", File.expand_path(gem_path + '/../../specifications/' + @spec.full_name + '.gemspec'))
-
-              Dir.glob(gem_path + '/**/**') do |path|
-                zip_add(zip, '__gems__/gems/' + @spec.full_name + path[gem_path.length .. -1], path)
-              end
             else
               IronCore::Logger.warn 'IronWorkerNG', "Skipping ruby gem with name='#{@spec.name}' and version='#{@spec.version}' as it contains native extensions"
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3266643
+      hash: 983849999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: