iron_worker_ng 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/iron_worker_ng/api_client.rb

@@ -29,8 +29,8 @@ module IronWorkerNG
       parse_response(get("projects/#{@project_id}/codes/#{id}"))
     end
 
-    def codes_create(name, file, runtime, runner)
-      parse_response(post_file("projects/#{@project_id}/codes", File.new(file, 'rb'), {:name => name, :runtime => runtime, :file_name => runner}))
+    def codes_create(name, file, runtime, runner, options)
+      parse_response(post_file("projects/#{@project_id}/codes", File.new(file, 'rb'), {:name => name, :runtime => runtime, :file_name => runner}.merge(options)))
     end
 
     def codes_delete(id)

data/lib/iron_worker_ng/client.rb

@@ -55,9 +55,9 @@ module IronWorkerNG
       OpenStruct.new(@api.codes_get(code_id))
     end
 
-    def codes_create(code)
+    def codes_create(code, options = {})
       zip_file = code.create_zip
-      res = @api.codes_create(code.name, zip_file, 'sh', '__runner__.sh')
+      res = @api.codes_create(code.name, zip_file, 'sh', '__runner__.sh', options)
       File.unlink(zip_file)
 
       OpenStruct.new(res)

data/lib/iron_worker_ng/code/base.rb

@@ -45,8 +45,13 @@ module IronWorkerNG
         initialize_code(*args, &block)
       end
 
-      def name(*args)
-        @name = args[0] if args.length == 1
+      def name(code_name = nil)
+        @name = code_name if code_name
+
+        if @name.nil? and @exec
+          @name = IronWorkerNG::Code::Base.guess_name_for_path(@exec.path)
+          IronCore::Logger.info 'IronWorkerNG', "defaulting name to #{@name}"
+        end
 
         @name
       end
@@ -61,12 +66,6 @@ module IronWorkerNG
       def runtime=(runtime)
       end
 
-      def guess_name
-        if @name.nil? && (not @exec.nil?)
-          @name = IronWorkerNG::Code::Base.guess_name_for_path(@exec.path)
-        end
-      end
-
       def fixate
         IronWorkerNG::Code::Base.registered_features.each do |rf|
           if rf[:for_klass] == self.class && respond_to?(rf[:name] + '_fixate')
@@ -95,8 +94,6 @@ module IronWorkerNG
 
         fixate
 
-        @name ||= guess_name(@exec.path)
-
         zip_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "code.zip")
 
         IronCore::Logger.debug 'IronWorkerNG', "Creating code zip '#{zip_name}'"

data/lib/iron_worker_ng/code/creator.rb

@@ -20,8 +20,8 @@ module IronWorkerNG
         initialize_code(*args, &block)
       end
 
-      def name(*args)
-        @name = args[0] if args.length == 1
+      def name(code_name = nil)
+        @name = code_name if code_name
 
         @name
       end
@@ -42,10 +42,6 @@ module IronWorkerNG
 
       def merge_exec(path, *args)
         @exec = path
-
-        if @name.nil? && (not @exec.nil?)
-          @name = IronWorkerNG::Code::Base.guess_name_for_path(@exec)
-        end
       end
 
       alias :exec :merge_exec

data/lib/iron_worker_ng/code/initializer.rb

@@ -16,18 +16,20 @@ module IronWorkerNG
           end
 
           if args.length == 1 and (opts = args[0]).is_a? Hash and wfile = opts[:workerfile] || opts['workerfile']
+            IronCore::Logger.info 'IronWorkerNG', "Processing workerfile #{wfile}"
             eval(File.read(File.expand_path wfile))
           end
 
           wfiles = ['Workerfile']
 
-          unless @name.nil?
-            wfiles << @name + '.worker'
-            wfiles << @name + '.workerfile'
+          unless name.nil?
+            wfiles << name + '.worker'
+            wfiles << name + '.workerfile'
           end
 
           wfiles.each do |wfile|
             if File.exists?(wfile)
+              IronCore::Logger.info 'IronWorkerNG', "Processing workerfile #{wfile}"
               eval(File.read(wfile))
             end
           end

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

@@ -39,8 +39,6 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging binary exec with path='#{path}'"
 
             @features << @exec
-
-            guess_name
           end
 
           alias :exec :merge_exec

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

@@ -45,8 +45,6 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging java exec with path='#{path}' and class='#{klass}'"
 
             @features << @exec
-
-            guess_name
           end
 
           alias :exec :merge_exec

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

@@ -39,8 +39,6 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging node exec with path='#{path}'"
 
             @features << @exec
-
-            guess_name
           end
 
           alias :exec :merge_exec

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

@@ -41,8 +41,6 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging ruby exec with path='#{path}' and class='#{klass}'"
 
             @features << @exec
-
-            guess_name
           end
 
           alias :exec :merge_exec

data/ng_tests_worker.rb

@@ -0,0 +1,3 @@
+Dir.chdir Dir.glob('iwng/*').first
+ENV['NG_GEM_PATH'] = $:.join ':'
+exec 'rake -f test/Rakefile test TESTP=basic'

data/remote_test.rb

@@ -0,0 +1,36 @@
+require 'bundler'
+require 'tmpdir'
+
+tmpdir = Dir.mktmpdir
+File.open(tmpdir + '/Gemfile', 'w') do |f|
+  f << File.read('Gemfile')
+  f << File.read('test/Gemfile')
+end
+Dir.chdir tmpdir do
+  Bundler.setup
+end
+
+$LOAD_PATH.unshift 'lib'
+
+require 'iron_worker_ng'
+
+client = IronWorkerNG::Client.new
+
+code = IronWorkerNG::Code::Ruby.new do
+  exec 'ng_tests_worker.rb'
+  gemfile 'Gemfile'
+  gemfile 'test/Gemfile'
+  dir '.', 'iwng'
+end
+
+puts client.codes.create(code)
+
+puts code.create_zip
+
+task = client.tasks.create 'NgTestsWorker'
+
+client.tasks.wait_for task.id
+
+puts '-' * 80
+
+puts client.tasks.log(task.id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -128,6 +128,8 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
 - lib/iron_worker_ng/version.rb
+- ng_tests_worker.rb
+- remote_test.rb
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
 post_install_message: 
@@ -142,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 833770483
+      hash: 257115443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: