iron_worker_ng 1.0.4 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: af78605c4ced3c34d7e9c42ceefa60379292896c
4
- data.tar.gz: 977d560087ba2cedd1d1529a098f528a03ad5a61
3
+ metadata.gz: 5004d1973952a3ea89a74b7b7d1644bc0c0e9de9
4
+ data.tar.gz: 5ee838c8b832a80e1661f6222597060e382d7086
5
5
  SHA512:
6
- metadata.gz: 9e63f812209f2396fd9dd56aacf1fa6f44c4ba0e951f7ccb9b9b45a5420d42a32fab15baa4255efdd805c26d7b9fe67f2c73df25673a8e215108ee5af26a61ad
7
- data.tar.gz: 2dc81dc7131823b9d450b7d8f33cf50ae2b30ae94d47f997303202ef3dd54466890ada56a30a5f89ecbddad5ebc821e3d329b343e0d3a85d307b6d26864455bf
6
+ metadata.gz: c425477c337dadd69981d151492fb9401732a74c6d40f895b11803494821081e4ee96e4479cd39ea3a9be2b19179d7fb91938eee39f86b442de082d7b7823dba
7
+ data.tar.gz: d6b05125399e42c5c1575644a1032ea18b9f62a09c76c8f28b849e5326d21253569aa29e53955315305fa73a02b822aef8a2e1033367b29e9a8a5c94b0542890
@@ -97,7 +97,12 @@ module IronWorkerNG
97
97
 
98
98
  container_file = code.create_container
99
99
 
100
- if code.remote_build_command.nil? && (not code.full_remote_build)
100
+ if code.zip_package
101
+ res = nil
102
+ IronWorkerNG::Fetcher.fetch_to_file(code.zip_package) do |file|
103
+ res = @api.codes_create(code.name, file, 'sh', '__runner__.sh', options)
104
+ end
105
+ elsif code.remote_build_command.nil? && (not code.full_remote_build)
101
106
  res = @api.codes_create(code.name, container_file, 'sh', '__runner__.sh', options)
102
107
  else
103
108
  builder_code_name = code.name + (code.name[0 .. 0].upcase == code.name[0 .. 0] ? '::Builder' : '::builder')
@@ -119,7 +124,7 @@ module IronWorkerNG
119
124
  res = JSON.parse(builder_task.msg)
120
125
  end
121
126
 
122
- File.unlink(container_file)
127
+ File.unlink(container_file) if code.zip_package.nil?
123
128
 
124
129
  res['_id'] = res['id']
125
130
  OpenStruct.new(res)
@@ -20,6 +20,8 @@ module IronWorkerNG
20
20
  attr_accessor :dest_dir
21
21
  attr_accessor :env
22
22
 
23
+ attr_accessor :zip_package
24
+
23
25
  attr_accessor :use_local_iron_worker_ng
24
26
 
25
27
  undef exec
@@ -44,6 +46,8 @@ module IronWorkerNG
44
46
  @name = nil
45
47
  @exec = nil
46
48
 
49
+ @zip_package = nil
50
+
47
51
  @use_local_iron_worker_ng = false
48
52
 
49
53
  worker_files = []
@@ -68,11 +72,16 @@ module IronWorkerNG
68
72
  @name = @name.gsub(/\.worker$/, '')
69
73
  end
70
74
 
75
+ if @name.is_a?(String) && @name.end_with?('.zip')
76
+ @zip_package = @name
77
+ @name = @name.gsub(/\.zip/, '')
78
+ end
79
+
71
80
  if @name.nil? and (not @exec.nil?)
72
81
  @name = guess_name_for_path(@exec.path)
73
82
  end
74
83
 
75
- unless @name.nil?
84
+ if (not @name.nil?) && @zip_package.nil?
76
85
  worker_files << @name + '.worker'
77
86
  end
78
87
 
@@ -106,6 +106,10 @@ unless #{@exec.arg(:class, 0) == nil}
106
106
  end
107
107
  end
108
108
 
109
+ if exec_inst.respond_to?(:iron_task_id=)
110
+ exec_inst.send(:iron_task_id=, iron_task_id)
111
+ end
112
+
109
113
  exec_inst.run
110
114
  end
111
115
  RUBY_RUNNER
@@ -28,7 +28,7 @@ module IronWorkerNG
28
28
 
29
29
  module InstanceMethods
30
30
  def set_env(key, value)
31
- IronCore::Logger.info 'IronWorkerNG', "Setting ENV variable with name='#{key}' and value='#{@value}'"
31
+ IronCore::Logger.info 'IronWorkerNG', "Setting ENV variable with name='#{key}' and value='#{value}'"
32
32
 
33
33
  @features << IronWorkerNG::Feature::Common::SetEnv::Feature.new(self, key, value)
34
34
  end
@@ -17,6 +17,10 @@ module IronWorkerNG
17
17
  super(code)
18
18
 
19
19
  @spec = spec
20
+
21
+ if @spec.name == 'nokogiri' && @spec.version.to_s.start_with?('1.6.')
22
+ IronCore::Logger.warn 'IronWorkerNG', "WARNING: Building nokogiri version #{@spec.version} will take a lot of time. Switching to version '~> 1.5.9' should fix this"
23
+ end
20
24
  end
21
25
 
22
26
  def gem_path
@@ -1,5 +1,5 @@
1
1
  module IronWorkerNG
2
- VERSION = '1.0.4'
2
+ VERSION = '1.1.0'
3
3
 
4
4
  def self.version
5
5
  VERSION
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: iron_worker_ng
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-11-19 00:00:00.000000000 Z
12
+ date: 2014-01-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: iron_core
@@ -175,47 +175,47 @@ extra_rdoc_files: []
175
175
  files:
176
176
  - lib/3rdparty/hashie/indifferent_access.rb
177
177
  - lib/3rdparty/hashie/merge_initializer.rb
178
- - lib/iron_worker_ng/fetcher.rb
179
- - lib/iron_worker_ng/compat.rb
178
+ - lib/iron_worker_ng/api_client.rb
179
+ - lib/iron_worker_ng/cli.rb
180
180
  - lib/iron_worker_ng/client.rb
181
- - lib/iron_worker_ng/version.rb
182
- - lib/iron_worker_ng/code/python.rb
183
- - lib/iron_worker_ng/code/ruby.rb
184
- - lib/iron_worker_ng/code/mono.rb
185
- - lib/iron_worker_ng/code/node.rb
186
181
  - lib/iron_worker_ng/code/base.rb
182
+ - lib/iron_worker_ng/code/binary.rb
183
+ - lib/iron_worker_ng/code/builder.rb
184
+ - lib/iron_worker_ng/code/container/base.rb
185
+ - lib/iron_worker_ng/code/container/dir.rb
186
+ - lib/iron_worker_ng/code/container/zip.rb
187
+ - lib/iron_worker_ng/code/go.rb
187
188
  - lib/iron_worker_ng/code/java.rb
188
- - lib/iron_worker_ng/code/runtime/python.rb
189
- - lib/iron_worker_ng/code/runtime/ruby.rb
189
+ - lib/iron_worker_ng/code/mono.rb
190
+ - lib/iron_worker_ng/code/node.rb
191
+ - lib/iron_worker_ng/code/perl.rb
192
+ - lib/iron_worker_ng/code/php.rb
193
+ - lib/iron_worker_ng/code/python.rb
194
+ - lib/iron_worker_ng/code/ruby.rb
195
+ - lib/iron_worker_ng/code/runtime/binary.rb
196
+ - lib/iron_worker_ng/code/runtime/go.rb
197
+ - lib/iron_worker_ng/code/runtime/java.rb
190
198
  - lib/iron_worker_ng/code/runtime/mono.rb
191
199
  - lib/iron_worker_ng/code/runtime/node.rb
192
- - lib/iron_worker_ng/code/runtime/java.rb
193
200
  - lib/iron_worker_ng/code/runtime/perl.rb
194
- - lib/iron_worker_ng/code/runtime/binary.rb
195
201
  - lib/iron_worker_ng/code/runtime/php.rb
196
- - lib/iron_worker_ng/code/runtime/go.rb
197
- - lib/iron_worker_ng/code/perl.rb
198
- - lib/iron_worker_ng/code/builder.rb
199
- - lib/iron_worker_ng/code/binary.rb
200
- - lib/iron_worker_ng/code/container/zip.rb
201
- - lib/iron_worker_ng/code/container/dir.rb
202
- - lib/iron_worker_ng/code/container/base.rb
203
- - lib/iron_worker_ng/code/php.rb
204
- - lib/iron_worker_ng/code/go.rb
202
+ - lib/iron_worker_ng/code/runtime/python.rb
203
+ - lib/iron_worker_ng/code/runtime/ruby.rb
204
+ - lib/iron_worker_ng/compat.rb
205
205
  - lib/iron_worker_ng/feature/base.rb
206
+ - lib/iron_worker_ng/feature/common/merge_deb.rb
207
+ - lib/iron_worker_ng/feature/common/merge_dir.rb
208
+ - lib/iron_worker_ng/feature/common/merge_exec.rb
209
+ - lib/iron_worker_ng/feature/common/merge_file.rb
210
+ - lib/iron_worker_ng/feature/common/set_env.rb
211
+ - lib/iron_worker_ng/feature/java/merge_jar.rb
206
212
  - lib/iron_worker_ng/feature/python/merge_pip.rb
207
213
  - lib/iron_worker_ng/feature/python/merge_pip_dependency.rb
208
- - lib/iron_worker_ng/feature/java/merge_jar.rb
209
- - lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
210
214
  - lib/iron_worker_ng/feature/ruby/merge_gem.rb
215
+ - lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
211
216
  - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
212
- - lib/iron_worker_ng/feature/common/set_env.rb
213
- - lib/iron_worker_ng/feature/common/merge_file.rb
214
- - lib/iron_worker_ng/feature/common/merge_deb.rb
215
- - lib/iron_worker_ng/feature/common/merge_dir.rb
216
- - lib/iron_worker_ng/feature/common/merge_exec.rb
217
- - lib/iron_worker_ng/cli.rb
218
- - lib/iron_worker_ng/api_client.rb
217
+ - lib/iron_worker_ng/fetcher.rb
218
+ - lib/iron_worker_ng/version.rb
219
219
  - lib/iron_worker_ng.rb
220
220
  - README.md
221
221
  - LICENSE
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
239
239
  version: 1.3.6
240
240
  requirements: []
241
241
  rubyforge_project:
242
- rubygems_version: 2.1.11
242
+ rubygems_version: 2.0.3
243
243
  signing_key:
244
244
  specification_version: 4
245
245
  summary: New generation ruby client for IronWorker