iron_worker_ng 0.15.0 → 0.15.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a1d09476d4f49d5635b9997d6c22fb4cddf6bb30
+  data.tar.gz: 4997d6fb2b6d27bd4e886f4e10fec0b66d1e081c
+SHA512:
+  metadata.gz: f9a6fed61cd17f7317531c4acde1916cc251e415d87ef6cc117cc403f8f69c12533541ade06ce5559f2207c148d02987a6209c758afa1900f9c0d4d55f969f79
+  data.tar.gz: 9ab4eb907b77134481c0578a00c68c5dc36ef1822056531ec7af84de2872c1722bee271d90ee5622535d8341faf50b3483e3c1d0c4d4f71790425efc3f1652ee

data/bin/iron_worker

@@ -73,6 +73,10 @@ if command == 'upload'
       options[:retries_delay] = v
     end
 
+    opts.on('-h', '--host HOST', String, 'host name, eg: www.mydomain.com') do |v|
+      options[:host] = v
+    end
+
     opts.on('-a', '--async', 'don\'t wait for package build') do |v|
       params[:async] = true
     end

data/lib/iron_worker_ng/cli.rb

@@ -65,6 +65,7 @@ module IronWorkerNG
       log "Max concurrency set to '#{options[:max_concurrency]}'" unless options[:max_concurrency].nil?
       log "Retries set to '#{options[:retries]}'" unless options[:retries].nil?
       log "Retries delay set to '#{options[:retries_delay]}'" unless options[:retries_delay].nil?
+      log "Host set to '#{options[:host]}'" unless options[:host].nil?
 
       if code.remote_build_command || code.full_remote_build
         log_group "Uploading and building code package '#{code.name}'"

data/lib/iron_worker_ng/client.rb

@@ -1,5 +1,4 @@
 require 'ostruct'
-require 'json'
 require 'base64'
 
 require 'iron_worker_ng/api_client'
@@ -89,6 +88,11 @@ module IronWorkerNG
     def codes_create(code, options = {})
       IronCore::Logger.debug 'IronWorkerNG', "Calling codes.create with code='#{code.to_s}' and options='#{options.to_s}'"
 
+      if options[:config] && options[:config].is_a?(Hash)
+        options = options.dup
+        options[:config] = options[:config].to_json
+      end
+
       container_file = code.create_container
 
       if code.remote_build_command.nil? && (not code.full_remote_build)
@@ -122,6 +126,11 @@ module IronWorkerNG
     def codes_create_async(code, options = {})
       IronCore::Logger.debug 'IronWorkerNG', "Calling codes.create_async with code='#{code.to_s}' and options='#{options.to_s}'"
 
+      if options[:config] && options[:config].is_a?(Hash)
+        options = options.dup
+        options[:config] = options[:config].to_json
+      end
+
       container_file = code.create_container
 
       if code.remote_build_command.nil? && (not code.full_remote_build)

data/lib/iron_worker_ng/code/builder.rb

@@ -37,7 +37,7 @@ BUILDER_SH
         install_iron_worker_ng = ''
 
         if not @use_local_iron_worker_ng
-          install_iron_worker_ng = "system(\"gem install iron_worker_ng -v #{IronWorkerNG::VERSION}\")"
+          install_iron_worker_ng = "system('gem install iron_worker_ng -v #{IronWorkerNG::VERSION}')"
         end
 
         container.get_output_stream(@dest_dir + '__builder__.rb') do |builder|
@@ -58,6 +58,20 @@ IronWorkerNG::Feature::Ruby::MergeGem.merge_binary = true
 
 code = IronWorkerNG::Code::Base.new(params[:code_name])
 
+if not File.exists?('bundler.magic')
+  deps = code.features.reject { |f| f.class != IronWorkerNG::Feature::Ruby::MergeGemDependency::Feature }
+
+  deps.each do |dep|
+    if dep.name == 'bundler' and dep.version != '>= 0'
+      system('touch bundler.magic')
+      system('gem uninstall bundler')
+      system("gem install bundler -v '\#{dep.version}'")
+      success = system("ruby __runner__.rb \#{ARGV.join(' ')}")
+      exit(success ? 0 : 1)
+    end
+  end
+end
+
 if File.exists?('__builder__.sh')
   pre_build_list = Dir.glob('__build__/**/**')
 

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

@@ -30,11 +30,13 @@ end
 
 root = nil
 payload_file = nil
+config_file = nil
 task_id = nil
 
 0.upto($*.length - 2) do |i|
   root = $*[i + 1] if $*[i] == '-d'
   payload_file = $*[i + 1] if $*[i] == '-payload'
+  config_file = $*[i + 1] if $*[i] == '-config'
   task_id = $*[i + 1] if $*[i] == '-id'
 end
 
@@ -55,12 +57,26 @@ begin
 rescue
 end
 
+@config = nil
+if config_file
+  @config = File.read(config_file)
+  begin
+    @config = JSON.parse(@config)
+    @config = IronWorkerNGHash.new(@config)
+  rescue
+  end
+end
+
 @params = IronWorkerNGHash.new(params)
 
 def payload
   @payload
 end
 
+def config
+  @config
+end
+
 def params
   @params
 end
@@ -109,7 +125,7 @@ RUN_CODE
             gemfile = File.open(gemfile_dir + '/Gemfile', 'w')
           end
 
-          gemfile.puts('source :rubygems')
+          gemfile.puts('source \'http://rubygems.org\'')
 
           deps = @features.reject { |f| f.class != IronWorkerNG::Feature::Ruby::MergeGemDependency::Feature }
 

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 
   def self.version
     VERSION

data/lib/iron_worker_ng.rb

@@ -1,3 +1,9 @@
+begin
+  require 'json'
+rescue LoadError
+  raise "Please install json gem"
+end
+
 require 'iron_worker_ng/version'
 require 'iron_worker_ng/compat'
 require 'iron_worker_ng/fetcher'

metadata

@@ -1,183 +1,164 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: iron_worker_ng
-version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: 
-  segments: 
-  - 0
-  - 15
-  - 0
-  version: 0.15.0
+version: !ruby/object:Gem::Version
+  version: 0.15.1
 platform: ruby
-authors: 
+authors:
 - Andrew Kirilenko
 - Iron.io, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: iron_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: minitest-reporters
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: twitter
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: iron_cache
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: iron_cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 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
@@ -226,40 +207,26 @@ files:
 - bin/iron_worker
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 31
-      segments: 
-      - 1
-      - 8
-      version: "1.8"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '1.8'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: New generation ruby client for IronWorker
 test_files: []
-
 has_rdoc: