chef-expander 0.10.4 → 0.10.6.beta.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -67,6 +67,9 @@ module Chef
67
67
  start_workers
68
68
  maintain_workers
69
69
  release_locks
70
+ rescue Configuration::InvalidConfiguration => e
71
+ log.fatal {"Configuration Error: " + e.message}
72
+ exit(2)
70
73
  rescue Exception => e
71
74
  raise if SystemExit === e
72
75
 
@@ -41,6 +41,7 @@ module Chef
41
41
  config.merge_config(Configuration::Base.from_chef_compat_config(config_file_to_use))
42
42
  # But for all other config options, the CLI config should win over config file
43
43
  config.merge_config(Configuration::CLI.config)
44
+ config.validate!
44
45
  remaining_opts_after_parse
45
46
  end
46
47
 
@@ -128,18 +129,21 @@ module Chef
128
129
  end
129
130
 
130
131
  configurable :index do
131
- invalid("You must specify this node's position in the ring as an integer") unless index.kind_of?(Integer)
132
- invalid("The index cannot be larger than the cluster size (node-count)") unless (index <= node_count.to_i)
132
+ unless index.nil? # in single-cluster mode, this setting is not required.
133
+ invalid("You must specify this node's position in the ring as an integer") unless index.kind_of?(Integer)
134
+ invalid("The index cannot be larger than the cluster size (node-count)") unless (index.to_i <= node_count.to_i)
135
+ end
133
136
  end
134
137
 
135
- configurable :node_count do
136
- invalid("You must specify the cluster size as an integer") unless node_count.kind_of?(Integer)
137
- invalid("The cluster size (node-count) cannot be smaller than the index") unless node_count >= index.to_i
138
+ configurable :node_count, 1 do
139
+ invalid("You must specify the node_count as an integer") unless node_count.kind_of?(Integer)
140
+ invalid("The node_count must be 1 or greater") unless node_count >= 1
141
+ invalid("The node_count cannot be smaller than the index") unless node_count >= index.to_i
138
142
  end
139
143
 
140
144
  configurable :ps_tag, ""
141
145
 
142
- configurable :solr_url, "http://localhost:8983"
146
+ configurable :solr_url, "http://localhost:8983/solr"
143
147
 
144
148
  configurable :amqp_host, '0.0.0.0'
145
149
 
@@ -251,7 +251,7 @@ module Chef
251
251
  end
252
252
 
253
253
  def solr_url
254
- 'http://127.0.0.1:8983/solr/update'
254
+ "#{Expander.config.solr_url}/update"
255
255
  end
256
256
 
257
257
  def indexed_object
@@ -23,11 +23,15 @@ require 'open3'
23
23
  module Chef
24
24
  module Expander
25
25
 
26
- VERSION = "0.10.4"
26
+ VERSION = "0.10.6.beta.1"
27
27
 
28
28
  def self.version
29
29
  @rev ||= begin
30
- rev = Open3.popen3("git rev-parse HEAD") {|stdin, stdout, stderr| stdout.read }.strip
30
+ begin
31
+ rev = Open3.popen3("git rev-parse HEAD") {|stdin, stdout, stderr| stdout.read }.strip
32
+ rescue Errno::ENOENT
33
+ rev = ""
34
+ end
31
35
  rev.empty? ? nil : " (#{rev})"
32
36
  end
33
37
  "#{VERSION}#@rev"
@@ -65,7 +65,7 @@ module Chef
65
65
  @awaiting_parent_death = EM.add_periodic_timer(1) do
66
66
  unless Process.ppid == @original_ppid
67
67
  @awaiting_parent_death.cancel
68
- stop("master process death")
68
+ stop_immediately("master process death")
69
69
  end
70
70
  end
71
71
  end
metadata CHANGED
@@ -1,13 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-expander
3
3
  version: !ruby/object:Gem::Version
4
- hash: 63
5
- prerelease:
6
- segments:
7
- - 0
8
- - 10
9
- - 4
10
- version: 0.10.4
4
+ prerelease: 7
5
+ version: 0.10.6.beta.1
11
6
  platform: ruby
12
7
  authors:
13
8
  - Adam Jacob
@@ -15,7 +10,8 @@ autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
12
 
18
- date: 2011-08-11 00:00:00 Z
13
+ date: 2011-10-31 00:00:00 -07:00
14
+ default_executable:
19
15
  dependencies:
20
16
  - !ruby/object:Gem::Dependency
21
17
  name: mixlib-log
@@ -25,11 +21,6 @@ dependencies:
25
21
  requirements:
26
22
  - - ">="
27
23
  - !ruby/object:Gem::Version
28
- hash: 31
29
- segments:
30
- - 1
31
- - 2
32
- - 0
33
24
  version: 1.2.0
34
25
  type: :runtime
35
26
  version_requirements: *id001
@@ -41,11 +32,6 @@ dependencies:
41
32
  requirements:
42
33
  - - ~>
43
34
  - !ruby/object:Gem::Version
44
- hash: 9
45
- segments:
46
- - 0
47
- - 6
48
- - 7
49
35
  version: 0.6.7
50
36
  type: :runtime
51
37
  version_requirements: *id002
@@ -57,11 +43,6 @@ dependencies:
57
43
  requirements:
58
44
  - - ~>
59
45
  - !ruby/object:Gem::Version
60
- hash: 59
61
- segments:
62
- - 0
63
- - 12
64
- - 10
65
46
  version: 0.12.10
66
47
  type: :runtime
67
48
  version_requirements: *id003
@@ -73,11 +54,6 @@ dependencies:
73
54
  requirements:
74
55
  - - ~>
75
56
  - !ruby/object:Gem::Version
76
- hash: 1
77
- segments:
78
- - 0
79
- - 2
80
- - 11
81
57
  version: 0.2.11
82
58
  type: :runtime
83
59
  version_requirements: *id004
@@ -89,11 +65,6 @@ dependencies:
89
65
  requirements:
90
66
  - - ~>
91
67
  - !ruby/object:Gem::Version
92
- hash: 13
93
- segments:
94
- - 0
95
- - 7
96
- - 7
97
68
  version: 0.7.7
98
69
  type: :runtime
99
70
  version_requirements: *id005
@@ -105,11 +76,6 @@ dependencies:
105
76
  requirements:
106
77
  - - ~>
107
78
  - !ruby/object:Gem::Version
108
- hash: 9
109
- segments:
110
- - 2
111
- - 1
112
- - 1
113
79
  version: 2.1.1
114
80
  type: :runtime
115
81
  version_requirements: *id006
@@ -121,11 +87,6 @@ dependencies:
121
87
  requirements:
122
88
  - - ~>
123
89
  - !ruby/object:Gem::Version
124
- hash: 7
125
- segments:
126
- - 0
127
- - 6
128
- - 0
129
90
  version: 0.6.0
130
91
  type: :runtime
131
92
  version_requirements: *id007
@@ -137,11 +98,6 @@ dependencies:
137
98
  requirements:
138
99
  - - ~>
139
100
  - !ruby/object:Gem::Version
140
- hash: 5
141
- segments:
142
- - 0
143
- - 7
144
- - 3
145
101
  version: 0.7.3
146
102
  type: :runtime
147
103
  version_requirements: *id008
@@ -153,14 +109,53 @@ dependencies:
153
109
  requirements:
154
110
  - - ~>
155
111
  - !ruby/object:Gem::Version
156
- hash: 13
157
- segments:
158
- - 1
159
- - 6
160
- - 1
161
112
  version: 1.6.1
162
113
  type: :runtime
163
114
  version_requirements: *id009
115
+ - !ruby/object:Gem::Dependency
116
+ name: rake
117
+ prerelease: false
118
+ requirement: &id010 !ruby/object:Gem::Requirement
119
+ none: false
120
+ requirements:
121
+ - - ">="
122
+ - !ruby/object:Gem::Version
123
+ version: "0"
124
+ type: :development
125
+ version_requirements: *id010
126
+ - !ruby/object:Gem::Dependency
127
+ name: rspec-core
128
+ prerelease: false
129
+ requirement: &id011 !ruby/object:Gem::Requirement
130
+ none: false
131
+ requirements:
132
+ - - ">="
133
+ - !ruby/object:Gem::Version
134
+ version: "0"
135
+ type: :development
136
+ version_requirements: *id011
137
+ - !ruby/object:Gem::Dependency
138
+ name: rspec-expectations
139
+ prerelease: false
140
+ requirement: &id012 !ruby/object:Gem::Requirement
141
+ none: false
142
+ requirements:
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: "0"
146
+ type: :development
147
+ version_requirements: *id012
148
+ - !ruby/object:Gem::Dependency
149
+ name: rspec-mocks
150
+ prerelease: false
151
+ requirement: &id013 !ruby/object:Gem::Requirement
152
+ none: false
153
+ requirements:
154
+ - - ">="
155
+ - !ruby/object:Gem::Version
156
+ version: "0"
157
+ type: :development
158
+ version_requirements: *id013
164
159
  description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
165
160
  email: adam@opscode.com
166
161
  executables:
@@ -175,28 +170,29 @@ extra_rdoc_files:
175
170
  files:
176
171
  - LICENSE
177
172
  - README.rdoc
173
+ - scripts/check_queue_size
178
174
  - scripts/check_queue_size_munin
179
175
  - scripts/make_solr_xml
180
- - scripts/check_queue_size
181
176
  - scripts/traffic-creator
182
177
  - conf/chef-expander.rb.example
183
- - lib/chef/expander.rb
184
- - lib/chef/expander/node.rb
185
- - lib/chef/expander/loggable.rb
186
- - lib/chef/expander/vnode_table.rb
187
- - lib/chef/expander/version.rb
188
- - lib/chef/expander/vnode_supervisor.rb
189
- - lib/chef/expander/vnode.rb
190
- - lib/chef/expander/logger.rb
191
- - lib/chef/expander/daemonizable.rb
192
178
  - lib/chef/expander/cluster_supervisor.rb
193
- - lib/chef/expander/flattener.rb
179
+ - lib/chef/expander/configuration.rb
194
180
  - lib/chef/expander/control.rb
181
+ - lib/chef/expander/daemonizable.rb
182
+ - lib/chef/expander/flattener.rb
183
+ - lib/chef/expander/loggable.rb
184
+ - lib/chef/expander/logger.rb
185
+ - lib/chef/expander/node.rb
195
186
  - lib/chef/expander/solrizer.rb
196
- - lib/chef/expander/configuration.rb
187
+ - lib/chef/expander/version.rb
188
+ - lib/chef/expander/vnode.rb
189
+ - lib/chef/expander/vnode_supervisor.rb
190
+ - lib/chef/expander/vnode_table.rb
191
+ - lib/chef/expander.rb
197
192
  - bin/chef-expander
198
193
  - bin/chef-expander-vnode
199
194
  - bin/chef-expanderctl
195
+ has_rdoc: true
200
196
  homepage: http://wiki.opscode.com/display/chef
201
197
  licenses: []
202
198
 
@@ -210,23 +206,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
210
206
  requirements:
211
207
  - - ">="
212
208
  - !ruby/object:Gem::Version
213
- hash: 3
214
- segments:
215
- - 0
216
209
  version: "0"
217
210
  required_rubygems_version: !ruby/object:Gem::Requirement
218
211
  none: false
219
212
  requirements:
220
- - - ">="
213
+ - - ">"
221
214
  - !ruby/object:Gem::Version
222
- hash: 3
223
- segments:
224
- - 0
225
- version: "0"
215
+ version: 1.3.1
226
216
  requirements: []
227
217
 
228
218
  rubyforge_project:
229
- rubygems_version: 1.7.2
219
+ rubygems_version: 1.6.2
230
220
  signing_key:
231
221
  specification_version: 3
232
222
  summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.