iron_worker_ng 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/bin/iron_worker

@@ -81,7 +81,11 @@ if command == 'codes.create'
   code = nil
 
   if runtime.nil?
-    code = IronWorkerNG::Code::Creator.create(:name => name)
+    code = IronWorkerNG::Code::Creator.create(:name => name) do
+      execute_features.each do |f|
+        send(f[:name], *f[:args])
+      end
+    end
   else
     code = runtimes.find { |r| r[:name] == runtime }[:klass].new(:name => name)
   end

data/lib/iron_worker_ng/client.rb

@@ -65,10 +65,15 @@ module IronWorkerNG
         builder_code_name = code.name + 'Builder'
 
         @api.codes_create(builder_code_name, zip_file, 'sh', '__runner__.sh', options)
+
         builder_task_id = tasks.create(builder_code_name, :iron_token => token, :iron_project_id => project_id, :code_name => code.name, :codes_create_options => options.to_json).id
-        tasks.wait_for(builder_task_id)
+        task = tasks.wait_for(builder_task_id)
+
+        if task.status != 'complete'
+          raise IronCore::IronError.new("Error while remote building: \"#{tasks.log(task.id)}\"")
+        end
 
-        res = {} # TODO: fetch real res from build worker
+        res = JSON.parse(task.msg)
       end
 
       File.unlink(zip_file)

data/lib/iron_worker_ng/code/base.rb

@@ -34,10 +34,6 @@ module IronWorkerNG
         @@registered_features << feature
       end
 
-      def self.guess_name_for_path(path)
-        File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
-      end
-
       include IronWorkerNG::Code::Initializer::InstanceMethods
 
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
@@ -54,11 +50,6 @@ module IronWorkerNG
       def name(name = nil)
         @name = name if 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
 
@@ -132,6 +123,10 @@ RUNNER
             IronCore::Logger.error 'IronWorkerNG', 'No exec specified'
             raise IronCore::IronError.new('No exec specified')
           end
+
+          if @name.nil?
+            @name = guess_name_for_path(@exec.path)
+          end
         end
 
         fixate

data/lib/iron_worker_ng/code/builder.rb

@@ -3,6 +3,12 @@ require_relative '../feature/ruby/merge_gem'
 module IronWorkerNG
   module Code
     class Builder < IronWorkerNG::Code::Ruby
+      def initialize(*args, &block)
+        @features = []
+        @base_dir = ''
+        @dest_dir = ''
+      end
+
       def bundle(zip)
         @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(self, '__builder__.rb', nil)
 
@@ -22,7 +28,7 @@ BUILDER_SH
 require 'iron_worker_ng'
 require 'json'
 
-puts `cd __build__ && sh ../__builder__.sh && cd ..`
+exit 1 unless system('cd __build__ && sh ../__builder__.sh && cd ..')
 
 Dir.chdir('__build__')
 
@@ -32,7 +38,9 @@ code.dir '.'
 
 client = IronWorkerNG::Client.new(:token => params[:iron_token], :project_id => params[:iron_project_id])
 
-client.codes.create(code, JSON.parse(params[:codes_create_options]))
+res = client.codes.create(code, JSON.parse(params[:codes_create_options]))
+
+client.tasks.set_progress(iron_task_id, :msg => res.marshal_dump.to_json)
 BUILDER_RUBY
         end
       end

data/lib/iron_worker_ng/code/creator.rb

@@ -48,7 +48,7 @@ module IronWorkerNG
       end
 
       def merge_exec(path, *args)
-        @exec = path
+        @exec = OpenStruct.new(:path => path)
       end
 
       alias :exec :merge_exec

data/lib/iron_worker_ng/code/initializer.rb

@@ -6,24 +6,40 @@ module IronWorkerNG
           @name = nil
           @exec = nil
 
+          wfiles = []
+
           if args.length == 1 && args[0].class == String
-            merge_exec(args[0])
+            name = args[0]
+
+            if name.end_with?('.worker') || name.end_with?('.workerfile')
+              @name = name.gsub(/\.worker$/, '').gsub(/\.workerfile$/, '')
+            else
+              merge_exec(name)
+            end
           elsif args.length == 1 && args[0].class == Hash
             @name = args[0][:name] || args[0]['name']
 
+            unless @name.nil?
+              if @name.end_with?('.worker') || @name.end_with?('.workerfile')
+                @name = @name.gsub(/\.worker$/, '').gsub(/\.workerfile$/, '')
+              end
+            end
+
             exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
             merge_exec(exec) unless exec.nil?
           end
 
-          wfiles = []
-
           if args.length == 1 && args[0].class == Hash && (args[0][:workerfile] || args[0]['workerfile'])
             wfiles << args[0][:workerfile] || args[0]['workerfile']
           end
 
-          unless name.nil?
-            wfiles << name + '.worker'
-            wfiles << name + '.workerfile'
+          if @name.nil? and @exec
+            @name = guess_name_for_path(@exec.path)
+          end
+
+          unless @name.nil?
+            wfiles << @name + '.worker'
+            wfiles << @name + '.workerfile'
           end
 
           wfiles << 'Workerfile'
@@ -41,6 +57,16 @@ module IronWorkerNG
           unless block.nil?
             instance_eval(&block)
           end
+
+          if @name.nil? and @exec
+            @name = guess_name_for_path(@exec.path)
+          end
+
+          @name = File.basename(@name) unless @name.nil?
+        end
+
+        def guess_name_for_path(path)
+          File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
         end
       end
     end

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

@@ -42,7 +42,7 @@ module IronWorkerNG
               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)
-              zip_add(zip, "__gems__/specifications/#{@spec.full_name}.gemspec", File.expand_path(gem_path + '/../../specifications/' + @spec.full_name + '.gemspec'))
+              zip_add(zip, "__gems__/specifications/#{@spec.full_name}.gemspec", gem_path + '/../../specifications/' + @spec.full_name + '.gemspec')
             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.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -348555501
+      hash: -928794419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: