iron_worker_ng 0.11.0 → 0.11.1

data/lib/iron_worker_ng/code/base.rb

@@ -239,7 +239,7 @@ RUNNER
 
           if @remote_build_command || @full_remote_build
             IronCore::Logger.info 'IronWorkerNG', 'Creating builder'
-              
+
             builder = IronWorkerNG::Code::Builder.new
             builder.builder_remote_build_command = @remote_build_command
 
@@ -249,10 +249,10 @@ RUNNER
             builder.bundle(container, local)
 
             container.get_output_stream(@name + '.worker') do |wf|
-              wf.write(workerfile)
+              wf.write(build_workerfile)
             end
           end
-          
+
           if @remote_build_command || @full_remote_build
             @dest_dir = ''
           end
@@ -265,7 +265,7 @@ RUNNER
 
       def run(params = {})
         container_name = create_container(true)
-        
+
         payload = File.open("#{container_name}/__payload__", 'wb')
         payload.write(params.is_a?(String) ? params : params.to_json)
         payload.close
@@ -282,15 +282,15 @@ RUNNER
       def install(standalone = false)
       end
 
-      def workerfile
+      def build_workerfile
         commands = []
 
         commands << "runtime '#{runtime}'"
         commands << "name '#{name}'"
 
-        commands += @features.map { |f| f.command }
+        commands += @features.map { |f| f.build_command }
 
-        commands.compact.join("\n")
+        commands.compact.uniq.join("\n")
       end
 
       def to_s

data/lib/iron_worker_ng/code/builder.rb

@@ -58,6 +58,8 @@ end
 
 code.install(true)
 
+require 'bundler/setup'
+
 client = IronWorkerNG::Client.new(JSON.parse(params[:client_options]))
 
 res = client.codes.create(code, JSON.parse(params[:codes_create_options]))

data/lib/iron_worker_ng/code/runtime/ruby.rb

@@ -118,9 +118,11 @@ RUN_CODE
 
           gemfile.close
 
-          puts `cd #{gemfile_dir} && bundle install#{standalone ? ' --standalone' : ''}`
+          if standalone
+            puts `bundle install --standalone`
+          else
+            puts `cd #{gemfile_dir} && bundle install`
 
-          unless gemfile_dir.nil?
             FileUtils.rm_r(gemfile_dir)
           end
         end

data/lib/iron_worker_ng/feature/base.rb

@@ -36,7 +36,7 @@ module IronWorkerNG
       def bundle(container)
       end
 
-      def command
+      def build_command
         nil
       end
     end

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

@@ -31,7 +31,7 @@ module IronWorkerNG
             end
           end
 
-          def command
+          def build_command
             if @code.remote_build_command || @code.full_remote_build
               if @code.full_remote_build && IronWorkerNG::Fetcher.remote?(rebase(@path))
                 "dir '#{rebase(@path)}', '#{@dest}'"
@@ -39,7 +39,7 @@ module IronWorkerNG
                 "dir '#{@code.dest_dir}#{@dest}#{File.basename(@path)}', '#{@dest}'"
               end
             else
-              "dir '#{@path}', '#{@dest}'"
+              nil
             end
           end
         end

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

@@ -35,7 +35,7 @@ module IronWorkerNG
             end
           end
 
-          def command
+          def build_command
             if @code.remote_build_command || @code.full_remote_build
               if @code.full_remote_build && IronWorkerNG::Fetcher.remote?(rebase(@path))
                 "exec '#{rebase(@path)}', #{@args.inspect}"
@@ -43,7 +43,7 @@ module IronWorkerNG
                 "exec '#{@code.dest_dir}#{File.basename(@path)}', #{@args.inspect}"
               end
             else
-              "exec '#{@path}', #{@args.inspect}"
+              nil
             end
           end
         end

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

@@ -25,7 +25,7 @@ module IronWorkerNG
             end
           end
 
-          def command
+          def build_command
             if @code.remote_build_command || @code.full_remote_build
               if @code.full_remote_build && IronWorkerNG::Fetcher.remote?(rebase(@path))
                 "file '#{rebase(@path)}', '#{@dest}'"
@@ -33,7 +33,7 @@ module IronWorkerNG
                 "file '#{@code.dest_dir}#{@dest}#{File.basename(@path)}', '#{@dest}'"
               end
             else
-              "file '#{@path}', '#{@dest}'"
+              nil
             end
           end
         end

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

@@ -23,7 +23,7 @@ module IronWorkerNG
             end
           end
 
-          def command
+          def build_command
             if @code.remote_build_command || @code.full_remote_build
               if @code.full_remote_build && IronWorkerNG::Fetcher.remote?(rebase(@path))
                 "jar '#{rebase(@path)}'"
@@ -31,7 +31,7 @@ module IronWorkerNG
                 "jar '#{@code.dest_dir}#{File.basename(@path)}'"
               end
             else
-              "jar '#{@path}'"
+              nil
             end
           end
 

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

@@ -19,9 +19,11 @@ module IronWorkerNG
             Digest::MD5.hexdigest(@name + @version)
           end
 
-          def command
+          def build_command
             if @code.full_remote_build
               "gem '#{@name}', '#{@version}'"
+            elsif @code.remote_build_command
+              "dir '__build__/__gems__'"
             else
               nil
             end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 
   def self.version
     VERSION

metadata

@@ -1,137 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: iron_worker_ng
-version: !ruby/object:Gem::Version
-  version: 0.11.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.11.1
 platform: ruby
-authors:
+authors: 
 - Andrew Kirilenko
 - Iron.io, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: iron_core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: zip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: zip
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: minitest-reporters
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: New generation ruby client for IronWorker
-email:
+email: 
 - info@iron.io
-executables:
+executables: 
 - iron_worker
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/3rdparty/hashie/indifferent_access.rb
 - lib/3rdparty/hashie/merge_initializer.rb
 - lib/iron_worker_ng/fetcher.rb
@@ -176,27 +144,31 @@ files:
 - bin/iron_worker
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '1.9'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "1.9"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: New generation ruby client for IronWorker
 test_files: []
+
 has_rdoc: