chef 12.12.15-universal-mingw32 → 12.13.30-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (412) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -0
  3. data/LICENSE +201 -201
  4. data/VERSION +1 -1
  5. data/acceptance/.gitignore +2 -0
  6. data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +1 -12
  7. data/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +29 -12
  8. data/acceptance/Gemfile +6 -3
  9. data/acceptance/Gemfile.lock +109 -67
  10. data/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +2 -2
  11. data/acceptance/trivial/.kitchen.yml +1 -1
  12. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +1 -1
  13. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +1 -1
  14. data/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +1 -1
  15. data/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +4 -4
  16. data/bin/chef-apply +0 -0
  17. data/bin/chef-client +0 -0
  18. data/bin/chef-service-manager +0 -0
  19. data/bin/chef-shell +0 -0
  20. data/bin/chef-solo +0 -0
  21. data/bin/chef-windows-service +0 -0
  22. data/bin/knife +0 -0
  23. data/chef.gemspec +4 -3
  24. data/distro/common/html/_sources/ctl_chef_client.txt +35 -35
  25. data/distro/common/html/_sources/ctl_chef_server.txt +341 -341
  26. data/distro/common/html/_sources/ctl_chef_shell.txt +15 -15
  27. data/distro/common/html/_sources/ctl_chef_solo.txt +25 -25
  28. data/distro/common/html/_sources/index.txt +135 -135
  29. data/distro/common/html/_sources/knife.txt +74 -74
  30. data/distro/common/html/_sources/knife_bootstrap.txt +56 -56
  31. data/distro/common/html/_sources/knife_client.txt +150 -150
  32. data/distro/common/html/_sources/knife_common_options.txt +6 -6
  33. data/distro/common/html/_sources/knife_configure.txt +29 -29
  34. data/distro/common/html/_sources/knife_cookbook.txt +236 -236
  35. data/distro/common/html/_sources/knife_cookbook_site.txt +157 -157
  36. data/distro/common/html/_sources/knife_data_bag.txt +159 -159
  37. data/distro/common/html/_sources/knife_delete.txt +26 -26
  38. data/distro/common/html/_sources/knife_deps.txt +61 -61
  39. data/distro/common/html/_sources/knife_diff.txt +34 -34
  40. data/distro/common/html/_sources/knife_download.txt +44 -44
  41. data/distro/common/html/_sources/knife_edit.txt +26 -26
  42. data/distro/common/html/_sources/knife_environment.txt +158 -158
  43. data/distro/common/html/_sources/knife_exec.txt +47 -47
  44. data/distro/common/html/_sources/knife_index_rebuild.txt +20 -20
  45. data/distro/common/html/_sources/knife_list.txt +33 -33
  46. data/distro/common/html/_sources/knife_node.txt +250 -250
  47. data/distro/common/html/_sources/knife_raw.txt +35 -35
  48. data/distro/common/html/_sources/knife_recipe_list.txt +23 -23
  49. data/distro/common/html/_sources/knife_role.txt +157 -157
  50. data/distro/common/html/_sources/knife_search.txt +53 -53
  51. data/distro/common/html/_sources/knife_serve.txt +18 -18
  52. data/distro/common/html/_sources/knife_show.txt +26 -26
  53. data/distro/common/html/_sources/knife_ssh.txt +43 -43
  54. data/distro/common/html/_sources/knife_ssl_check.txt +41 -41
  55. data/distro/common/html/_sources/knife_ssl_fetch.txt +41 -41
  56. data/distro/common/html/_sources/knife_status.txt +37 -37
  57. data/distro/common/html/_sources/knife_tag.txt +69 -69
  58. data/distro/common/html/_sources/knife_upload.txt +49 -49
  59. data/distro/common/html/_sources/knife_user.txt +127 -127
  60. data/distro/common/html/_sources/knife_using.txt +43 -43
  61. data/distro/common/html/_sources/knife_xargs.txt +30 -30
  62. data/distro/common/html/_static/guide.css +504 -504
  63. data/distro/common/html/_static/pygments.css +61 -61
  64. data/distro/common/html/_static/underscore.js +31 -31
  65. data/distro/common/html/ctl_chef_client.html +269 -269
  66. data/distro/common/html/ctl_chef_server.html +727 -727
  67. data/distro/common/html/ctl_chef_shell.html +162 -162
  68. data/distro/common/html/ctl_chef_solo.html +193 -193
  69. data/distro/common/html/index.html +201 -201
  70. data/distro/common/html/knife.html +169 -169
  71. data/distro/common/html/knife_bootstrap.html +284 -284
  72. data/distro/common/html/knife_client.html +284 -284
  73. data/distro/common/html/knife_common_options.html +95 -95
  74. data/distro/common/html/knife_configure.html +104 -104
  75. data/distro/common/html/knife_cookbook.html +486 -486
  76. data/distro/common/html/knife_data_bag.html +373 -373
  77. data/distro/common/html/knife_delete.html +92 -92
  78. data/distro/common/html/knife_deps.html +142 -142
  79. data/distro/common/html/knife_diff.html +122 -122
  80. data/distro/common/html/knife_download.html +144 -144
  81. data/distro/common/html/knife_edit.html +88 -88
  82. data/distro/common/html/knife_environment.html +325 -325
  83. data/distro/common/html/knife_exec.html +219 -219
  84. data/distro/common/html/knife_index_rebuild.html +82 -82
  85. data/distro/common/html/knife_list.html +113 -113
  86. data/distro/common/html/knife_node.html +457 -457
  87. data/distro/common/html/knife_raw.html +109 -109
  88. data/distro/common/html/knife_recipe_list.html +90 -90
  89. data/distro/common/html/knife_role.html +294 -294
  90. data/distro/common/html/knife_search.html +202 -202
  91. data/distro/common/html/knife_serve.html +78 -78
  92. data/distro/common/html/knife_show.html +103 -103
  93. data/distro/common/html/knife_ssh.html +176 -176
  94. data/distro/common/html/knife_ssl_check.html +150 -150
  95. data/distro/common/html/knife_ssl_fetch.html +150 -150
  96. data/distro/common/html/knife_status.html +143 -143
  97. data/distro/common/html/knife_tag.html +137 -137
  98. data/distro/common/html/knife_upload.html +152 -152
  99. data/distro/common/html/knife_user.html +241 -241
  100. data/distro/common/html/knife_using.html +209 -209
  101. data/distro/common/html/knife_xargs.html +121 -121
  102. data/distro/common/html/search.html +81 -81
  103. data/distro/common/man/man1/README.md +58 -58
  104. data/distro/common/man/man1/chef-shell.1 +194 -194
  105. data/distro/common/man/man1/knife-bootstrap.1 +215 -215
  106. data/distro/common/man/man1/knife-client.1 +443 -443
  107. data/distro/common/man/man1/knife-configure.1 +161 -161
  108. data/distro/common/man/man1/knife-cookbook.1 +770 -770
  109. data/distro/common/man/man1/knife-data-bag.1 +617 -617
  110. data/distro/common/man/man1/knife-delete.1 +127 -127
  111. data/distro/common/man/man1/knife-deps.1 +246 -246
  112. data/distro/common/man/man1/knife-diff.1 +226 -226
  113. data/distro/common/man/man1/knife-download.1 +258 -258
  114. data/distro/common/man/man1/knife-edit.1 +121 -121
  115. data/distro/common/man/man1/knife-environment.1 +508 -508
  116. data/distro/common/man/man1/knife-exec.1 +362 -362
  117. data/distro/common/man/man1/knife-index-rebuild.1 +63 -63
  118. data/distro/common/man/man1/knife-list.1 +174 -174
  119. data/distro/common/man/man1/knife-node.1 +716 -716
  120. data/distro/common/man/man1/knife-raw.1 +172 -172
  121. data/distro/common/man/man1/knife-recipe-list.1 +85 -85
  122. data/distro/common/man/man1/knife-role.1 +426 -426
  123. data/distro/common/man/man1/knife-search.1 +359 -359
  124. data/distro/common/man/man1/knife-serve.1 +109 -109
  125. data/distro/common/man/man1/knife-show.1 +160 -160
  126. data/distro/common/man/man1/knife-ssh.1 +284 -284
  127. data/distro/common/man/man1/knife-ssl-check.1 +207 -207
  128. data/distro/common/man/man1/knife-ssl-fetch.1 +207 -207
  129. data/distro/common/man/man1/knife-status.1 +234 -234
  130. data/distro/common/man/man1/knife-tag.1 +189 -189
  131. data/distro/common/man/man1/knife-upload.1 +280 -280
  132. data/distro/common/man/man1/knife-user.1 +356 -356
  133. data/distro/common/man/man1/knife-xargs.1 +189 -189
  134. data/distro/common/man/man1/knife.1 +332 -332
  135. data/distro/common/man/man8/chef-apply.8 +86 -86
  136. data/distro/common/man/man8/chef-client.8 +398 -398
  137. data/distro/common/man/man8/chef-solo.8 +260 -260
  138. data/distro/common/markdown/README +3 -3
  139. data/lib/chef/application.rb +23 -0
  140. data/lib/chef/application/client.rb +10 -2
  141. data/lib/chef/application/knife.rb +8 -0
  142. data/lib/chef/application/solo.rb +10 -2
  143. data/lib/chef/audit/audit_reporter.rb +5 -1
  144. data/lib/chef/audit/runner.rb +1 -1
  145. data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -0
  146. data/lib/chef/chef_fs/file_system/repository/acls_dir.rb +4 -2
  147. data/lib/chef/chef_fs/file_system/repository/base_file.rb +3 -0
  148. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -0
  149. data/lib/chef/chef_fs/file_system/repository/directory.rb +12 -1
  150. data/lib/chef/chef_fs/file_system_cache.rb +80 -0
  151. data/lib/chef/data_collector.rb +18 -1
  152. data/lib/chef/data_collector/resource_report.rb +1 -0
  153. data/lib/chef/decorator/unchain.rb +16 -0
  154. data/lib/chef/dsl/cheffish.rb +1 -0
  155. data/lib/chef/dsl/declare_resource.rb +9 -1
  156. data/lib/chef/file_access_control/windows.rb +3 -3
  157. data/lib/chef/knife/bootstrap.rb +9 -0
  158. data/lib/chef/knife/cookbook_site_install.rb +2 -11
  159. data/lib/chef/knife/cookbook_site_share.rb +7 -13
  160. data/lib/chef/knife/core/bootstrap_context.rb +10 -0
  161. data/lib/chef/knife/help_topics.rb +4 -4
  162. data/lib/chef/nil_argument.rb +3 -3
  163. data/lib/chef/node/attribute.rb +2 -2
  164. data/lib/chef/provider/apt_repository.rb +1 -1
  165. data/lib/chef/provider/apt_update.rb +12 -3
  166. data/lib/chef/provider/cron.rb +1 -1
  167. data/lib/chef/provider/package/aix.rb +5 -1
  168. data/lib/chef/provider/package/zypper.rb +7 -7
  169. data/lib/chef/provider/resource_update.rb +52 -52
  170. data/lib/chef/reserved_names.rb +9 -9
  171. data/lib/chef/resource.rb +13 -1
  172. data/lib/chef/resource/freebsd_package.rb +1 -1
  173. data/lib/chef/run_context.rb +15 -42
  174. data/lib/chef/sandbox.rb +20 -20
  175. data/lib/chef/version.rb +1 -1
  176. data/lib/chef/version_class.rb +7 -2
  177. data/lib/chef/win32/file.rb +4 -4
  178. data/lib/chef/win32/system.rb +0 -0
  179. data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -5
  180. data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -1
  181. data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -13
  182. data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -1
  183. data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -13
  184. data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -1
  185. data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -11
  186. data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -1
  187. data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -13
  188. data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -1
  189. data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -13
  190. data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -1
  191. data/spec/data/apt/chef-integration-test2-1.0/debian/rules +0 -0
  192. data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -22
  193. data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -22
  194. data/spec/data/apt/var/www/apt/conf/distributions +7 -7
  195. data/spec/data/apt/var/www/apt/conf/incoming +4 -4
  196. data/spec/data/apt/var/www/apt/conf/pulls +3 -3
  197. data/spec/data/apt/var/www/apt/db/version +4 -4
  198. data/spec/data/apt/var/www/apt/dists/sid/Release +19 -19
  199. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -16
  200. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -5
  201. data/spec/data/bootstrap/encrypted_data_bag_secret +1 -1
  202. data/spec/data/bootstrap/no_proxy.erb +2 -2
  203. data/spec/data/bootstrap/secret.erb +9 -9
  204. data/spec/data/bootstrap/test-hints.erb +12 -12
  205. data/spec/data/bootstrap/test.erb +1 -1
  206. data/spec/data/cb_version_cookbooks/tatft/README.rdoc +2 -2
  207. data/spec/data/cb_version_cookbooks/tatft/attributes/default.rb +1 -1
  208. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0 +1 -1
  209. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0 +1 -1
  210. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0 +1 -1
  211. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0 +1 -1
  212. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0 +1 -1
  213. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0 +1 -1
  214. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0 +1 -1
  215. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0 +1 -1
  216. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0 +1 -1
  217. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0 +1 -1
  218. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0 +1 -1
  219. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0 +1 -1
  220. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0 +1 -1
  221. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0 +1 -1
  222. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0 +1 -1
  223. data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0 +1 -1
  224. data/spec/data/config.rb +6 -6
  225. data/spec/data/cookbooks/angrybash/metadata.rb +2 -2
  226. data/spec/data/cookbooks/angrybash/recipes/default.rb +8 -8
  227. data/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl +2 -2
  228. data/spec/data/cookbooks/apache2/metadata.rb +2 -2
  229. data/spec/data/cookbooks/apache2/recipes/default.rb +2 -2
  230. data/spec/data/cookbooks/borken/metadata.rb +2 -2
  231. data/spec/data/cookbooks/borken/recipes/default.rb +1 -1
  232. data/spec/data/cookbooks/borken/templates/default/borken.erb +1 -1
  233. data/spec/data/cookbooks/chefignore +8 -8
  234. data/spec/data/cookbooks/ignorken/files/default/not_me.rb +2 -2
  235. data/spec/data/cookbooks/ignorken/metadata.rb +2 -2
  236. data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +1 -1
  237. data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb +2 -2
  238. data/spec/data/cookbooks/java/files/default/java.response +1 -1
  239. data/spec/data/cookbooks/java/metadata.rb +2 -2
  240. data/spec/data/cookbooks/name-mismatch-versionnumber/README.md +4 -4
  241. data/spec/data/cookbooks/name-mismatch-versionnumber/metadata.rb +8 -8
  242. data/spec/data/cookbooks/openldap/attributes/default.rb +16 -16
  243. data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
  244. data/spec/data/cookbooks/openldap/definitions/client.rb +5 -5
  245. data/spec/data/cookbooks/openldap/definitions/server.rb +5 -5
  246. data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -1
  247. data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -1
  248. data/spec/data/cookbooks/openldap/files/default/remotedir/not_a_template.erb +2 -2
  249. data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt +2 -2
  250. data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt +2 -2
  251. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -1
  252. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt +2 -2
  253. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt +2 -2
  254. data/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt +3 -3
  255. data/spec/data/cookbooks/openldap/libraries/openldap.rb +4 -4
  256. data/spec/data/cookbooks/openldap/libraries/openldap/version.rb +3 -3
  257. data/spec/data/cookbooks/openldap/metadata.rb +8 -8
  258. data/spec/data/cookbooks/openldap/recipes/default.rb +4 -4
  259. data/spec/data/cookbooks/openldap/recipes/gigantor.rb +3 -3
  260. data/spec/data/cookbooks/openldap/recipes/one.rb +15 -15
  261. data/spec/data/cookbooks/openldap/recipes/return.rb +2 -2
  262. data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -1
  263. data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -1
  264. data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -4
  265. data/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb +1 -1
  266. data/spec/data/cookbooks/openldap/templates/default/test.erb +1 -1
  267. data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -1
  268. data/spec/data/cookbooks/preseed/files/default/preseed-template.seed +4 -4
  269. data/spec/data/cookbooks/preseed/metadata.rb +2 -2
  270. data/spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed +1 -1
  271. data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -1
  272. data/spec/data/definitions/test.rb +4 -4
  273. data/spec/data/environment-config.rb +4 -4
  274. data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -127
  275. data/spec/data/fileedit/hosts +4 -4
  276. data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/README.md +4 -4
  277. data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/metadata.rb +13 -13
  278. data/spec/data/invalid-metadata-chef-repo/invalid-metadata/README.md +4 -4
  279. data/spec/data/kitchen/chefignore +6 -6
  280. data/spec/data/kitchen/openldap/attributes/default.rb +3 -3
  281. data/spec/data/kitchen/openldap/attributes/robinson.rb +2 -2
  282. data/spec/data/kitchen/openldap/definitions/client.rb +3 -3
  283. data/spec/data/kitchen/openldap/definitions/drewbarrymore.rb +2 -2
  284. data/spec/data/kitchen/openldap/recipes/gigantor.rb +2 -2
  285. data/spec/data/kitchen/openldap/recipes/ignoreme.rb +2 -2
  286. data/spec/data/kitchen/openldap/recipes/woot.rb +3 -3
  287. data/spec/data/knife_subcommand/test_explicit_category.rb +6 -6
  288. data/spec/data/knife_subcommand/test_name_mapping.rb +4 -4
  289. data/spec/data/knife_subcommand/test_yourself.rb +21 -21
  290. data/spec/data/lwrp/providers/inline_compiler.rb +26 -26
  291. data/spec/data/lwrp/providers/monkey_name_printer.rb +5 -5
  292. data/spec/data/lwrp/providers/paint_drying_watcher.rb +7 -7
  293. data/spec/data/lwrp/providers/thumb_twiddler.rb +7 -7
  294. data/spec/data/lwrp/resources/foo.rb +4 -4
  295. data/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb +1 -1
  296. data/spec/data/lwrp_override/providers/buck_passer.rb +5 -5
  297. data/spec/data/mac_users/10.7-8.plist.xml +559 -559
  298. data/spec/data/mac_users/10.7-8.shadow.xml +11 -11
  299. data/spec/data/mac_users/10.7.plist.xml +559 -559
  300. data/spec/data/mac_users/10.7.shadow.xml +11 -11
  301. data/spec/data/mac_users/10.8.plist.xml +559 -559
  302. data/spec/data/mac_users/10.8.shadow.xml +21 -21
  303. data/spec/data/mac_users/10.9.plist.xml +560 -560
  304. data/spec/data/mac_users/10.9.shadow.xml +21 -21
  305. data/spec/data/metadata/quick_start/metadata.rb +19 -19
  306. data/spec/data/nodes/default.rb +15 -15
  307. data/spec/data/nodes/test.example.com.rb +17 -17
  308. data/spec/data/nodes/test.rb +15 -15
  309. data/spec/data/null_config.rb +1 -1
  310. data/spec/data/object_loader/environments/test.json +7 -7
  311. data/spec/data/object_loader/environments/test.rb +2 -2
  312. data/spec/data/object_loader/environments/test_json_class.json +8 -8
  313. data/spec/data/object_loader/nodes/test.json +7 -7
  314. data/spec/data/object_loader/nodes/test.rb +2 -2
  315. data/spec/data/object_loader/nodes/test_json_class.json +8 -8
  316. data/spec/data/object_loader/roles/test.json +7 -7
  317. data/spec/data/object_loader/roles/test.rb +2 -2
  318. data/spec/data/object_loader/roles/test_json_class.json +8 -8
  319. data/spec/data/partial_one.erb +1 -1
  320. data/spec/data/recipes/test.rb +7 -7
  321. data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -1
  322. data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -2
  323. data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -2
  324. data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -1
  325. data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -1
  326. data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -1
  327. data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -2
  328. data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -2
  329. data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -1
  330. data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -1
  331. data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -1
  332. data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -2
  333. data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -1
  334. data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -1
  335. data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -1
  336. data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -2
  337. data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -1
  338. data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -1
  339. data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -1
  340. data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -1
  341. data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -1
  342. data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -1
  343. data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -2
  344. data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -2
  345. data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -1
  346. data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -1
  347. data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -1
  348. data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -1
  349. data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -3
  350. data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -1
  351. data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -1
  352. data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
  353. data/spec/data/run_context/cookbooks/test/definitions/new_animals.rb +9 -9
  354. data/spec/data/run_context/cookbooks/test/definitions/new_cat.rb +5 -5
  355. data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -1
  356. data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -1
  357. data/spec/data/run_context/cookbooks/test/recipes/default.rb +5 -5
  358. data/spec/data/run_context/cookbooks/test/recipes/one.rb +7 -7
  359. data/spec/data/run_context/cookbooks/test/recipes/two.rb +7 -7
  360. data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -1
  361. data/spec/data/run_context/nodes/run_context.rb +5 -5
  362. data/spec/data/search_queries_to_transform.txt +98 -98
  363. data/spec/data/shef-config.rb +10 -10
  364. data/spec/data/ssl/5e707473.0 +18 -18
  365. data/spec/data/ssl/chef-rspec.cert +27 -27
  366. data/spec/data/ssl/chef-rspec.key +27 -27
  367. data/spec/data/ssl/key.pem +15 -15
  368. data/spec/data/ssl/private_key.pem +27 -27
  369. data/spec/data/ssl/private_key_with_whitespace.pem +32 -32
  370. data/spec/data/standalone_cookbook/chefignore +9 -9
  371. data/spec/data/standalone_cookbook/recipes/default.rb +2 -2
  372. data/spec/data/trusted_certs/example.crt +22 -22
  373. data/spec/data/trusted_certs/intermediate.pem +27 -27
  374. data/spec/data/trusted_certs/root.pem +22 -22
  375. data/spec/functional/assets/chefinittest +34 -34
  376. data/spec/functional/assets/testchefsubsys +10 -10
  377. data/spec/functional/mixin/powershell_out_spec.rb +2 -2
  378. data/spec/functional/provider/remote_file/cache_control_data_spec.rb +0 -0
  379. data/spec/functional/resource/aix_service_spec.rb +0 -0
  380. data/spec/functional/resource/aixinit_service_spec.rb +0 -0
  381. data/spec/functional/resource/cron_spec.rb +8 -1
  382. data/spec/functional/resource/env_spec.rb +0 -0
  383. data/spec/functional/resource/link_spec.rb +1 -6
  384. data/spec/functional/run_lock_spec.rb +17 -10
  385. data/spec/integration/knife/diff_spec.rb +2 -2
  386. data/spec/integration/knife/download_spec.rb +4 -4
  387. data/spec/integration/knife/raw_spec.rb +2 -0
  388. data/spec/integration/knife/upload_spec.rb +3 -3
  389. data/spec/rcov.opts +2 -2
  390. data/spec/spec_helper.rb +11 -1
  391. data/spec/support/shared/integration/knife_support.rb +4 -0
  392. data/spec/unit/application/client_spec.rb +35 -0
  393. data/spec/unit/application/solo_spec.rb +6 -6
  394. data/spec/unit/chef_fs/file_system/repository/directory_spec.rb +1 -0
  395. data/spec/unit/data_collector_spec.rb +41 -1
  396. data/spec/unit/dsl/declare_resource_spec.rb +30 -0
  397. data/spec/unit/knife/cookbook_site_install_spec.rb +2 -0
  398. data/spec/unit/knife/cookbook_site_share_spec.rb +4 -4
  399. data/spec/unit/node_spec.rb +6 -0
  400. data/spec/unit/provider/cron_spec.rb +16 -16
  401. data/spec/unit/provider/package/aix_spec.rb +13 -0
  402. data/spec/unit/provider/package/zypper_spec.rb +18 -2
  403. data/spec/unit/resource/apt_repository_spec.rb +14 -2
  404. data/spec/unit/resource/apt_update_spec.rb +14 -2
  405. data/spec/unit/resource_builder_spec.rb +1 -1
  406. data/tasks/bin/bundle-platform +0 -0
  407. data/tasks/bin/bundle-platform.bat +0 -0
  408. data/tasks/bin/create-override-gemfile +0 -0
  409. data/tasks/bin/run_external_test +0 -0
  410. data/tasks/bundle.rb +2 -2
  411. metadata +29 -15
  412. data/acceptance/data-collector/Berksfile.lock +0 -6
@@ -1,3 +1,5 @@
1
+ require 'chef/mixin/shell_out'
2
+
1
3
  module KitchenAcceptance
2
4
  class Kitchen < Chef::Resource
3
5
  resource_name :kitchen
@@ -33,18 +35,33 @@ module KitchenAcceptance
33
35
  property :kitchen_options, String, default: lazy { ENV["PROJECT_NAME"] ? "-c -l debug" : "-c" }
34
36
 
35
37
  action :run do
36
- execute "bundle exec kitchen #{command}#{instances ? " #{instances}" : ""}#{kitchen_options ? " #{kitchen_options}" : ""}" do
37
- cwd kitchen_dir
38
- env({
39
- "KITCHEN_DRIVER" => driver,
40
- "KITCHEN_INSTANCES" => instances,
41
- "KITCHEN_LOCAL_YAML" => ::File.expand_path("../../.kitchen.#{driver}.yml", __FILE__),
42
- "KITCHEN_CHEF_PRODUCT" => chef_product,
43
- "KITCHEN_CHEF_CHANNEL" => chef_channel,
44
- "KITCHEN_CHEF_VERSION" => chef_version,
45
- "ARTIFACTORY_USERNAME" => artifactory_username,
46
- "ARTIFACTORY_PASSWORD" => artifactory_password
47
- }.merge(new_resource.env))
38
+
39
+ ruby_block "copy_kitchen_logs_to_data_path" do
40
+ block do
41
+ cmd_env = {
42
+ "KITCHEN_DRIVER" => driver,
43
+ "KITCHEN_INSTANCES" => instances,
44
+ "KITCHEN_LOCAL_YAML" => ::File.expand_path("../../.kitchen.#{driver}.yml", __FILE__),
45
+ "KITCHEN_CHEF_PRODUCT" => chef_product,
46
+ "KITCHEN_CHEF_CHANNEL" => chef_channel,
47
+ "KITCHEN_CHEF_VERSION" => chef_version,
48
+ "ARTIFACTORY_USERNAME" => artifactory_username,
49
+ "ARTIFACTORY_PASSWORD" => artifactory_password
50
+ }.merge(new_resource.env)
51
+ suite = kitchen_dir.split("/").last
52
+ kitchen_log_path = ENV["WORKSPACE"] ? "#{ENV["WORKSPACE"]}/chef-acceptance-data/logs" : "#{kitchen_dir}/../.acceptance_data/logs/"
53
+
54
+ begin
55
+ shell_out!("bundle exec kitchen #{command}#{instances ? " #{instances}" : ""}#{kitchen_options ? " #{kitchen_options}" : ""}",
56
+ env: cmd_env,
57
+ timeout: 60 * 30,
58
+ live_stream: STDOUT,
59
+ cwd: kitchen_dir)
60
+ ensure
61
+ FileUtils.mkdir_p("#{kitchen_log_path}/#{suite}/#{command}")
62
+ FileUtils.cp_r("#{kitchen_dir}/.kitchen/logs/.", "#{kitchen_log_path}/#{suite}/#{command}")
63
+ end
64
+ end
48
65
  end
49
66
  end
50
67
  end
@@ -1,13 +1,16 @@
1
1
  source "https://rubygems.org"
2
2
 
3
3
  gem "chef-acceptance", github: "chef/chef-acceptance"
4
- gem "test-kitchen"
5
4
  gem "kitchen-ec2"
6
- gem "kitchen-inspec"
7
5
  gem "inspec"
8
6
  # Pinning to github for kitchen-vagrant because 0.19.0 incorrectly
9
7
  # puts in a box_url for bento when a vagrant box in atlas is specified
10
8
  gem "kitchen-vagrant"
11
9
  gem "windows_chef_zero"
12
- gem "winrm-fs"
10
+ gem "kitchen-inspec", :github => "mwrock/kitchen-inspec", :branch => "winrm-v2"
11
+ gem "test-kitchen", :github => "test-kitchen", :branch => "winrm-v2"
12
+ gem "train", :github => "chef/train", :branch => "winrm-v2"
13
+ gem "winrm", :github => "winrb/winrm", :branch => "winrm-v2"
14
+ gem "winrm-fs", :github => "winrb/winrm-fs", :branch => "winrm-v2"
15
+ gem "winrm-elevated", :github => "winrb/winrm-elevated", :branch => "winrm-v2"
13
16
  gem "berkshelf"
@@ -6,17 +6,88 @@ GIT
6
6
  mixlib-shellout (~> 2.0)
7
7
  thor (~> 0.19)
8
8
 
9
+ GIT
10
+ remote: git://github.com/chef/train.git
11
+ revision: cc92f89267f128ee78bc12da803722268e2f6af2
12
+ branch: winrm-v2
13
+ specs:
14
+ train (0.15.0)
15
+ docker-api (~> 1.26)
16
+ json (~> 1.8)
17
+ mixlib-shellout (~> 2.0)
18
+ net-scp (~> 1.2)
19
+ net-ssh (>= 2.9, < 4.0)
20
+ winrm (~> 2.0)
21
+ winrm-fs (~> 1.0)
22
+
23
+ GIT
24
+ remote: git://github.com/mwrock/kitchen-inspec.git
25
+ revision: 5c00e1d66fa3b459e0a504ed08d0550c31f35b06
26
+ branch: winrm-v2
27
+ specs:
28
+ kitchen-inspec (0.14.0)
29
+ inspec (>= 0.22.0, < 1.0.0)
30
+ test-kitchen (~> 1.6)
31
+
32
+ GIT
33
+ remote: git://github.com/test-kitchen/test-kitchen.git
34
+ revision: 06d7c0168ed6390c87a821ae8958e7d80c4d1912
35
+ branch: winrm-v2
36
+ specs:
37
+ test-kitchen (1.10.2)
38
+ mixlib-install (~> 1.0, >= 1.0.4)
39
+ mixlib-shellout (>= 1.2, < 3.0)
40
+ net-scp (~> 1.1)
41
+ net-ssh (>= 2.9, < 4.0)
42
+ safe_yaml (~> 1.0)
43
+ thor (~> 0.18)
44
+
45
+ GIT
46
+ remote: git://github.com/winrb/winrm-elevated.git
47
+ revision: 160bf424e018b2539fdde73079443e565ae57260
48
+ branch: winrm-v2
49
+ specs:
50
+ winrm-elevated (1.0.0)
51
+ winrm (~> 2.0)
52
+ winrm-fs (~> 1.0)
53
+
54
+ GIT
55
+ remote: git://github.com/winrb/winrm-fs.git
56
+ revision: ceb883b87fb81898e73e9249f287457ccb9d549f
57
+ branch: winrm-v2
58
+ specs:
59
+ winrm-fs (1.0.0)
60
+ erubis (~> 2.7)
61
+ logging (>= 1.6.1, < 3.0)
62
+ rubyzip (~> 1.1)
63
+ winrm
64
+
65
+ GIT
66
+ remote: git://github.com/winrb/winrm.git
67
+ revision: 3e50c963b935d046099a5afb295cf01f8030e43e
68
+ branch: winrm-v2
69
+ specs:
70
+ winrm (2.0.0)
71
+ builder (>= 2.1.2)
72
+ erubis (~> 2.7)
73
+ gssapi (~> 1.2)
74
+ gyoku (~> 1.0)
75
+ httpclient (~> 2.2, >= 2.2.0.2)
76
+ logging (>= 1.6.1, < 3.0)
77
+ nori (~> 2.0)
78
+ rubyntlm (~> 0.6.0)
79
+
9
80
  GEM
10
81
  remote: https://rubygems.org/
11
82
  specs:
12
83
  addressable (2.4.0)
13
- artifactory (2.3.2)
14
- aws-sdk (2.3.14)
15
- aws-sdk-resources (= 2.3.14)
16
- aws-sdk-core (2.3.14)
84
+ artifactory (2.3.3)
85
+ aws-sdk (2.5.0)
86
+ aws-sdk-resources (= 2.5.0)
87
+ aws-sdk-core (2.5.0)
17
88
  jmespath (~> 1.0)
18
- aws-sdk-resources (2.3.14)
19
- aws-sdk-core (= 2.3.14)
89
+ aws-sdk-resources (2.5.0)
90
+ aws-sdk-core (= 2.5.0)
20
91
  berkshelf (4.3.5)
21
92
  addressable (~> 2.3, >= 2.3.4)
22
93
  berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -53,21 +124,21 @@ GEM
53
124
  celluloid-io (0.16.2)
54
125
  celluloid (>= 0.16.0)
55
126
  nio4r (>= 1.1.0)
56
- chef-config (12.11.18)
127
+ chef-config (12.12.15)
57
128
  fuzzyurl (~> 0.8.0)
58
129
  mixlib-config (~> 2.0)
59
130
  mixlib-shellout (~> 2.0)
60
131
  cleanroom (1.0.0)
61
132
  coderay (1.1.1)
62
133
  diff-lcs (1.2.5)
63
- docker-api (1.28.0)
134
+ docker-api (1.30.0)
64
135
  excon (>= 0.38.0)
65
136
  json
66
137
  erubis (2.7.0)
67
- excon (0.49.0)
138
+ excon (0.51.0)
68
139
  faraday (0.9.2)
69
140
  multipart-post (>= 1.2, < 3)
70
- ffi (1.9.10)
141
+ ffi (1.9.14)
71
142
  fuzzyurl (0.8.0)
72
143
  gssapi (1.2.0)
73
144
  ffi (>= 1.0.1)
@@ -87,19 +158,14 @@ GEM
87
158
  rubyzip (~> 1.1)
88
159
  thor (~> 0.19)
89
160
  train (~> 0.13)
90
- jmespath (1.2.4)
91
- json_pure (>= 1.8.1)
161
+ jmespath (1.3.1)
92
162
  json (1.8.3)
93
- json_pure (1.8.3)
94
- kitchen-ec2 (1.0.0)
163
+ kitchen-ec2 (1.0.1)
95
164
  aws-sdk (~> 2)
96
165
  excon
97
166
  multi_json
98
167
  retryable (~> 2.0)
99
168
  test-kitchen (~> 1.4, >= 1.4.1)
100
- kitchen-inspec (0.14.0)
101
- inspec (>= 0.22.0, < 1.0.0)
102
- test-kitchen (~> 1.6)
103
169
  kitchen-vagrant (0.20.0)
104
170
  test-kitchen (~> 1.4)
105
171
  little-plugger (1.1.4)
@@ -108,15 +174,16 @@ GEM
108
174
  multi_json (~> 1.10)
109
175
  method_source (0.8.2)
110
176
  minitar (0.5.4)
111
- mixlib-archive (0.1.0)
177
+ mixlib-archive (0.2.0)
178
+ mixlib-log
112
179
  mixlib-authentication (1.4.1)
113
180
  mixlib-log
114
181
  mixlib-config (2.2.1)
115
- mixlib-install (1.0.13)
182
+ mixlib-install (1.1.0)
116
183
  artifactory
117
184
  mixlib-shellout
118
185
  mixlib-versioning
119
- mixlib-log (1.6.0)
186
+ mixlib-log (1.7.0)
120
187
  mixlib-shellout (2.2.6)
121
188
  mixlib-versioning (1.1.0)
122
189
  molinillo (0.4.5)
@@ -124,22 +191,22 @@ GEM
124
191
  multipart-post (2.0.0)
125
192
  net-scp (1.2.1)
126
193
  net-ssh (>= 2.6.5)
127
- net-ssh (3.1.1)
194
+ net-ssh (3.2.0)
128
195
  nio4r (1.2.1)
129
196
  nori (2.6.0)
130
197
  octokit (4.3.0)
131
198
  sawyer (~> 0.7.0, >= 0.5.3)
132
- pry (0.10.3)
199
+ pry (0.10.4)
133
200
  coderay (~> 1.1.0)
134
201
  method_source (~> 0.8.1)
135
202
  slop (~> 3.4)
136
203
  rainbow (2.1.0)
137
- retryable (2.0.3)
138
- ridley (4.5.1)
204
+ retryable (2.0.4)
205
+ ridley (4.6.1)
139
206
  addressable
140
207
  buff-config (~> 1.0)
141
208
  buff-extensions (~> 1.0)
142
- buff-ignore (~> 1.1)
209
+ buff-ignore (~> 1.1.1)
143
210
  buff-shell_out (~> 0.1)
144
211
  celluloid (~> 0.16.0)
145
212
  celluloid-io (~> 0.16.1)
@@ -153,22 +220,22 @@ GEM
153
220
  retryable (~> 2.0)
154
221
  semverse (~> 1.1)
155
222
  varia_model (~> 0.4.0)
156
- rspec (3.4.0)
157
- rspec-core (~> 3.4.0)
158
- rspec-expectations (~> 3.4.0)
159
- rspec-mocks (~> 3.4.0)
160
- rspec-core (3.4.4)
161
- rspec-support (~> 3.4.0)
162
- rspec-expectations (3.4.0)
223
+ rspec (3.5.0)
224
+ rspec-core (~> 3.5.0)
225
+ rspec-expectations (~> 3.5.0)
226
+ rspec-mocks (~> 3.5.0)
227
+ rspec-core (3.5.2)
228
+ rspec-support (~> 3.5.0)
229
+ rspec-expectations (3.5.0)
163
230
  diff-lcs (>= 1.2.0, < 2.0)
164
- rspec-support (~> 3.4.0)
231
+ rspec-support (~> 3.5.0)
165
232
  rspec-its (1.2.0)
166
233
  rspec-core (>= 3.0.0)
167
234
  rspec-expectations (>= 3.0.0)
168
- rspec-mocks (3.4.1)
235
+ rspec-mocks (3.5.0)
169
236
  diff-lcs (>= 1.2.0, < 2.0)
170
- rspec-support (~> 3.4.0)
171
- rspec-support (3.4.1)
237
+ rspec-support (~> 3.5.0)
238
+ rspec-support (3.5.0)
172
239
  rubyntlm (0.6.0)
173
240
  rubyzip (1.2.0)
174
241
  safe_yaml (1.0.4)
@@ -180,42 +247,14 @@ GEM
180
247
  solve (2.0.3)
181
248
  molinillo (~> 0.4.2)
182
249
  semverse (~> 1.1)
183
- test-kitchen (1.9.2)
184
- mixlib-install (~> 1.0, >= 1.0.4)
185
- mixlib-shellout (>= 1.2, < 3.0)
186
- net-scp (~> 1.1)
187
- net-ssh (>= 2.9, < 4.0)
188
- safe_yaml (~> 1.0)
189
- thor (~> 0.18)
190
250
  thor (0.19.1)
191
251
  timers (4.0.4)
192
252
  hitimes
193
- train (0.13.1)
194
- docker-api (~> 1.26)
195
- json (~> 1.8)
196
- mixlib-shellout (~> 2.0)
197
- net-scp (~> 1.2)
198
- net-ssh (>= 2.9, < 4.0)
199
- winrm (~> 1.6)
200
- winrm-fs (~> 0.3)
201
253
  varia_model (0.4.1)
202
254
  buff-extensions (~> 1.0)
203
255
  hashie (>= 2.0.2, < 4.0.0)
204
256
  windows_chef_zero (2.0.0)
205
257
  test-kitchen (>= 1.2.1)
206
- winrm (1.8.1)
207
- builder (>= 2.1.2)
208
- gssapi (~> 1.2)
209
- gyoku (~> 1.0)
210
- httpclient (~> 2.2, >= 2.2.0.2)
211
- logging (>= 1.6.1, < 3.0)
212
- nori (~> 2.0)
213
- rubyntlm (~> 0.6.0)
214
- winrm-fs (0.4.2)
215
- erubis (~> 2.7)
216
- logging (>= 1.6.1, < 3.0)
217
- rubyzip (~> 1.1)
218
- winrm (~> 1.5)
219
258
 
220
259
  PLATFORMS
221
260
  ruby
@@ -225,11 +264,14 @@ DEPENDENCIES
225
264
  chef-acceptance!
226
265
  inspec
227
266
  kitchen-ec2
228
- kitchen-inspec
267
+ kitchen-inspec!
229
268
  kitchen-vagrant
230
- test-kitchen
269
+ test-kitchen!
270
+ train!
231
271
  windows_chef_zero
232
- winrm-fs
272
+ winrm!
273
+ winrm-elevated!
274
+ winrm-fs!
233
275
 
234
276
  BUNDLED WITH
235
277
  1.12.5
@@ -3,6 +3,8 @@ class TopCookbooks < Chef::Resource
3
3
 
4
4
  property :command, String, name_property: true
5
5
 
6
+ # Disabling all windows tests until winrm issue is properly settled.
7
+ #
6
8
  action :run do
7
9
  cookbook_kitchen "#{command} docker" do
8
10
  end
@@ -33,8 +35,6 @@ class TopCookbooks < Chef::Resource
33
35
  repository "adamedx/winbox"
34
36
  end
35
37
 
36
- # Temporarily disabling windows and chocolatey to eliminate
37
- # transient errors on the builders
38
38
  # cookbook_kitchen "#{command} windows" do
39
39
  # end
40
40
 
@@ -3,5 +3,5 @@ verifier:
3
3
 
4
4
  suites:
5
5
  - name: chef-current-install
6
- includes: [windows-2012r2]
6
+ includes: [ubuntu-14.04, windows-server-2012r2]
7
7
  run_list:
@@ -1 +1 @@
1
- kitchen "destroy"
1
+ #kitchen "destroy"
@@ -1 +1 @@
1
- kitchen "converge"
1
+ #kitchen "converge"
@@ -1 +1 @@
1
- kitchen "verify"
1
+ #kitchen "verify"
@@ -13,7 +13,7 @@ describe service("chef-client") do
13
13
  it { should_not be_running }
14
14
  end
15
15
 
16
- describe command("chef-service-manager -a install") do
16
+ describe command("/opscode/chef/bin/chef-service-manager.bat -a install") do
17
17
  its("exit_status") { should eq 0 }
18
18
  its(:stdout) { should match /Service 'chef-client' has successfully been installed./ }
19
19
  end
@@ -24,7 +24,7 @@ describe service("chef-client") do
24
24
  it { should_not be_running }
25
25
  end
26
26
 
27
- describe command("chef-service-manager -a start") do
27
+ describe command("/opscode/chef/bin/chef-service-manager.bat -a start") do
28
28
  its("exit_status") { should eq 0 }
29
29
  its(:stdout) { should match /Service 'chef-client' is now 'running'/ }
30
30
  end
@@ -35,7 +35,7 @@ describe service("chef-client") do
35
35
  it { should be_running }
36
36
  end
37
37
 
38
- describe command("chef-service-manager -a stop") do
38
+ describe command("/opscode/chef/bin/chef-service-manager.bat -a stop") do
39
39
  its("exit_status") { should eq 0 }
40
40
  its(:stdout) { should match /Service 'chef-client' is now 'stopped'/ }
41
41
  end
@@ -46,7 +46,7 @@ describe service("chef-client") do
46
46
  it { should_not be_running }
47
47
  end
48
48
 
49
- describe command("chef-service-manager -a uninstall") do
49
+ describe command("/opscode/chef/bin/chef-service-manager.bat -a uninstall") do
50
50
  its("exit_status") { should eq 0 }
51
51
  its(:stdout) { should match /Service chef-client deleted/ }
52
52
  end
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
data/bin/knife CHANGED
File without changes
@@ -17,10 +17,11 @@ Gem::Specification.new do |s|
17
17
 
18
18
  s.add_dependency "chef-config", "= #{Chef::VERSION}"
19
19
 
20
- s.add_dependency "mixlib-cli", "~> 1.4"
20
+ s.add_dependency "mixlib-cli", "~> 1.7"
21
21
  s.add_dependency "mixlib-log", "~> 1.3"
22
22
  s.add_dependency "mixlib-authentication", "~> 1.4"
23
23
  s.add_dependency "mixlib-shellout", "~> 2.0"
24
+ s.add_dependency "mixlib-archive", ">= 0.2.0"
24
25
  s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 9"
25
26
 
26
27
  s.add_dependency "ffi-yajl", "~> 2.2"
@@ -31,13 +32,13 @@ Gem::Specification.new do |s|
31
32
  s.add_dependency "erubis", "~> 2.7"
32
33
  s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
33
34
 
34
- s.add_dependency "chef-zero", "~> 4.5"
35
+ s.add_dependency "chef-zero", "~> 4.8"
35
36
 
36
37
  s.add_dependency "plist", "~> 3.2"
37
38
  s.add_dependency "iniparse", "~> 1.4"
38
39
 
39
40
  # Audit mode requires these, so they are non-developmental dependencies now
40
- %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.4" }
41
+ %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }
41
42
  s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
42
43
  s.add_dependency "serverspec", "~> 2.7"
43
44
  s.add_dependency "specinfra", "~> 2.10"