iron_worker_ng 0.6.8 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.7.0

data/lib/iron_worker_ng/client.rb

@@ -58,7 +58,19 @@ module IronWorkerNG
 
     def codes_create(code, options = {})
       zip_file = code.create_zip
-      res = @api.codes_create(code.name, zip_file, 'sh', '__runner__.sh', options)
+
+      if code.remote_build_command.nil?
+        res = @api.codes_create(code.name, zip_file, 'sh', '__runner__.sh', options)
+      else
+        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)
+
+        res = {} # TODO: fetch real res from build worker
+      end
+
       File.unlink(zip_file)
 
       OpenStruct.new(res)

data/lib/iron_worker_ng/code/base.rb

@@ -10,6 +10,7 @@ module IronWorkerNG
     class Base
       attr_reader :features
       attr_accessor :base_dir
+      attr_accessor :dest_dir
 
       @@registered_types = []
     
@@ -28,6 +29,8 @@ module IronWorkerNG
       end
     
       def self.register_feature(feature)
+        return if feature[:for_klass].to_s == 'IronWorkerNG::Code::Builder'
+
         @@registered_features << feature
       end
 
@@ -43,12 +46,13 @@ module IronWorkerNG
       def initialize(*args, &block)
         @features = []
         @base_dir = ''
+        @dest_dir = ''
 
         initialize_code(*args, &block)
       end
 
-      def name(code_name = nil)
-        @name = code_name if code_name
+      def name(name = nil)
+        @name = name if name
 
         if @name.nil? and @exec
           @name = IronWorkerNG::Code::Base.guess_name_for_path(@exec.path)
@@ -62,6 +66,16 @@ module IronWorkerNG
         @name = name
       end
 
+      def remote_build_command(remote_build_command = nil)
+        @remote_build_command = remote_build_command if remote_build_command
+
+        @remote_build_command
+      end
+
+      def remote_build_command=(remote_build_command)
+        @remote_build_command = remote_build_command
+      end
+
       def runtime(*args)
       end
 
@@ -70,7 +84,7 @@ module IronWorkerNG
 
       def fixate
         IronWorkerNG::Code::Base.registered_features.each do |rf|
-          if rf[:for_klass] == self.class && respond_to?(rf[:name] + '_fixate')
+          if (rf[:for_klass] == self.class || self.class == IronWorkerNG::Code::Builder) && respond_to?(rf[:name] + '_fixate')
             send(rf[:name] + '_fixate')
           end
         end
@@ -86,24 +100,9 @@ module IronWorkerNG
         @features.each do |feature|
           feature.bundle(zip)
         end
-      end
 
-      def create_zip
-        unless @exec
-          IronCore::Logger.error 'IronWorkerNG', 'No exec specified'
-          raise IronCore::IronError.new('No exec specified')
-        end
-
-        fixate
-
-        zip_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "code.zip")
-
-        IronCore::Logger.debug 'IronWorkerNG', "Creating code zip '#{zip_name}'"
-
-        Zip::ZipFile.open(zip_name, Zip::ZipFile::CREATE) do |zip|
-          bundle(zip)
-
-          zip.get_output_stream('__runner__.sh') do |runner|
+        unless self.class == IronWorkerNG::Code::Base
+          zip.get_output_stream(@dest_dir + '__runner__.sh') do |runner|
             runner.write <<RUNNER
 #!/bin/sh
 # iron_worker_ng-#{IronWorkerNG.full_version}
@@ -125,6 +124,42 @@ cd "$(root "$@")"
 RUNNER
           end
         end
