chef 10.16.0.rc.0 → 10.16.0.rc.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (58) hide show
  1. data/distro/common/html/chef-client.8.html +3 -3
  2. data/distro/common/html/chef-expander.8.html +3 -3
  3. data/distro/common/html/chef-expanderctl.8.html +3 -3
  4. data/distro/common/html/chef-server-webui.8.html +3 -3
  5. data/distro/common/html/chef-server.8.html +3 -3
  6. data/distro/common/html/chef-solo.8.html +3 -3
  7. data/distro/common/html/chef-solr.8.html +3 -3
  8. data/distro/common/html/knife-bootstrap.1.html +4 -4
  9. data/distro/common/html/knife-client.1.html +3 -3
  10. data/distro/common/html/knife-configure.1.html +4 -4
  11. data/distro/common/html/knife-cookbook-site.1.html +3 -3
  12. data/distro/common/html/knife-cookbook.1.html +3 -3
  13. data/distro/common/html/knife-data-bag.1.html +3 -3
  14. data/distro/common/html/knife-environment.1.html +6 -6
  15. data/distro/common/html/knife-exec.1.html +4 -4
  16. data/distro/common/html/knife-index.1.html +3 -3
  17. data/distro/common/html/knife-node.1.html +4 -4
  18. data/distro/common/html/knife-role.1.html +3 -3
  19. data/distro/common/html/knife-search.1.html +3 -3
  20. data/distro/common/html/knife-ssh.1.html +3 -3
  21. data/distro/common/html/knife-status.1.html +4 -4
  22. data/distro/common/html/knife-tag.1.html +4 -4
  23. data/distro/common/html/knife.1.html +11 -11
  24. data/distro/common/html/shef.1.html +7 -7
  25. data/distro/common/man/man1/knife-bootstrap.1 +1 -1
  26. data/distro/common/man/man1/knife-client.1 +1 -1
  27. data/distro/common/man/man1/knife-configure.1 +1 -1
  28. data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
  29. data/distro/common/man/man1/knife-cookbook.1 +1 -1
  30. data/distro/common/man/man1/knife-data-bag.1 +1 -1
  31. data/distro/common/man/man1/knife-environment.1 +1 -1
  32. data/distro/common/man/man1/knife-exec.1 +1 -1
  33. data/distro/common/man/man1/knife-index.1 +1 -1
  34. data/distro/common/man/man1/knife-node.1 +1 -1
  35. data/distro/common/man/man1/knife-role.1 +1 -1
  36. data/distro/common/man/man1/knife-search.1 +1 -1
  37. data/distro/common/man/man1/knife-ssh.1 +1 -1
  38. data/distro/common/man/man1/knife-status.1 +1 -1
  39. data/distro/common/man/man1/knife-tag.1 +1 -1
  40. data/distro/common/man/man1/knife.1 +1 -1
  41. data/distro/common/man/man1/shef.1 +1 -1
  42. data/distro/common/man/man8/chef-client.8 +1 -1
  43. data/distro/common/man/man8/chef-expander.8 +1 -1
  44. data/distro/common/man/man8/chef-expanderctl.8 +1 -1
  45. data/distro/common/man/man8/chef-server-webui.8 +1 -1
  46. data/distro/common/man/man8/chef-server.8 +1 -1
  47. data/distro/common/man/man8/chef-solo.8 +1 -1
  48. data/distro/common/man/man8/chef-solr.8 +1 -1
  49. data/lib/chef/application.rb +14 -1
  50. data/lib/chef/application/client.rb +1 -11
  51. data/lib/chef/application/solo.rb +3 -9
  52. data/lib/chef/application/windows_service.rb +2 -9
  53. data/lib/chef/config.rb +3 -0
  54. data/lib/chef/node.rb +1 -1
  55. data/lib/chef/node/attribute.rb +18 -1
  56. data/lib/chef/version.rb +1 -1
  57. data/spec/unit/application/solo_spec.rb +2 -2
  58. metadata +4 -4
@@ -88,14 +88,7 @@ class Chef
88
88
  # If we've stopped, then bail out now, instead of going on to run Chef
89
89
  next if state != RUNNING
90
90
 
91
- @chef_client = Chef::Client.new(
92
- @chef_client_json,
93
- :override_runlist => config[:override_runlist]
94
- )
95
- @chef_client_json = nil
96
-
97
- @chef_client.run
98
- @chef_client = nil
91
+ run_chef_client
99
92
 
100
93
  Chef::Log.debug("Sleeping for #{Chef::Config[:interval]} seconds")
101
94
  client_sleep Chef::Config[:interval]
@@ -225,7 +218,7 @@ class Chef
225
218
  sleep chunk_length
226
219
  end
227
220
  end
228
-
221
+
229
222
  end
230
223
  end
231
224
  end
@@ -303,6 +303,9 @@ class Chef
303
303
  cache_type "BasicFile"
304
304
  cache_options({ :path => platform_specific_path("/var/chef/cache/checksums"), :skip_expires => true })
305
305
 
306
+ # Set to false to silence Chef 11 deprecation warnings:
307
+ chef11_deprecation_warnings true
308
+
306
309
  # Arbitrary knife configuration data
307
310
  knife Hash.new
308
311
 
@@ -397,7 +397,7 @@ class Chef
397
397
 
398
398
  # Lazy initializer for tags attribute
399
399
  def tags
400
- self[:tags] = [] unless attribute?(:tags)
400
+ self.set[:tags] = [] unless attribute?(:tags)
401
401
  self[:tags]
402
402
  end
403
403
 
@@ -318,7 +318,24 @@ class Chef
318
318
 
319
319
  def []=(key, value)
320
320
  # If we don't have one, then we'll pretend we're normal
321
- @set_type ||= :normal
321
+ if @set_type.nil?
322
+ @set_type = :normal
323
+ warning=<<-W
324
+ Setting attributes without specifying a precedence is deprecated and will be
325
+ removed in Chef 11.0. To set attributes at normal precedence, change code like:
326
+ `node["key"] = "value"` # Not this
327
+ to:
328
+ `node.set["key"] = "value"` # This
329
+
330
+ Called from:
331
+ W
332
+
333
+ warning_with_line_nrs = caller[0...3].inject(warning) do |msg, source_line|
334
+ msg << " #{source_line}\n"
335
+ end
336
+
337
+ Chef::Log.warn(warning_with_line_nrs) if Chef::Config[:chef11_deprecation_warnings]
338
+ end
322
339
 
323
340
  if set_unless_value_present
324
341
  if get_value(set_type_hash, key) != nil
@@ -17,7 +17,7 @@
17
17
 
18
18
  class Chef
19
19
  CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
20
- VERSION = '10.16.0.rc.0'
20
+ VERSION = '10.16.0.rc.1'
21
21
  end
22
22
 
23
23
  # NOTE: the Chef::Version class is defined in version_class.rb
@@ -71,7 +71,7 @@ describe Chef::Application::Solo do
71
71
 
72
72
  it "should perform a RESTful GET on the supplied URL" do
73
73
  @app.reconfigure
74
- @app.chef_solo_json.should == {"a" => "b"}
74
+ @app.instance_variable_get(:@chef_client_json).should == {"a" => "b"}
75
75
  end
76
76
  end
77
77
 
@@ -84,7 +84,7 @@ describe Chef::Application::Solo do
84
84
 
85
85
  it "should parse the json out of the file" do
86
86
  @app.reconfigure
87
- @app.chef_solo_json.should == {"a" => "b"}
87
+ @app.instance_variable_get(:@chef_client_json).should == {"a" => "b"}
88
88
  end
89
89
  end
90
90
 
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef
3
3
  version: !ruby/object:Gem::Version
4
- hash: -1571179094
4
+ hash: 1801040005
5
5
  prerelease: 8
6
6
  segments:
7
7
  - 10
8
8
  - 16
9
9
  - 0
10
10
  - rc
11
- - 0
12
- version: 10.16.0.rc.0
11
+ - 1
12
+ version: 10.16.0.rc.1
13
13
  platform: ruby
14
14
  authors:
15
15
  - Adam Jacob
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2012-10-11 00:00:00 Z
20
+ date: 2012-10-17 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: mixlib-config