iron_worker 2.3.1 → 2.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/VERSION.yml +1 -1
  2. data/lib/iron_worker/config.rb +17 -16
  3. data/lib/iron_worker/service.rb +3 -3
  4. metadata +19 -19
data/VERSION.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
2
  :major: 2
3
3
  :minor: 3
4
- :patch: 1
4
+ :patch: 2
5
5
  :build:
data/lib/iron_worker/config.rb CHANGED
@@ -29,7 +29,7 @@ module IronWorker
29
29
  :merged_gems,
30
30
  :unmerged_gems,
31
31
  :force_upload,
32
- :beta
32
+ :beta # for setting beta feature flags
33
33
 
34
34
 
35
35
  def initialize
@@ -40,6 +40,7 @@ module IronWorker
40
40
  @merged_gems = {}
41
41
  @unmerged_gems = {}
42
42
  @mailers = {}
43
+ @beta = {}
43
44
 
44
45
  end
45
46
 
@@ -50,17 +51,17 @@ module IronWorker
50
51
  raise "IronWorker Config Error: access_key and secret_key are no longer used. The new IronWorker gem requires a couple of small configuration changes, please see: http://docs.IronWorker.com/ruby/new-gem-v2-update-guide for information."
51
52
  end
52
53
 
53
- @gems_to_skip = ['actionmailer', 'actionpack', 'activemodel', 'activeresource', 'activesupport',
54
- 'bundler',
55
- 'mail',
56
- 'mysql2',
57
- 'rails',
58
- 'tzinfo' # HUGE!
59
- ]
54
+ #@gems_to_skip = ['actionmailer', 'actionpack', 'activemodel', 'activeresource', 'activesupport',
55
+ # 'bundler',
56
+ # 'mail',
57
+ # 'mysql2',
58
+ # 'rails',
59
+ # 'tzinfo' # HUGE!
60
+ #]
60
61
 
61
- def self.gems_to_skip
62
- @gems_to_skip
63
- end
62
+ #def self.gems_to_skip
63
+ # @gems_to_skip
64
+ #end
64
65
 
65
66
  def bundle=(activate)
66
67
  if activate
@@ -115,14 +116,14 @@ module IronWorker
115
116
  gems = {}
116
117
  specs = Bundler.load.specs
117
118
  IronWorker.logger.debug 'Bundler specs=' + specs.inspect
118
- IronWorker.logger.debug "gems_to_skip=" + self.class.gems_to_skip.inspect
119
+ #IronWorker.logger.debug "gems_to_skip=" + self.class.gems_to_skip.inspect
119
120
  specs.each do |spec|
120
121
  IronWorker.logger.debug 'spec.name=' + spec.name.inspect
121
122
  IronWorker.logger.debug 'spec=' + spec.inspect
122
- if self.class.gems_to_skip.include?(spec.name)
123
- IronWorker.logger.debug "Skipping #{spec.name}"
124
- next
125
- end
123
+ #if self.class.gems_to_skip.include?(spec.name)
124
+ # IronWorker.logger.debug "Skipping #{spec.name}"
125
+ # next
126
+ #end
126
127
  # next if dep.name=='rails' #monkey patch
127
128
  gem_info = {:name=>spec.name, :version=>spec.version}
128
129
  gem_info[:auto_merged] = true
data/lib/iron_worker/service.rb CHANGED
@@ -146,7 +146,7 @@ module IronWorker
146
146
  merged_gems.delete(k)
147
147
  end
148
148
  IronWorker.logger.debug 'merged_gems_after=' + merged_gems.inspect
149
- gems_dependencies = IronWorker.config.beta ? gem_dependencies(merged_gems) : {}
149
+ gems_dependencies = gem_dependencies(merged_gems)
150
150
  IronWorker.logger.debug 'gem_dependencies=' + gems_dependencies.inspect
151
151
  merged_mailers ||= {}
152
152
  merged_mailers = merged_mailers.merge(IronWorker.config.mailers) if IronWorker.config.mailers
@@ -181,7 +181,7 @@ require 'json'
181
181
  ")
182
182
  #require gems dependencies
183
183
  gems_dependencies.each_pair do |k, gem|
184
- IronWorker.logger.debug "Bundling gem #{gem[:name]}..."
184
+ IronWorker.logger.debug "Bundling dependent gem #{gem[:name]}..."
185
185
  f.write "$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib'))\n"
186
186
  end
187
187
  # require merged gems
@@ -227,7 +227,7 @@ IronWorker.disable_queueing()
227
227
  Dir.chdir(dirname)
228
228
  # Load in job data
229
229
  job_data = JSON.load(File.open(task_data_file))
230
- puts 'job_data=' + job_data.inspect
230
+ #puts 'payload=' + job_data.inspect
231
231
  sw_config = job_data['sw_config']
232
232
  IronWorker.task_data = job_data
233
233
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: iron_worker
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-09 00:00:00.000000000 Z
12
+ date: 2012-01-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: zip
16
- requirement: &17798880 !ruby/object:Gem::Requirement
16
+ requirement: &15600060 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *17798880
24
+ version_requirements: *15600060
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rest-client
27
- requirement: &17798160 !ruby/object:Gem::Requirement
27
+ requirement: &15599540 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *17798160
35
+ version_requirements: *15599540
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rest
38
- requirement: &17797560 !ruby/object:Gem::Requirement
38
+ requirement: &15599000 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *17797560
46
+ version_requirements: *15599000
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &17797060 !ruby/object:Gem::Requirement
49
+ requirement: &15598120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *17797060
57
+ version_requirements: *15598120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: zip
60
- requirement: &17796420 !ruby/object:Gem::Requirement
60
+ requirement: &15597260 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *17796420
68
+ version_requirements: *15597260
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rest-client
71
- requirement: &17795820 !ruby/object:Gem::Requirement
71
+ requirement: &15595940 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *17795820
79
+ version_requirements: *15595940
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rest
82
- requirement: &17795320 !ruby/object:Gem::Requirement
82
+ requirement: &15611540 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *17795320
90
+ version_requirements: *15611540
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: bundler
93
- requirement: &17794460 !ruby/object:Gem::Requirement
93
+ requirement: &15609180 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *17794460
101
+ version_requirements: *15609180
102
102
  description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
103
103
  email: travis@iron.io
104
104
  executables: []
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
141
141
  version: '0'
142
142
  requirements: []
143
143
  rubyforge_project:
144
- rubygems_version: 1.8.15
144
+ rubygems_version: 1.8.11
145
145
  signing_key:
146
146
  specification_version: 3
147
147
  summary: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io