+      end
+
+      def create_zip
+        unless self.class == IronWorkerNG::Code::Base
+          unless @exec
+            IronCore::Logger.error 'IronWorkerNG', 'No exec specified'
+            raise IronCore::IronError.new('No exec specified')
+          end
+        end
+
+        fixate
+
+        zip_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "code.zip")
+
+        IronCore::Logger.debug 'IronWorkerNG', "Creating code zip '#{zip_name}'"
+
+        if @remote_build_command
+          @dest_dir = '__build__/'
+        end
+
+        Zip::ZipFile.open(zip_name, Zip::ZipFile::CREATE) do |zip|
+          bundle(zip)
+
+          if @remote_build_command
+            IronCore::Logger.info 'IronWorkerNG', 'Creating builder'
+
+            builder = IronWorkerNG::Code::Builder.new
+            builder.remote_build_command = @remote_build_command
+
+            builder.gem('iron_worker_ng')
+            builder.fixate
+
+            builder.bundle(zip)
+          end
+
+        end
 
         zip_name
       end

data/lib/iron_worker_ng/code/builder.rb

@@ -0,0 +1,41 @@
+require_relative '../feature/ruby/merge_gem'
+
+module IronWorkerNG
+  module Code
+    class Builder < IronWorkerNG::Code::Ruby
+      def bundle(zip)
+        @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(self, '__builder__.rb', nil)
+
+        super(zip)
+
+        zip.get_output_stream(@dest_dir + '__builder__.sh') do |builder|
+          builder.write <<BUILDER_SH
+# iron_worker_ng-#{IronWorkerNG.full_version}
+#{remote_build_command}
+BUILDER_SH
+        end
+
+        zip.get_output_stream(@dest_dir + '__builder__.rb') do |builder|
+          builder.write <<BUILDER_RUBY
+# iron_worker_ng-#{IronWorkerNG.full_version}
+
+require 'iron_worker_ng'
+require 'json'
+
+puts `cd __build__ && sh ../__builder__.sh && cd ..`
+
+Dir.chdir('__build__')
+
+code = IronWorkerNG::Code::Base.new
+code.name params[:code_name]
+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]))
+BUILDER_RUBY
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/creator.rb

@@ -4,6 +4,7 @@ require_relative 'ruby'
 require_relative 'java'
 require_relative 'node'
 require_relative 'binary'
+require_relative 'builder'
 
 module IronWorkerNG
   module Code
@@ -20,8 +21,8 @@ module IronWorkerNG
         initialize_code(*args, &block)
       end
 
-      def name(code_name = nil)
-        @name = code_name if code_name
+      def name(name = nil)
+        @name = name if name
 
         @name
       end
@@ -30,6 +31,12 @@ module IronWorkerNG
         @name = name
       end
 
+      def remote_build_command(remote_build_command = nil)
+      end
+
+      def remote_build_command=(remote_build_command)
+      end
+
       def runtime(*args)
         @runtime = args[0] if args.length == 1
 

data/lib/iron_worker_ng/code/ruby.rb

@@ -12,7 +12,7 @@ module IronWorkerNG
       def bundle(zip)
         super(zip)
 
-        zip.get_output_stream('__runner__.rb') do |runner|
+        zip.get_output_stream(@dest_dir + '__runner__.rb') do |runner|
           runner.write <<RUBY_RUNNER
 # iron_worker_ng-#{IronWorkerNG.full_version}
 

data/lib/iron_worker_ng/feature/base.rb

@@ -19,10 +19,10 @@ module IronWorkerNG
 
         if File.directory?(src)
           Dir.glob(src + '/**/**') do |path|
-            zip.add(dest + path[src.length .. -1], path)
+            zip.add(@code.dest_dir + dest + path[src.length .. -1], path)
           end
         else
-          zip.add(dest, src)
+          zip.add(@code.dest_dir + dest, src)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -112,6 +112,7 @@ files:
 - lib/iron_worker_ng/client.rb
 - lib/iron_worker_ng/code/base.rb
 - lib/iron_worker_ng/code/binary.rb
+- lib/iron_worker_ng/code/builder.rb
 - lib/iron_worker_ng/code/creator.rb
 - lib/iron_worker_ng/code/initializer.rb
 - lib/iron_worker_ng/code/java.rb
@@ -144,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 808244481
+      hash: -348555501
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: