chef 0.10.6.beta.2 → 0.10.6.beta.3

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.
Files changed (56) hide show
  1. data/distro/common/html/chef-client.8.html +4 -4
  2. data/distro/common/html/chef-expander.8.html +4 -4
  3. data/distro/common/html/chef-expanderctl.8.html +4 -4
  4. data/distro/common/html/chef-server-webui.8.html +4 -4
  5. data/distro/common/html/chef-server.8.html +4 -4
  6. data/distro/common/html/chef-solo.8.html +4 -4
  7. data/distro/common/html/chef-solr.8.html +4 -4
  8. data/distro/common/html/knife-bootstrap.1.html +4 -4
  9. data/distro/common/html/knife-client.1.html +4 -4
  10. data/distro/common/html/knife-configure.1.html +4 -4
  11. data/distro/common/html/knife-cookbook-site.1.html +4 -4
  12. data/distro/common/html/knife-cookbook.1.html +4 -4
  13. data/distro/common/html/knife-data-bag.1.html +4 -4
  14. data/distro/common/html/knife-environment.1.html +4 -4
  15. data/distro/common/html/knife-exec.1.html +4 -4
  16. data/distro/common/html/knife-index.1.html +4 -4
  17. data/distro/common/html/knife-node.1.html +4 -4
  18. data/distro/common/html/knife-role.1.html +4 -4
  19. data/distro/common/html/knife-search.1.html +4 -4
  20. data/distro/common/html/knife-ssh.1.html +4 -4
  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 +4 -4
  24. data/distro/common/html/shef.1.html +4 -4
  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/mixin/command.rb +0 -58
  50. data/lib/chef/provider/package/freebsd.rb +1 -1
  51. data/lib/chef/resource.rb +62 -40
  52. data/lib/chef/resource/conditional.rb +90 -0
  53. data/lib/chef/rest.rb +8 -0
  54. data/lib/chef/version.rb +1 -1
  55. data/lib/chef/version_class.rb +1 -1
  56. metadata +85 -40
@@ -134,11 +134,11 @@ option.</dd>
134
134
 
135
135
  <h2 id="AUTHOR">AUTHOR</h2>
136
136
 
137
- <p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#x61;&#x64;&#x61;&#109;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#112;&#115;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
137
+ <p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#x3a;&#x61;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
138
138
 
139
139
  <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
140
140
 
141
- <p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#111;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a>.
141
+ <p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#106;&#x6f;&#115;&#104;&#117;&#97;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#x75;&#97;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a>.
142
142
  Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
143
143
 
144
144
  <h2 id="CHEF">CHEF</h2>
@@ -147,8 +147,8 @@ option.</dd>
147
147
 
148
148
 
149
149
  <ol class='man-decor man-foot man foot'>
150
- <li class='tl'>Chef 0.10.6.beta.2</li>
151
- <li class='tc'>October 2011</li>
150
+ <li class='tl'>Chef 0.10.6.beta.3</li>
151
+ <li class='tc'>November 2011</li>
152
152
  <li class='tr'>knife-ssh(1)</li>
153
153
  </ol>
154
154
 
@@ -105,11 +105,11 @@ may not be publicly reachable.</p>
105
105
 
106
106
  <h2 id="AUTHOR">AUTHOR</h2>
107
107
 
108
- <p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
108
+ <p> Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#97;&#100;&#x61;&#109;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
109
109
 
110
110
  <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
111
111
 
112
- <p> This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#117;&#97;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a>.
112
+ <p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#x6a;&#111;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#x73;&#104;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;</a>.
113
113
  Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
114
114
 
115
115
  <h2 id="CHEF">CHEF</h2>
@@ -118,8 +118,8 @@ may not be publicly reachable.</p>
118
118
 
119
119
 
120
120
  <ol class='man-decor man-foot man foot'>
121
- <li class='tl'>Chef 0.10.6.beta.2</li>
122
- <li class='tc'>October 2011</li>
121
+ <li class='tl'>Chef 0.10.6.beta.3</li>
122
+ <li class='tc'>November 2011</li>
123
123
  <li class='tr'>knife-status(1)</li>
124
124
  </ol>
125
125
 
@@ -114,11 +114,11 @@
114
114
 
115
115
  <h2 id="AUTHOR">AUTHOR</h2>
116
116
 
117
- <p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
117
+ <p> Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#97;&#100;&#x61;&#109;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
118
118
 
119
119
  <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
120
120
 
121
- <p> This manual page was written by Daniel DeLeo <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x64;&#x61;&#110;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#100;&#x61;&#x6e;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
121
+ <p> This manual page was written by Daniel DeLeo <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#x64;&#97;&#110;&#64;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x64;&#x61;&#x6e;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#x6f;&#x6d;</a>.
122
122
  Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
123
123
 
124
124
  <h2 id="CHEF">CHEF</h2>
@@ -127,8 +127,8 @@
127
127
 
128
128
 
129
129
  <ol class='man-decor man-foot man foot'>
130
- <li class='tl'>Chef 0.10.6.beta.2</li>
131
- <li class='tc'>October 2011</li>
130
+ <li class='tl'>Chef 0.10.6.beta.3</li>
131
+ <li class='tc'>November 2011</li>
132
132
  <li class='tr'>knife-tag(1)</li>
133
133
  </ol>
134
134
 
@@ -292,12 +292,12 @@ data editing entirely.</dd>
292
292
 
293
293
  <h2 id="AUTHOR">AUTHOR</h2>
294
294
 
295
- <p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#97;&#x64;&#97;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> of Opscode
295
+ <p> Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#97;&#100;&#x61;&#109;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#x6d;</a> of Opscode
296
296
  (<a href="http://www.opscode.com" data-bare-link="true">http://www.opscode.com</a>), with contributions from the community.</p>
297
297
 
298
298
  <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
299
299
 
300
- <p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#x6f;&#115;&#104;&#117;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;</a>.</p>
300
+ <p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#x6a;&#111;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#x73;&#104;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;</a>.</p>
301
301
 
302
302
  <h2 id="LICENSE">LICENSE</h2>
303
303
 
@@ -311,8 +311,8 @@ data editing entirely.</dd>
311
311
 
312
312
 
313
313
  <ol class='man-decor man-foot man foot'>
314
- <li class='tl'>Chef 0.10.6.beta.2</li>
315
- <li class='tc'>October 2011</li>
314
+ <li class='tl'>Chef 0.10.6.beta.3</li>
315
+ <li class='tc'>November 2011</li>
316
316
  <li class='tr'>knife(1)</li>
317
317
  </ol>
318
318
 
@@ -258,12 +258,12 @@ and may become out of sync with the behavior of those libraries.</p>
258
258
 
259
259
  <h2 id="AUTHOR">AUTHOR</h2>
260
260
 
261
- <p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#97;&#x64;&#97;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many
261
+ <p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many
262
262
  contributions from the community. Shef was written by Daniel DeLeo.</p>
263
263
 
264
264
  <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
265
265
 
266
- <p> This manual page was written by Daniel DeLeo <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#100;&#x61;&#110;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x64;&#97;&#x6e;&#x40;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
266
+ <p> This manual page was written by Daniel DeLeo <a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#x64;&#97;&#110;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#100;&#97;&#x6e;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#x65;&#46;&#x63;&#111;&#x6d;</a>.
267
267
  Permission is granted to copy, distribute and / or modify this
268
268
  document under the terms of the Apache 2.0 License.</p>
269
269
 
@@ -273,8 +273,8 @@ and may become out of sync with the behavior of those libraries.</p>
273
273
 
274
274
 
275
275
  <ol class='man-decor man-foot man foot'>
276
- <li class='tl'>Chef 0.10.6.beta.2</li>
277
- <li class='tc'>October 2011</li>
276
+ <li class='tl'>Chef 0.10.6.beta.3</li>
277
+ <li class='tc'>November 2011</li>
278
278
  <li class='tr'>shef(1)</li>
279
279
  </ol>
280
280
 
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-BOOTSTRAP" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-BOOTSTRAP" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-bootstrap\fR \- Install Chef Client on a remote host
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-CLIENT" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-CLIENT" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-client\fR \- Manage Chef API Clients
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-CONFIGURE" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-CONFIGURE" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-configure\fR \- Generate configuration files for knife or Chef Client
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-COOKBOOK\-SITE" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-COOKBOOK\-SITE" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-cookbook\-site\fR \- Install and update open source cookbooks
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-COOKBOOK" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-COOKBOOK" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-cookbook\fR \- upload and manage chef cookbooks
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-DATA\-BAG" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-DATA\-BAG" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-ENVIRONMENT" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-ENVIRONMENT" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-EXEC" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-EXEC" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-exec\fR \- Run user scripts using the Chef API DSL
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-INDEX" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-INDEX" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-index\fR \- Rebuild the search index on a Chef Server
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-NODE" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-NODE" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-node\fR \- Manage the hosts in your infrastructure
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-ROLE" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-ROLE" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-role\fR \- Group common configuration settings
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-SEARCH" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-SEARCH" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-search\fR \- Find objects on a Chef Server by query
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-SSH" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-SSH" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-STATUS" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-STATUS" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-status\fR \- Display status information for the nodes in your infrastructure
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE\-TAG" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE\-TAG" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "KNIFE" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "KNIFE" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBknife\fR \- Chef Server API client utility
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "SHEF" "1" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "SHEF" "1" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBshef\fR \- Interactive Chef Console
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-CLIENT" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-CLIENT" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-EXPANDER" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-EXPANDER" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-EXPANDERCTL" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-EXPANDERCTL" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-expanderctl\fR \- management program for chef\-expander
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SERVER\-WEBUI" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-SERVER\-WEBUI" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SERVER" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-SERVER" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-server\fR \- Start the Chef Server merb application slice\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SOLO" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-SOLO" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
@@ -1,7 +1,7 @@
1
1
  .\" generated with Ronn/v0.7.3
2
2
  .\" http://github.com/rtomayko/ronn/tree/0.7.3
3
3
  .
4
- .TH "CHEF\-SOLR" "8" "October 2011" "Chef 0.10.6.beta.2" "Chef Manual"
4
+ .TH "CHEF\-SOLR" "8" "November 2011" "Chef 0.10.6.beta.3" "Chef Manual"
5
5
  .
6
6
  .SH "NAME"
7
7
  \fBchef\-solr\fR \- Runs as Chef\'s search server
@@ -38,64 +38,6 @@ class Chef
38
38
  extend ::Chef::Mixin::Command::Unix
39
39
  end
40
40
 
41
- # If command is a block, returns true if the block returns true, false if it returns false.
42
- # ("Only run this resource if the block is true")
43
- #
44
- # If the command is not a block, executes the command. If it returns any status other than
45
- # 0, it returns false (clearly, a 0 status code is true)
46
- #
47
- # === Parameters
48
- # command<Block>, <String>:: A block to check, or a string to execute
49
- #
50
- # === Returns
51
- # true:: Returns true if the block is true, or if the command returns 0
52
- # false:: Returns false if the block is false, or if the command returns a non-zero exit code.
53
- def only_if(command, args = {})
54
- if command.kind_of?(Proc)
55
- chdir_or_tmpdir(args[:cwd]) do
56
- res = command.call
57
- unless res
58
- return false
59
- end
60
- end
61
- else
62
- status = run_command({:command => command, :ignore_failure => true}.merge(args))
63
- if status.exitstatus != 0
64
- return false
65
- end
66
- end
67
- true
68
- end
69
-
70
- # If command is a block, returns false if the block returns true, true if it returns false.
71
- # ("Do not run this resource if the block is true")
72
- #
73
- # If the command is not a block, executes the command. If it returns a 0 exitstatus, returns false.
74
- # ("Do not run this resource if the command returns 0")
75
- #
76
- # === Parameters
77
- # command<Block>, <String>:: A block to check, or a string to execute
78
- #
79
- # === Returns
80
- # true:: Returns true if the block is false, or if the command returns a non-zero exit status.
81
- # false:: Returns false if the block is true, or if the command returns a 0 exit status.
82
- def not_if(command, args = {})
83
- if command.kind_of?(Proc)
84
- chdir_or_tmpdir(args[:cwd]) do
85
- res = command.call
86
- if res
87
- return false
88
- end
89
- end
90
- else
91
- status = run_command({:command => command, :ignore_failure => true}.merge(args))
92
- if status.exitstatus == 0
93
- return false
94
- end
95
- end
96
- true
97
- end
98
-
99
41
  # === Parameters
100
42
  # args<Hash>: A number of required and optional arguments
101
43
  # command<String>, <Array>: A complete command with options to execute or a command and options as an Array
@@ -97,7 +97,7 @@ class Chef
97
97
  unless @current_resource.version
98
98
  case @new_resource.source
99
99
  when /^ports$/
100
- shell_out!("make -DBATCH -f #{port_path}/Makefile install", :timeout => 1200, :env => nil).status
100
+ shell_out!("make -DBATCH install", :timeout => 1200, :env => nil, :cwd => port_path).status
101
101
  when /^http/, /^ftp/
102
102
  shell_out!("pkg_add -r #{package_name}", :env => { "PACKAGESITE" => @new_resource.source, 'LC_ALL' => nil }).status
103
103
  Chef::Log.debug("#{@new_resource} installed from: #{@new_resource.source}")
@@ -21,7 +21,7 @@ require 'chef/mixin/params_validate'
21
21
  require 'chef/mixin/check_helper'
22
22
  require 'chef/mixin/language'
23
23
  require 'chef/mixin/convert_to_class_name'
24
- require 'chef/mixin/command'
24
+ require 'chef/resource/conditional'
25
25
  require 'chef/resource_collection'
26
26
  require 'chef/node'
27
27
 
@@ -70,7 +70,7 @@ F
70
70
 
71
71
  end
72
72
 
73
- FORBIDDEN_IVARS = [:@run_context, :@node]
73
+ FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if]
74
74
  HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node]
75
75
 
76
76
  include Chef::Mixin::CheckHelper
@@ -116,10 +116,8 @@ F
116
116
  @ignore_failure = false
117
117
  @retries = 0
118
118
  @retry_delay = 2
119
- @not_if = nil
120
- @not_if_args = {}
121
- @only_if = nil
122
- @only_if_args = {}
119
+ @not_if = []
120
+ @only_if = []
123
121
  @immediate_notifications = Array.new
124
122
  @delayed_notifications = Array.new
125
123
  @source_line = nil
@@ -371,24 +369,44 @@ F
371
369
  instance_vars
372
370
  end
373
371
 
374
- def only_if(arg=nil, args = {}, &blk)
375
- if Kernel.block_given?
376
- @only_if = blk
377
- @only_if_args = args
378
- else
379
- @only_if = arg if arg
380
- @only_if_args = args if arg
372
+ # If command is a block, returns true if the block returns true, false if it returns false.
373
+ # ("Only run this resource if the block is true")
374
+ #
375
+ # If the command is not a block, executes the command. If it returns any status other than
376
+ # 0, it returns false (clearly, a 0 status code is true)
377
+ #
378
+ # === Parameters
379
+ # command<String>:: A a string to execute.
380
+ # opts<Hash>:: Options control the execution of the command
381
+ # block<Proc>:: A ruby block to run. Ignored if a command is given.
382
+ #
383
+ # === Evaluation
384
+ # * evaluates to true if the block is true, or if the command returns 0
385
+ # * evaluates to false if the block is false, or if the command returns a non-zero exit code.
386
+ def only_if(command=nil, opts={}, &block)
387
+ if command || block_given?
388
+ @only_if << Conditional.only_if(command, opts, &block)
381
389
  end
382
390
  @only_if
383
391
  end
384
392
 
385
- def not_if(arg=nil, args = {}, &blk)
386
- if Kernel.block_given?
387
- @not_if = blk
388
- @not_if_args = args
389
- else
390
- @not_if = arg if arg
391
- @not_if_args = args if arg
393
+ # If command is a block, returns false if the block returns true, true if it returns false.
394
+ # ("Do not run this resource if the block is true")
395
+ #
396
+ # If the command is not a block, executes the command. If it returns a 0 exitstatus, returns false.
397
+ # ("Do not run this resource if the command returns 0")
398
+ #
399
+ # === Parameters
400
+ # command<String>:: A a string to execute.
401
+ # opts<Hash>:: Options control the execution of the command
402
+ # block<Proc>:: A ruby block to run. Ignored if a command is given.
403
+ #
404
+ # === Evaluation
405
+ # * evaluates to true if the block is false, or if the command returns a non-zero exit status.
406
+ # * evaluates to false if the block is true, or if the command returns a 0 exit status.
407
+ def not_if(command=nil, opts={}, &block)
408
+ if command || block_given?
409
+ @not_if << Conditional.not_if(command, opts, &block)
392
410
  end
393
411
  @not_if
394
412
  end
@@ -415,25 +433,7 @@ F
415
433
  updated_by_last_action(false)
416
434
 
417
435
  begin
418
- # Check if this resource has an only_if block -- if it does,
419
- # evaluate the only_if block and skip the resource if
420
- # appropriate.
421
- if only_if
422
- unless Chef::Mixin::Command.only_if(only_if, only_if_args)
423
- Chef::Log.debug("Skipping #{self} due to only_if")
424
- return
425
- end
426
- end
427
-
428
- # Check if this resource has a not_if block -- if it does,
429
- # evaluate the not_if block and skip the resource if
430
- # appropriate.
431
- if not_if
432
- unless Chef::Mixin::Command.not_if(not_if, not_if_args)
433
- Chef::Log.debug("Skipping #{self} due to not_if")
434
- return
435
- end
436
- end
436
+ return if should_skip?
437
437
 
438
438
  provider = Chef::Platform.provider_for_resource(self)
439
439
  provider.load_current_resource
@@ -443,13 +443,35 @@ F
443
443
  Chef::Log.error("#{self} (#{defined_at}) had an error: #{e.message}")
444
444
  else
445
445
  Chef::Log.error("#{self} (#{defined_at}) has had an error")
446
- new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.message}")
446
+ new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.class.name}: #{e.message}")
447
447
  new_exception.set_backtrace(e.backtrace)
448
448
  raise new_exception
449
449
  end
450
450
  end
451
451
  end
452
452
 
453
+ # Evaluates not_if and only_if conditionals. Returns a falsey value if any
454
+ # of the conditionals indicate that this resource should be skipped, i.e.,
455
+ # if an only_if evaluates to false or a not_if evaluates to true.
456
+ #
457
+ # If this resource should be skipped, returns the first conditional that
458
+ # "fails" its check. Subsequent conditionals are not evaluated, so in
459
+ # general it's not a good idea to rely on side effects from not_if or
460
+ # only_if commands/blocks being evaluated.
461
+ def should_skip?
462
+ conditionals = only_if + not_if
463
+ return false if conditionals.empty?
464
+
465
+ conditionals.find do |conditional|
466
+ if conditional.continue?
467
+ false
468
+ else
469
+ Chef::Log.debug("Skipping #{self} due to #{conditional.description}")
470
+ true
471
+ end
472
+ end
473
+ end
474
+
453
475
  def updated_by_last_action(true_or_false)
454
476
  @updated ||= true_or_false
455
477
  @updated_by_last_action = true_or_false