iron_worker_ng 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/bin/iron_worker

@@ -223,7 +223,7 @@ elsif command == 'tasks.log'
   if live
     begin
       log = client.tasks.log(task_id)
-    rescue IronWorkerNG::APIClientError
+    rescue IronCore::IronError
     end
   else
     log = client.tasks.log(task_id)
@@ -238,7 +238,7 @@ elsif command == 'tasks.log'
           next_log = client.tasks.log(task_id)
           print next_log[log.length .. - 1]
           log = next_log
-        rescue IronWorkerNG::APIClientError
+        rescue IronCore::IronError
         end
       end
     end
@@ -246,7 +246,7 @@ elsif command == 'tasks.log'
     begin
       next_log = client.tasks.log(task_id)
       print next_log[log.length .. - 1]
-    rescue IronWorkerNG::APIClientError
+    rescue IronCore::IronError
     end
   end
 end

data/lib/iron_worker_ng/code/base.rb

@@ -42,7 +42,7 @@ module IronWorkerNG
 
       def initialize(*args, &block)
         @features = []
-        @base_dir = './'
+        @base_dir = ''
 
         initialize_code(*args, &block)
       end

data/lib/iron_worker_ng/code/initializer.rb

@@ -32,7 +32,7 @@ module IronWorkerNG
             if File.exists?(wfile)
               eval(File.read(wfile))
 
-              @base_dir = File.dirname(wfile) + '/'
+              @base_dir = File.dirname(wfile) == '.' ? '' : File.dirname(wfile) + '/'
 
               break
             end

data/lib/iron_worker_ng/feature/base.rb

@@ -5,11 +5,17 @@ module IronWorkerNG
         @code = code
       end
 
-      def zip_add(zip, dest, src, rebase = true)
-        if rebase && (not src.start_with?('/'))
-          src = @code.base_dir + src
+      def rebase(path)
+        if not path.start_with?('/')
+          path = @code.base_dir + path
         end
 
+        path
+      end
+
+      def zip_add(zip, dest, src)
+        src = File.expand_path(src)
+
         unless File.exists?(src)
           IronCore::Logger.error 'IronWorkerNG', "Can't find src with path='#{src}'"
           raise IronCore::IronError.new("Can't find src with path='#{src}'")

data/lib/iron_worker_ng/feature/binary/merge_exec.rb

@@ -12,13 +12,13 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + File.mtime(@path).to_i.to_s)
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
           end
 
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling binary exec with path='#{@path}'"
 
-            zip_add(zip, File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), rebase(@path))
           end
         end
 

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

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

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

@@ -17,13 +17,13 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + @dest + File.mtime(@path).to_i.to_s)
+            Digest::MD5.hexdigest(@path + @dest + File.mtime(rebase(@path)).to_i.to_s)
           end
 
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling file with path='#{@path}' and dest='#{@dest}'"
 
-            zip_add(zip, @dest + File.basename(@path), @path)
+            zip_add(zip, @dest + File.basename(@path), rebase(@path))
           end
         end
 

data/lib/iron_worker_ng/feature/java/merge_exec.rb

@@ -14,13 +14,13 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + @klass + File.mtime(@path).to_i.to_s)
+            Digest::MD5.hexdigest(@path + @klass + File.mtime(rebase(@path)).to_i.to_s)
           end
 
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling java exec with path='#{@path}' and class='#{@klass}'"
 
-            zip_add(zip, File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), rebase(@path))
           end
 
           def code_for_classpath

data/lib/iron_worker_ng/feature/java/merge_jar.rb

@@ -12,13 +12,13 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + File.mtime(@path).to_i.to_s)
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
           end
 
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling java jar with path='#{@path}'"
 
-            zip_add(zip, File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), rebase(@path))
           end
 
           def code_for_classpath

data/lib/iron_worker_ng/feature/node/merge_exec.rb

@@ -12,13 +12,13 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + File.mtime(@path).to_i.to_s)
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
           end
 
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling node exec with path='#{@path}'"
 
-            zip_add(zip, File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), rebase(@path))
           end
         end
 

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

@@ -14,13 +14,13 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + @klass + File.mtime(@path).to_i.to_s)
+            Digest::MD5.hexdigest(@path + @klass + File.mtime(rebase(@path)).to_i.to_s)
           end
 
           def bundle(zip)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby exec with path='#{path}' and class='#{klass}'"
 
-            zip_add(zip, File.basename(@path), @path)
+            zip_add(zip, File.basename(@path), rebase(@path))
           end
         end
 

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

@@ -44,11 +44,11 @@ module IronWorkerNG
             if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?
               IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby gem with name='#{@spec.name}' and version='#{@spec.version}'"
 
-              zip_add(zip, '__gems__/gems/' + @spec.full_name, gem_path, false)
-              zip_add(zip, "__gems__/specifications/#{@spec.full_name}.gemspec", File.expand_path(gem_path + '/../../specifications/' + @spec.full_name + '.gemspec'), false)
+              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, false)
+                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"

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

@@ -16,7 +16,7 @@ module IronWorkerNG
           end
 
           def hash_string
-            Digest::MD5.hexdigest(@path + File.mtime(@path).to_i.to_s + (File.exists?(@path + '.lock') ? File.mtime(@path + '.lock').to_i.to_s : '') + @groups.join)
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s + (File.exists?(rebase(@path) + '.lock') ? File.mtime(rebase(@path) + '.lock').to_i.to_s : '') + @groups.join)
           end
         end
 

data/ng_tests_worker.rb

@@ -1,2 +1,5 @@
 Dir.chdir 'iwng'
-exec 'rake -f test/Rakefile test'
+cmd = 'rake -f test/Rakefile test ' + params[:args]
+puts cmd
+STDOUT.flush
+exec cmd

data/remote_test.rb

@@ -13,6 +13,7 @@ end
 $LOAD_PATH.unshift 'lib'
 
 require 'iron_worker_ng'
+require_relative 'test/iron_io_config.rb'
 
 client = IronWorkerNG::Client.new
 
@@ -33,7 +34,7 @@ puts client.codes.create(code)
 
 puts code.create_zip
 
-task = client.tasks.create 'NgTestsWorker'
+task = client.tasks.create 'NgTestsWorker', args: $*.join(' ')
 
 client.tasks.wait_for task.id
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-09 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: 667437213
+      hash: -3266643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: