chef 11.4.4 → 11.6.0.hotfix.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (504) hide show
  1. data/README.md +1 -1
  2. data/Rakefile +18 -1
  3. data/bin/chef-service-manager +37 -0
  4. data/distro/common/html/chef-client.8.html +4 -4
  5. data/distro/common/html/chef-expander.8.html +4 -4
  6. data/distro/common/html/chef-expanderctl.8.html +4 -4
  7. data/distro/common/html/chef-server-webui.8.html +4 -4
  8. data/distro/common/html/chef-server.8.html +4 -4
  9. data/distro/common/html/chef-shell.1.html +4 -4
  10. data/distro/common/html/chef-solo.8.html +12 -18
  11. data/distro/common/html/chef-solr.8.html +4 -4
  12. data/distro/common/html/knife-bootstrap.1.html +4 -4
  13. data/distro/common/html/knife-client.1.html +4 -4
  14. data/distro/common/html/knife-configure.1.html +4 -4
  15. data/distro/common/html/knife-cookbook-site.1.html +4 -4
  16. data/distro/common/html/knife-cookbook.1.html +7 -10
  17. data/distro/common/html/knife-data-bag.1.html +7 -10
  18. data/distro/common/html/knife-environment.1.html +6 -8
  19. data/distro/common/html/knife-exec.1.html +4 -4
  20. data/distro/common/html/knife-index.1.html +4 -4
  21. data/distro/common/html/knife-node.1.html +4 -4
  22. data/distro/common/html/knife-role.1.html +4 -4
  23. data/distro/common/html/knife-search.1.html +4 -4
  24. data/distro/common/html/knife-ssh.1.html +4 -4
  25. data/distro/common/html/knife-status.1.html +4 -4
  26. data/distro/common/html/knife-tag.1.html +4 -4
  27. data/distro/common/html/knife.1.html +4 -4
  28. data/distro/common/man/man1/chef-shell.1 +1 -1
  29. data/distro/common/man/man1/knife-bootstrap.1 +1 -1
  30. data/distro/common/man/man1/knife-client.1 +1 -1
  31. data/distro/common/man/man1/knife-configure.1 +1 -1
  32. data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
  33. data/distro/common/man/man1/knife-cookbook.1 +2 -15
  34. data/distro/common/man/man1/knife-data-bag.1 +2 -15
  35. data/distro/common/man/man1/knife-environment.1 +2 -12
  36. data/distro/common/man/man1/knife-exec.1 +1 -1
  37. data/distro/common/man/man1/knife-index.1 +1 -1
  38. data/distro/common/man/man1/knife-node.1 +1 -1
  39. data/distro/common/man/man1/knife-role.1 +1 -1
  40. data/distro/common/man/man1/knife-search.1 +1 -1
  41. data/distro/common/man/man1/knife-ssh.1 +1 -1
  42. data/distro/common/man/man1/knife-status.1 +1 -1
  43. data/distro/common/man/man1/knife-tag.1 +1 -1
  44. data/distro/common/man/man1/knife.1 +1 -1
  45. data/distro/common/man/man8/chef-client.8 +1 -1
  46. data/distro/common/man/man8/chef-expander.8 +1 -1
  47. data/distro/common/man/man8/chef-expanderctl.8 +1 -1
  48. data/distro/common/man/man8/chef-server-webui.8 +1 -1
  49. data/distro/common/man/man8/chef-server.8 +1 -1
  50. data/distro/common/man/man8/chef-solo.8 +4 -36
  51. data/distro/common/man/man8/chef-solr.8 +1 -1
  52. data/distro/debian/etc/init.d/chef-client +4 -2
  53. data/distro/windows/service_manager.rb +2 -146
  54. data/lib/chef.rb +1 -1
  55. data/lib/chef/application.rb +5 -12
  56. data/lib/chef/application/apply.rb +2 -0
  57. data/lib/chef/application/client.rb +12 -12
  58. data/lib/chef/application/knife.rb +2 -2
  59. data/lib/chef/application/solo.rb +4 -5
  60. data/lib/chef/application/windows_service.rb +113 -56
  61. data/lib/chef/application/windows_service_manager.rb +179 -0
  62. data/lib/chef/chef_fs.rb +2 -4
  63. data/lib/chef/chef_fs/chef_fs_data_store.rb +371 -0
  64. data/lib/chef/chef_fs/command_line.rb +145 -93
  65. data/lib/chef/chef_fs/config.rb +205 -0
  66. data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +26 -0
  67. data/lib/chef/chef_fs/data_handler/client_data_handler.rb +38 -0
  68. data/lib/chef/chef_fs/data_handler/container_data_handler.rb +29 -0
  69. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +38 -0
  70. data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +56 -0
  71. data/lib/chef/chef_fs/data_handler/data_handler_base.rb +128 -0
  72. data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +40 -0
  73. data/lib/chef/chef_fs/data_handler/group_data_handler.rb +51 -0
  74. data/lib/chef/chef_fs/data_handler/node_data_handler.rb +36 -0
  75. data/lib/chef/chef_fs/data_handler/role_data_handler.rb +40 -0
  76. data/lib/chef/chef_fs/data_handler/user_data_handler.rb +27 -0
  77. data/lib/chef/chef_fs/file_system.rb +195 -127
  78. data/lib/chef/chef_fs/file_system/acl_dir.rb +64 -0
  79. data/lib/chef/chef_fs/file_system/acl_entry.rb +58 -0
  80. data/lib/chef/chef_fs/file_system/acls_dir.rb +68 -0
  81. data/lib/chef/chef_fs/file_system/already_exists_error.rb +31 -0
  82. data/lib/chef/chef_fs/file_system/base_fs_object.rb +98 -39
  83. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +85 -0
  84. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +71 -0
  85. data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +55 -0
  86. data/lib/chef/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb +36 -0
  87. data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +14 -63
  88. data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +93 -3
  89. data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +35 -9
  90. data/lib/chef/chef_fs/file_system/cookbook_dir.rb +67 -32
  91. data/lib/chef/chef_fs/file_system/cookbook_file.rb +13 -6
  92. data/lib/chef/chef_fs/file_system/cookbook_frozen_error.rb +31 -0
  93. data/lib/chef/chef_fs/file_system/cookbooks_acl_dir.rb +41 -0
  94. data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +102 -21
  95. data/lib/chef/chef_fs/file_system/data_bag_dir.rb +12 -21
  96. data/lib/chef/chef_fs/file_system/data_bags_dir.rb +14 -8
  97. data/lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +36 -0
  98. data/lib/chef/chef_fs/file_system/environments_dir.rb +60 -0
  99. data/lib/chef/chef_fs/file_system/file_system_entry.rb +8 -8
  100. data/lib/chef/chef_fs/file_system/file_system_error.rb +3 -1
  101. data/lib/chef/chef_fs/file_system/memory_dir.rb +52 -0
  102. data/lib/chef/chef_fs/file_system/memory_file.rb +17 -0
  103. data/lib/chef/chef_fs/file_system/memory_root.rb +21 -0
  104. data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +48 -0
  105. data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +2 -2
  106. data/lib/chef/chef_fs/file_system/nodes_dir.rb +17 -9
  107. data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +0 -4
  108. data/lib/chef/chef_fs/file_system/not_found_error.rb +2 -2
  109. data/lib/chef/chef_fs/file_system/operation_failed_error.rb +34 -0
  110. data/lib/chef/chef_fs/file_system/operation_not_allowed_error.rb +48 -0
  111. data/lib/chef/chef_fs/file_system/rest_list_dir.rb +42 -13
  112. data/lib/chef/chef_fs/file_system/rest_list_entry.rb +81 -27
  113. data/lib/chef/chef_fs/knife.rb +68 -29
  114. data/lib/chef/chef_fs/parallelizer.rb +129 -0
  115. data/lib/chef/chef_fs/path_utils.rb +29 -3
  116. data/lib/chef/chef_fs/raw_request.rb +79 -0
  117. data/lib/chef/client.rb +46 -20
  118. data/lib/chef/config.rb +59 -61
  119. data/lib/chef/cookbook/chefignore.rb +2 -1
  120. data/lib/chef/cookbook/synchronizer.rb +8 -6
  121. data/lib/chef/cookbook/syntax_check.rb +17 -2
  122. data/lib/chef/cookbook_uploader.rb +10 -1
  123. data/lib/chef/cookbook_version.rb +0 -109
  124. data/lib/chef/data_bag.rb +15 -6
  125. data/lib/chef/deprecation/mixin/template.rb +49 -0
  126. data/lib/chef/deprecation/provider/cookbook_file.rb +55 -0
  127. data/lib/chef/deprecation/provider/file.rb +197 -0
  128. data/lib/chef/deprecation/provider/remote_file.rb +86 -0
  129. data/lib/chef/deprecation/provider/template.rb +63 -0
  130. data/lib/chef/deprecation/warnings.rb +38 -0
  131. data/lib/chef/encrypted_data_bag_item.rb +153 -61
  132. data/lib/chef/environment.rb +34 -3
  133. data/lib/chef/event_dispatch/base.rb +3 -0
  134. data/lib/chef/exceptions.rb +27 -2
  135. data/lib/chef/file_access_control/unix.rb +64 -7
  136. data/lib/chef/file_access_control/windows.rb +22 -11
  137. data/lib/chef/file_content_management/content_base.rb +56 -0
  138. data/lib/chef/file_content_management/deploy.rb +38 -0
  139. data/lib/chef/file_content_management/deploy/cp.rb +48 -0
  140. data/lib/chef/file_content_management/deploy/mv_unix.rb +77 -0
  141. data/lib/chef/file_content_management/deploy/mv_windows.rb +95 -0
  142. data/lib/chef/file_content_management/tempfile.rb +61 -0
  143. data/lib/chef/formatters/doc.rb +1 -1
  144. data/lib/chef/formatters/error_descriptor.rb +5 -4
  145. data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +23 -3
  146. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +4 -0
  147. data/lib/chef/json_compat.rb +3 -0
  148. data/lib/chef/knife.rb +12 -3
  149. data/lib/chef/knife/bootstrap.rb +46 -2
  150. data/lib/chef/knife/bootstrap/archlinux-gems.erb +3 -3
  151. data/lib/chef/knife/bootstrap/centos5-gems.erb +3 -3
  152. data/lib/chef/knife/bootstrap/chef-full.erb +4 -4
  153. data/lib/chef/knife/bootstrap/fedora13-gems.erb +3 -3
  154. data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +3 -3
  155. data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +3 -3
  156. data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +3 -3
  157. data/lib/chef/knife/client_show.rb +2 -5
  158. data/lib/chef/knife/configure.rb +3 -3
  159. data/lib/chef/knife/cookbook_create.rb +6 -5
  160. data/lib/chef/knife/cookbook_download.rb +13 -5
  161. data/lib/chef/knife/cookbook_site_share.rb +1 -0
  162. data/lib/chef/knife/cookbook_test.rb +1 -0
  163. data/lib/chef/knife/cookbook_upload.rb +4 -9
  164. data/lib/chef/knife/core/bootstrap_context.rb +10 -4
  165. data/lib/chef/knife/core/generic_presenter.rb +16 -0
  166. data/lib/chef/knife/core/node_editor.rb +1 -1
  167. data/lib/chef/knife/core/subcommand_loader.rb +43 -12
  168. data/lib/chef/knife/core/ui.rb +19 -4
  169. data/lib/chef/knife/delete.rb +76 -9
  170. data/lib/chef/knife/deps.rb +139 -0
  171. data/lib/chef/knife/diff.rb +22 -5
  172. data/lib/chef/knife/download.rb +16 -3
  173. data/lib/chef/knife/edit.rb +76 -0
  174. data/lib/chef/knife/environment_show.rb +2 -7
  175. data/lib/chef/knife/list.rb +91 -47
  176. data/lib/chef/knife/node_run_list_set.rb +66 -0
  177. data/lib/chef/knife/node_show.rb +1 -7
  178. data/lib/chef/knife/raw.rb +20 -64
  179. data/lib/chef/knife/role_show.rb +2 -4
  180. data/lib/chef/knife/search.rb +5 -6
  181. data/lib/chef/knife/show.rb +34 -11
  182. data/lib/chef/knife/ssh.rb +8 -0
  183. data/lib/chef/knife/upload.rb +23 -4
  184. data/lib/chef/knife/user_show.rb +2 -5
  185. data/lib/chef/knife/xargs.rb +265 -0
  186. data/lib/chef/log.rb +2 -2
  187. data/lib/chef/mixin/file_class.rb +0 -9
  188. data/lib/chef/mixin/language_include_recipe.rb +1 -1
  189. data/lib/chef/mixin/params_validate.rb +19 -9
  190. data/lib/chef/mixin/template.rb +126 -36
  191. data/lib/chef/mixin/windows_architecture_helper.rb +91 -0
  192. data/lib/chef/monkey_patches/file.rb +26 -0
  193. data/lib/chef/monkey_patches/net-ssh-multi.rb +140 -0
  194. data/lib/chef/monkey_patches/securerandom.rb +44 -0
  195. data/lib/chef/monologger.rb +93 -0
  196. data/lib/chef/node.rb +4 -0
  197. data/lib/chef/platform.rb +4 -490
  198. data/lib/chef/platform/provider_mapping.rb +529 -0
  199. data/lib/chef/{monkey_patches/dir.rb → platform/query_helpers.rb} +25 -19
  200. data/lib/chef/provider.rb +12 -9
  201. data/lib/chef/provider/batch.rb +35 -0
  202. data/lib/chef/provider/cookbook_file.rb +9 -78
  203. data/lib/chef/provider/cookbook_file/content.rb +49 -0
  204. data/lib/chef/provider/deploy.rb +24 -20
  205. data/lib/chef/provider/deploy/revision.rb +27 -0
  206. data/lib/chef/provider/directory.rb +19 -22
  207. data/lib/chef/provider/execute.rb +22 -5
  208. data/lib/chef/provider/file.rb +299 -217
  209. data/lib/chef/provider/file/content.rb +39 -0
  210. data/lib/chef/provider/git.rb +76 -43
  211. data/lib/chef/provider/group/usermod.rb +2 -2
  212. data/lib/chef/provider/ifconfig.rb +25 -35
  213. data/lib/chef/provider/ifconfig/debian.rb +71 -0
  214. data/lib/chef/provider/ifconfig/redhat.rb +47 -0
  215. data/lib/chef/provider/link.rb +10 -3
  216. data/lib/chef/provider/mount.rb +1 -1
  217. data/lib/chef/provider/mount/mount.rb +8 -3
  218. data/lib/chef/provider/mount/windows.rb +4 -1
  219. data/lib/chef/provider/package/portage.rb +9 -4
  220. data/lib/chef/provider/package/rubygems.rb +45 -10
  221. data/lib/chef/provider/package/smartos.rb +47 -36
  222. data/lib/chef/provider/package/yum.rb +19 -12
  223. data/lib/chef/provider/package/zypper.rb +45 -55
  224. data/lib/chef/provider/powershell_script.rb +77 -0
  225. data/lib/chef/provider/remote_directory.rb +5 -6
  226. data/lib/chef/provider/remote_file.rb +12 -108
  227. data/lib/chef/provider/remote_file/cache_control_data.rb +165 -0
  228. data/lib/chef/provider/remote_file/content.rb +75 -0
  229. data/lib/chef/provider/remote_file/fetcher.rb +43 -0
  230. data/lib/chef/provider/remote_file/ftp.rb +183 -0
  231. data/lib/chef/provider/remote_file/http.rb +124 -0
  232. data/lib/chef/provider/remote_file/local_file.rb +47 -0
  233. data/lib/chef/provider/route.rb +6 -2
  234. data/lib/chef/provider/script.rb +14 -2
  235. data/lib/chef/provider/service/macosx.rb +16 -10
  236. data/lib/chef/provider/service/solaris.rb +6 -5
  237. data/lib/chef/provider/template.rb +16 -78
  238. data/lib/chef/provider/template/content.rb +61 -0
  239. data/lib/chef/provider/user/solaris.rb +90 -0
  240. data/lib/chef/provider/user/useradd.rb +76 -63
  241. data/lib/chef/provider/windows_script.rb +73 -0
  242. data/lib/chef/providers.rb +16 -0
  243. data/lib/chef/resource.rb +23 -2
  244. data/lib/chef/resource/batch.rb +31 -0
  245. data/lib/chef/resource/conditional.rb +4 -0
  246. data/lib/chef/resource/conditional_action_not_nothing.rb +48 -0
  247. data/lib/chef/resource/file.rb +31 -3
  248. data/lib/chef/resource/link.rb +17 -0
  249. data/lib/chef/resource/lwrp_base.rb +1 -1
  250. data/lib/chef/resource/mount.rb +29 -2
  251. data/lib/chef/resource/powershell_script.rb +31 -0
  252. data/lib/chef/resource/remote_file.rb +47 -1
  253. data/lib/chef/resource/route.rb +1 -1
  254. data/lib/chef/resource/template.rb +145 -0
  255. data/lib/chef/resource/windows_script.rb +62 -0
  256. data/lib/chef/resource_collection.rb +45 -11
  257. data/lib/chef/resource_reporter.rb +81 -52
  258. data/lib/chef/resources.rb +2 -0
  259. data/lib/chef/rest.rb +13 -4
  260. data/lib/chef/rest/rest_request.rb +5 -1
  261. data/lib/chef/run_context/cookbook_compiler.rb +3 -3
  262. data/lib/chef/run_list/run_list_expansion.rb +1 -1
  263. data/lib/chef/run_lock.rb +7 -1
  264. data/lib/chef/runner.rb +0 -1
  265. data/lib/chef/scan_access_control.rb +6 -1
  266. data/lib/chef/search/query.rb +2 -2
  267. data/lib/chef/shell/shell_session.rb +2 -2
  268. data/lib/chef/util/backup.rb +84 -0
  269. data/lib/chef/util/diff.rb +145 -0
  270. data/lib/chef/util/file_edit.rb +1 -1
  271. data/lib/chef/util/selinux.rb +100 -0
  272. data/lib/chef/util/windows/net_user.rb +14 -1
  273. data/lib/chef/util/windows/volume.rb +2 -2
  274. data/lib/chef/version.rb +1 -1
  275. data/lib/chef/version/platform.rb +42 -0
  276. data/lib/chef/version_class.rb +1 -1
  277. data/lib/chef/version_constraint.rb +6 -5
  278. data/lib/chef/version_constraint/platform.rb +26 -0
  279. data/lib/chef/win32/api/file.rb +8 -2
  280. data/lib/chef/win32/version.rb +25 -8
  281. data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -0
  282. data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -0
  283. data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -0
  284. data/spec/data/apt/chef-integration-test-1.0/debian/copyright +34 -0
  285. data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -0
  286. data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -0
  287. data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -0
  288. data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -0
  289. data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -0
  290. data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -0
  291. data/spec/data/apt/chef-integration-test-1.1/debian/copyright +34 -0
  292. data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -0
  293. data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -0
  294. data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -0
  295. data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -0
  296. data/spec/data/apt/chef-integration-test_1.0-1_amd64.deb +0 -0
  297. data/spec/data/apt/chef-integration-test_1.0.orig.tar.gz +0 -0
  298. data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -0
  299. data/spec/data/apt/chef-integration-test_1.1-1_amd64.deb +0 -0
  300. data/spec/data/apt/chef-integration-test_1.1.orig.tar.gz +0 -0
  301. data/spec/data/apt/var/www/apt/conf/distributions +7 -0
  302. data/spec/data/apt/var/www/apt/conf/incoming +4 -0
  303. data/spec/data/apt/var/www/apt/conf/pulls +3 -0
  304. data/spec/data/apt/var/www/apt/db/checksums.db +0 -0
  305. data/spec/data/apt/var/www/apt/db/contents.cache.db +0 -0
  306. data/spec/data/apt/var/www/apt/db/packages.db +0 -0
  307. data/spec/data/apt/var/www/apt/db/references.db +0 -0
  308. data/spec/data/apt/var/www/apt/db/release.caches.db +0 -0
  309. data/spec/data/apt/var/www/apt/db/version +4 -0
  310. data/spec/data/apt/var/www/apt/dists/sid/Release +19 -0
  311. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -0
  312. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages.gz +0 -0
  313. data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -0
  314. data/spec/data/apt/var/www/apt/dists/sid/main/binary-i386/Packages +0 -0
  315. data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.0-1_amd64.deb +0 -0
  316. data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb +0 -0
  317. data/spec/data/bootstrap/encrypted_data_bag_secret +1 -0
  318. data/spec/data/bootstrap/secret.erb +9 -0
  319. data/spec/data/cookbooks/ignorken/recipes/default.rb +1 -0
  320. data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +2 -0
  321. data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -0
  322. data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +1 -0
  323. data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -0
  324. data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -0
  325. data/spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb +4 -0
  326. data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -0
  327. data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -0
  328. data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -0
  329. data/spec/data/cookbooks/openldap/templates/default/some_windows_line_endings.erb +4 -0
  330. data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -0
  331. data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -0
  332. data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -0
  333. data/spec/data/git_bundles/example-repo.gitbundle +0 -0
  334. data/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb +0 -0
  335. data/spec/data/knife_subcommand/test_yourself.rb +8 -0
  336. data/spec/data/null_config.rb +1 -0
  337. data/spec/data/partial_one.erb +1 -1
  338. data/spec/data/remote_file/nyan_cat.png.gz +0 -0
  339. data/spec/functional/file_content_management/deploy_strategies_spec.rb +238 -0
  340. data/spec/functional/knife/exec_spec.rb +2 -2
  341. data/spec/functional/provider/remote_file/cache_control_data_spec.rb +101 -0
  342. data/spec/functional/resource/batch_spec.rb +64 -0
  343. data/spec/functional/resource/cookbook_file_spec.rb +2 -3
  344. data/spec/functional/resource/deploy_revision_spec.rb +180 -0
  345. data/spec/functional/resource/directory_spec.rb +2 -2
  346. data/spec/functional/resource/file_spec.rb +17 -1
  347. data/spec/functional/resource/git_spec.rb +259 -0
  348. data/spec/functional/resource/link_spec.rb +422 -388
  349. data/spec/functional/resource/package_spec.rb +297 -0
  350. data/spec/functional/resource/powershell_spec.rb +188 -0
  351. data/spec/functional/resource/registry_spec.rb +8 -4
  352. data/spec/functional/resource/remote_directory_spec.rb +2 -2
  353. data/spec/functional/resource/remote_file_spec.rb +97 -29
  354. data/spec/functional/resource/template_spec.rb +173 -17
  355. data/spec/functional/resource/user_spec.rb +547 -0
  356. data/spec/functional/run_lock_spec.rb +5 -0
  357. data/spec/functional/shell_spec.rb +2 -1
  358. data/spec/functional/win32/service_manager_spec.rb +269 -0
  359. data/spec/functional/win32/versions_spec.rb +78 -0
  360. data/spec/integration/knife/chef_repo_path_spec.rb +805 -0
  361. data/spec/integration/knife/chef_repository_file_system_spec.rb +276 -0
  362. data/spec/integration/knife/chefignore_spec.rb +271 -0
  363. data/spec/integration/knife/delete_spec.rb +944 -0
  364. data/spec/integration/knife/deps_spec.rb +648 -0
  365. data/spec/integration/knife/diff_spec.rb +536 -0
  366. data/spec/integration/knife/download_spec.rb +962 -0
  367. data/spec/integration/knife/list_spec.rb +633 -0
  368. data/spec/integration/knife/raw_spec.rb +166 -0
  369. data/spec/integration/knife/redirection_spec.rb +57 -0
  370. data/spec/integration/knife/show_spec.rb +158 -0
  371. data/spec/integration/knife/upload_spec.rb +1060 -0
  372. data/spec/integration/solo/solo_spec.rb +41 -0
  373. data/spec/spec_helper.rb +55 -1
  374. data/spec/support/chef_helpers.rb +32 -0
  375. data/spec/support/platform_helpers.rb +40 -0
  376. data/spec/support/platforms/win32/spec_service.rb +59 -0
  377. data/spec/support/shared/functional/directory_resource.rb +43 -16
  378. data/spec/support/shared/functional/file_resource.rb +661 -20
  379. data/spec/support/shared/functional/securable_resource.rb +109 -8
  380. data/spec/support/shared/functional/securable_resource_with_reporting.rb +39 -31
  381. data/spec/support/shared/integration/integration_helper.rb +166 -0
  382. data/spec/support/shared/integration/knife_support.rb +171 -0
  383. data/spec/support/shared/unit/execute_resource.rb +125 -0
  384. data/spec/support/shared/unit/file_system_support.rb +8 -48
  385. data/spec/support/shared/unit/provider/file.rb +609 -0
  386. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +407 -0
  387. data/spec/support/shared/unit/script_resource.rb +52 -0
  388. data/spec/support/shared/unit/windows_script_resource.rb +48 -0
  389. data/spec/tiny_server.rb +13 -11
  390. data/spec/unit/application/client_spec.rb +39 -1
  391. data/spec/unit/application/knife_spec.rb +12 -0
  392. data/spec/unit/application/solo_spec.rb +1 -1
  393. data/spec/unit/application_spec.rb +57 -2
  394. data/spec/unit/chef_fs/diff_spec.rb +30 -31
  395. data/spec/unit/chef_fs/file_pattern_spec.rb +2 -2
  396. data/spec/unit/chef_fs/file_system_spec.rb +2 -3
  397. data/spec/unit/client_spec.rb +20 -1
  398. data/spec/unit/config_spec.rb +70 -52
  399. data/spec/unit/cookbook/synchronizer_spec.rb +49 -1
  400. data/spec/unit/cookbook/syntax_check_spec.rb +28 -3
  401. data/spec/unit/cookbook_loader_spec.rb +3 -2
  402. data/spec/unit/daemon_spec.rb +7 -7
  403. data/spec/unit/data_bag_spec.rb +7 -0
  404. data/spec/unit/deprecation_spec.rb +86 -0
  405. data/spec/unit/encrypted_data_bag_item_spec.rb +183 -88
  406. data/spec/unit/environment_spec.rb +98 -0
  407. data/spec/unit/exceptions_spec.rb +6 -1
  408. data/spec/unit/file_access_control_spec.rb +21 -1
  409. data/spec/unit/file_content_management/deploy/cp_spec.rb +46 -0
  410. data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +103 -0
  411. data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +179 -0
  412. data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +38 -2
  413. data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -2
  414. data/spec/unit/knife/bootstrap_spec.rb +128 -29
  415. data/spec/unit/knife/configure_spec.rb +42 -26
  416. data/spec/unit/knife/cookbook_download_spec.rb +24 -3
  417. data/spec/unit/knife/cookbook_upload_spec.rb +8 -4
  418. data/spec/unit/knife/core/bootstrap_context_spec.rb +78 -61
  419. data/spec/unit/knife/core/subcommand_loader_spec.rb +20 -0
  420. data/spec/unit/knife/core/ui_spec.rb +41 -0
  421. data/spec/unit/knife/node_run_list_set_spec.rb +140 -0
  422. data/spec/unit/knife_spec.rb +21 -0
  423. data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +1 -0
  424. data/spec/unit/mixin/params_validate_spec.rb +35 -0
  425. data/spec/unit/mixin/template_spec.rb +69 -57
  426. data/spec/unit/mixin/windows_architecture_helper_spec.rb +83 -0
  427. data/spec/unit/node_spec.rb +7 -0
  428. data/spec/unit/platform_spec.rb +15 -1
  429. data/spec/unit/provider/cookbook_file/content_spec.rb +40 -0
  430. data/spec/unit/provider/cookbook_file_spec.rb +26 -183
  431. data/spec/unit/provider/cron/solaris_spec.rb +1 -1
  432. data/spec/unit/provider/deploy/revision_spec.rb +19 -11
  433. data/spec/unit/provider/deploy_spec.rb +2 -2
  434. data/spec/unit/provider/directory_spec.rb +23 -23
  435. data/spec/unit/provider/execute_spec.rb +27 -1
  436. data/spec/unit/provider/file/content_spec.rb +101 -0
  437. data/spec/unit/provider/file_spec.rb +25 -484
  438. data/spec/unit/provider/git_spec.rb +224 -28
  439. data/spec/unit/provider/group/usermod_spec.rb +3 -1
  440. data/spec/unit/provider/ifconfig/debian_spec.rb +89 -0
  441. data/spec/unit/provider/ifconfig/redhat_spec.rb +71 -0
  442. data/spec/unit/provider/ifconfig_spec.rb +0 -33
  443. data/spec/unit/provider/mount/mount_spec.rb +33 -2
  444. data/spec/unit/provider/mount/windows_spec.rb +4 -1
  445. data/spec/unit/provider/mount_spec.rb +16 -6
  446. data/spec/unit/provider/package/portage_spec.rb +44 -0
  447. data/spec/unit/provider/package/rubygems_spec.rb +44 -1
  448. data/spec/unit/provider/package/smartos_spec.rb +3 -2
  449. data/spec/unit/provider/package/yum_spec.rb +36 -39
  450. data/spec/unit/provider/package/zypper_spec.rb +84 -22
  451. data/spec/unit/provider/package_spec.rb +0 -4
  452. data/spec/unit/provider/powershell_spec.rb +38 -0
  453. data/spec/unit/provider/remote_directory_spec.rb +0 -4
  454. data/spec/unit/provider/remote_file/cache_control_data_spec.rb +211 -0
  455. data/spec/unit/provider/remote_file/content_spec.rb +230 -0
  456. data/spec/unit/provider/remote_file/fetcher_spec.rb +75 -0
  457. data/spec/unit/provider/remote_file/ftp_spec.rb +224 -0
  458. data/spec/unit/provider/remote_file/http_spec.rb +319 -0
  459. data/spec/unit/provider/remote_file/local_file_spec.rb +60 -0
  460. data/spec/unit/provider/remote_file_spec.rb +33 -295
  461. data/spec/unit/provider/route_spec.rb +25 -9
  462. data/spec/unit/provider/service/macosx_spec.rb +176 -152
  463. data/spec/unit/provider/service/solaris_smf_service_spec.rb +21 -18
  464. data/spec/unit/provider/service/systemd_service_spec.rb +2 -2
  465. data/spec/unit/provider/service/upstart_service_spec.rb +2 -2
  466. data/spec/unit/provider/service_spec.rb +3 -3
  467. data/spec/unit/provider/template/content_spec.rb +78 -0
  468. data/spec/unit/provider/template_spec.rb +52 -184
  469. data/spec/unit/provider/user/solaris_spec.rb +80 -0
  470. data/spec/unit/provider/user/useradd_spec.rb +12 -358
  471. data/spec/unit/resource/batch_spec.rb +48 -0
  472. data/spec/unit/resource/conditional_action_not_nothing_spec.rb +45 -0
  473. data/spec/unit/resource/execute_spec.rb +3 -101
  474. data/spec/unit/resource/file_spec.rb +0 -5
  475. data/spec/unit/resource/group_spec.rb +9 -0
  476. data/spec/unit/resource/ifconfig_spec.rb +60 -1
  477. data/spec/unit/resource/link_spec.rb +1 -0
  478. data/spec/unit/resource/mount_spec.rb +37 -0
  479. data/spec/unit/resource/powershell_spec.rb +48 -0
  480. data/spec/unit/resource/remote_file_spec.rb +44 -4
  481. data/spec/unit/resource/route_spec.rb +1 -1
  482. data/spec/unit/resource/script_spec.rb +13 -36
  483. data/spec/unit/resource/template_spec.rb +111 -8
  484. data/spec/unit/resource/user_spec.rb +7 -0
  485. data/spec/unit/resource_collection_spec.rb +61 -32
  486. data/spec/unit/resource_reporter_spec.rb +115 -102
  487. data/spec/unit/resource_spec.rb +170 -1
  488. data/spec/unit/rest/auth_credentials_spec.rb +2 -2
  489. data/spec/unit/rest_spec.rb +6 -2
  490. data/spec/unit/run_context/cookbook_compiler_spec.rb +9 -0
  491. data/spec/unit/runner_spec.rb +1 -1
  492. data/spec/unit/scan_access_control_spec.rb +4 -2
  493. data/spec/unit/shell/shell_session_spec.rb +15 -2
  494. data/spec/unit/util/backup_spec.rb +149 -0
  495. data/spec/unit/util/diff_spec.rb +596 -0
  496. data/spec/unit/util/selinux_spec.rb +172 -0
  497. data/spec/unit/version/platform_spec.rb +61 -0
  498. data/spec/unit/version_constraint/platform_spec.rb +46 -0
  499. data/spec/unit/version_constraint_spec.rb +5 -0
  500. metadata +233 -10
  501. data/lib/chef/chef_fs/file_system/data_bag_item.rb +0 -59
  502. data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +0 -237
  503. data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +0 -568
  504. data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +0 -220
@@ -0,0 +1,596 @@
1
+ #
2
+ # Author:: Lamont Granquist (<lamont@opscode.com>)
3
+ # Copyright:: Copyright (c) 2013 Opscode, Inc.
4
+ # License:: Apache License, Version 2.0
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+ #
18
+
19
+
20
+ require 'spec_helper'
21
+ require 'tmpdir'
22
+
23
+ describe Chef::Util::Diff, :uses_diff => true do
24
+ before(:all) do
25
+ @original_config = Chef::Config.hash_dup
26
+ end
27
+
28
+ after(:all) do
29
+ Chef::Config.configuration = @original_config if @original_config
30
+ end
31
+
32
+ let!(:old_tempfile) { Tempfile.new("chef-util-diff-spec") }
33
+ let!(:new_tempfile) { Tempfile.new("chef-util-diff-spec") }
34
+ let!(:old_file) { old_tempfile.path }
35
+ let!(:new_file) { new_tempfile.path }
36
+
37
+ let(:plain_ascii) { "This is a text file.\nWith more than one line.\nAnd a \tTab.\nAnd lets make sure that other printable chars work too: ~!@\#$%^&*()`:\"<>?{}|_+,./;'[]\\-=\n" }
38
+ # these are all byte sequences that are illegal in the other encodings... (but they may legally transcode)
39
+ let(:utf_8) { "testing utf-8 unicode...\n\n\non a new line: \xE2\x80\x93\n" } # unicode em-dash
40
+ let(:latin_1) { "It is more metal.\nif you have an \xFDmlaut.\n" } # NB: changed to y-with-diaresis, but i'm American so I don't know the difference
41
+ let(:shift_jis) { "I have no idea what this character is:\n \x83\x80.\n" } # seriously, no clue, but \x80 is nice and illegal in other encodings
42
+
43
+ let(:differ) do # subject
44
+ differ = Chef::Util::Diff.new
45
+ differ.diff(old_file, new_file)
46
+ differ
47
+ end
48
+
49
+ it "should return a Chef::Util::Diff" do
50
+ expect(differ).to be_a_kind_of(Chef::Util::Diff)
51
+ end
52
+
53
+ it "produces a diff even if the old_file does not exist" do
54
+ old_tempfile.close
55
+ old_tempfile.unlink
56
+ expect(differ.for_output).to eql(["(no diff)"])
57
+ end
58
+
59
+ it "produces a diff even if the new_file does not exist" do
60
+ new_tempfile.close
61
+ new_tempfile.unlink
62
+ expect(differ.for_output).to eql(["(no diff)"])
63
+ end
64
+
65
+ describe "when the two files exist with no content" do
66
+ it "calling for_output should return the error message" do
67
+ expect(differ.for_output).to eql(["(no diff)"])
68
+ end
69
+
70
+ it "calling for_reporting should be nil" do
71
+ expect(differ.for_reporting).to be_nil
72
+ end
73
+ end
74
+
75
+ describe "when diffs are disabled" do
76
+ before do
77
+ Chef::Config[:diff_disabled] = true
78
+ end
79
+
80
+ after do
81
+ Chef::Config[:diff_disabled] = false
82
+ end
83
+
84
+ it "calling for_output should return the error message" do
85
+ expect(differ.for_output).to eql( [ "(diff output suppressed by config)" ] )
86
+ end
87
+
88
+ it "calling for_reporting should be nil" do
89
+ expect(differ.for_reporting).to be_nil
90
+ end
91
+ end
92
+
93
+ describe "when the old_file has binary content" do
94
+ before do
95
+ old_tempfile.write("\x01\xff")
96
+ old_tempfile.close
97
+ end
98
+
99
+ it "calling for_output should return the error message" do
100
+ expect(differ.for_output).to eql( [ "(current file is binary, diff output suppressed)" ] )
101
+ end
102
+
103
+ it "calling for_reporting should be nil" do
104
+ expect(differ.for_reporting).to be_nil
105
+ end
106
+ end
107
+
108
+ describe "when the new_file has binary content" do
109
+ before do
110
+ new_tempfile.write("\x01\xff")
111
+ new_tempfile.close
112
+ end
113
+
114
+ it "calling for_output should return the error message" do
115
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
116
+ end
117
+
118
+ it "calling for_reporting should be nil" do
119
+ expect(differ.for_reporting).to be_nil
120
+ end
121
+ end
122
+
123
+ describe "when the default external encoding is UTF-8", :ruby_gte_19_only do
124
+
125
+ before do
126
+ @saved_default_external = Encoding.default_external
127
+ Encoding.default_external = Encoding::UTF_8
128
+ end
129
+
130
+ after do
131
+ Encoding.default_external = @saved_default_external
132
+ end
133
+
134
+ describe "when a file has ASCII text" do
135
+ before do
136
+ new_tempfile.write(plain_ascii)
137
+ new_tempfile.close
138
+ end
139
+ it "calling for_output should return a valid diff" do
140
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
141
+ end
142
+ it "calling for_reporting should return a utf-8 string" do
143
+ expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
144
+ end
145
+ end
146
+
147
+ describe "when a file has UTF-8 text" do
148
+ before do
149
+ new_tempfile.write(utf_8)
150
+ new_tempfile.close
151
+ end
152
+ it "calling for_output should return a valid diff" do
153
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
154
+ end
155
+ it "calling for_reporting should return a utf-8 string" do
156
+ expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
157
+ end
158
+ end
159
+
160
+ describe "when a file has Latin-1 text" do
161
+ before do
162
+ new_tempfile.write(latin_1)
163
+ new_tempfile.close
164
+ end
165
+ it "calling for_output should complain that the content is binary" do
166
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
167
+ end
168
+ it "calling for_reporting should be nil" do
169
+ expect(differ.for_reporting).to be_nil
170
+ end
171
+ end
172
+
173
+ describe "when a file has Shift-JIS text" do
174
+ before do
175
+ new_tempfile.write(shift_jis)
176
+ new_tempfile.close
177
+ end
178
+ it "calling for_output should complain that the content is binary" do
179
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
180
+ end
181
+ it "calling for_reporting should be nil" do
182
+ expect(differ.for_reporting).to be_nil
183
+ end
184
+ end
185
+
186
+ end
187
+
188
+ describe "when the default external encoding is Latin-1", :ruby_gte_19_only do
189
+
190
+ before do
191
+ @saved_default_external = Encoding.default_external
192
+ Encoding.default_external = Encoding::ISO_8859_1
193
+ end
194
+
195
+ after do
196
+ Encoding.default_external = @saved_default_external
197
+ end
198
+
199
+ describe "when a file has ASCII text" do
200
+ before do
201
+ new_tempfile.write(plain_ascii)
202
+ new_tempfile.close
203
+ end
204
+ it "calling for_output should return a valid diff" do
205
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
206
+ end
207
+ it "calling for_reporting should return a utf-8 string" do
208
+ expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
209
+ end
210
+ end
211
+
212
+ describe "when a file has UTF-8 text" do
213
+ before do
214
+ new_tempfile.write(utf_8)
215
+ new_tempfile.close
216
+ end
217
+ it "calling for_output should complain that the content is binary" do
218
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
219
+ end
220
+ it "calling for_reporting should be nil" do
221
+ expect(differ.for_reporting).to be_nil
222
+ end
223
+ end
224
+
225
+ describe "when a file has Latin-1 text" do
226
+ before do
227
+ new_tempfile.write(latin_1)
228
+ new_tempfile.close
229
+ end
230
+ it "calling for_output should return a valid diff" do
231
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
232
+ end
233
+ it "calling for_reporting should return a utf-8 string" do
234
+ expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
235
+ end
236
+ end
237
+
238
+ describe "when a file has Shift-JIS text" do
239
+ before do
240
+ new_tempfile.write(shift_jis)
241
+ new_tempfile.close
242
+ end
243
+ it "calling for_output should complain that the content is binary" do
244
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
245
+ end
246
+ it "calling for_reporting should be nil" do
247
+ expect(differ.for_reporting).to be_nil
248
+ end
249
+ end
250
+
251
+ end
252
+ describe "when the default external encoding is Shift_JIS", :ruby_gte_19_only do
253
+
254
+ before do
255
+ @saved_default_external = Encoding.default_external
256
+ Encoding.default_external = Encoding::Shift_JIS
257
+ end
258
+
259
+ after do
260
+ Encoding.default_external = @saved_default_external
261
+ end
262
+
263
+ describe "when a file has ASCII text" do
264
+ before do
265
+ new_tempfile.write(plain_ascii)
266
+ new_tempfile.close
267
+ end
268
+ it "calling for_output should return a valid diff" do
269
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
270
+ end
271
+ it "calling for_reporting should return a utf-8 string" do
272
+ expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
273
+ end
274
+ end
275
+
276
+ describe "when a file has UTF-8 text" do
277
+ before do
278
+ new_tempfile.write(utf_8)
279
+ new_tempfile.close
280
+ end
281
+ it "calling for_output should complain that the content is binary" do
282
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
283
+ end
284
+ it "calling for_reporting should be nil" do
285
+ expect(differ.for_reporting).to be_nil
286
+ end
287
+ end
288
+
289
+ describe "when a file has Latin-1 text" do
290
+ before do
291
+ new_tempfile.write(latin_1)
292
+ new_tempfile.close
293
+ end
294
+ it "calling for_output should complain that the content is binary" do
295
+ expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
296
+ end
297
+ it "calling for_reporting should be nil" do
298
+ expect(differ.for_reporting).to be_nil
299
+ end
300
+ end
301
+
302
+ describe "when a file has Shift-JIS text" do
303
+ before do
304
+ new_tempfile.write(shift_jis)
305
+ new_tempfile.close
306
+ end
307
+ it "calling for_output should return a valid diff" do
308
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
309
+ end
310
+ it "calling for_reporting should return a utf-8 string" do
311
+ expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
312
+ end
313
+ end
314
+
315
+ end
316
+
317
+ describe "when testing the diff_filesize_threshold" do
318
+ before do
319
+ @diff_filesize_threshold_saved = Chef::Config[:diff_filesize_threshold]
320
+ Chef::Config[:diff_filesize_threshold] = 10
321
+ end
322
+
323
+ after do
324
+ Chef::Config[:diff_filesize_threshold] = @diff_filesize_threshold_saved
325
+ end
326
+
327
+ describe "when the old_file goes over the threshold" do
328
+ before do
329
+ old_tempfile.write("But thats what you get when Wu-Tang raised you")
330
+ old_tempfile.close
331
+ end
332
+
333
+ it "calling for_output should return the error message" do
334
+ expect(differ.for_output).to eql( [ "(file sizes exceed 10 bytes, diff output suppressed)" ])
335
+ end
336
+
337
+ it "calling for_reporting should be nil" do
338
+ expect(differ.for_reporting).to be_nil
339
+ end
340
+ end
341
+
342
+ describe "when the new_file goes over the threshold" do
343
+ before do
344
+ new_tempfile.write("But thats what you get when Wu-Tang raised you")
345
+ new_tempfile.close
346
+ end
347
+
348
+ it "calling for_output should return the error message" do
349
+ expect(differ.for_output).to eql( [ "(file sizes exceed 10 bytes, diff output suppressed)" ])
350
+ end
351
+
352
+ it "calling for_reporting should be nil" do
353
+ expect(differ.for_reporting).to be_nil
354
+ end
355
+ end
356
+ end
357
+
358
+ describe "when generating a valid diff" do
359
+ before do
360
+ old_tempfile.write("foo")
361
+ old_tempfile.close
362
+ new_tempfile.write("bar")
363
+ new_tempfile.close
364
+ end
365
+
366
+ it "calling for_output should return a unified diff" do
367
+ differ.for_output.size.should eql(5)
368
+ differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
369
+ end
370
+
371
+ it "calling for_reporting should return a unified diff" do
372
+ differ.for_reporting.should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
373
+ end
374
+
375
+ describe "when the diff output is too long" do
376
+
377
+ before do
378
+ @diff_output_threshold_saved = Chef::Config[:diff_output_threshold]
379
+ Chef::Config[:diff_output_threshold] = 10
380
+ end
381
+
382
+ after do
383
+ Chef::Config[:diff_output_threshold] = @diff_output_threshold_saved
384
+ end
385
+
386
+ it "calling for_output should return the error message" do
387
+ expect(differ.for_output).to eql(["(long diff of over 10 characters, diff output suppressed)"])
388
+ end
389
+
390
+ it "calling for_reporting should be nil" do
391
+ expect(differ.for_reporting).to be_nil
392
+ end
393
+ end
394
+ end
395
+
396
+ describe "when errors are thrown from shell_out" do
397
+ before do
398
+ differ.stub!(:shell_out).and_raise('boom')
399
+ differ.diff(old_file, new_file)
400
+ end
401
+
402
+ it "calling for_output should return the error message" do
403
+ expect(differ.for_output).to eql(["Could not determine diff. Error: boom"])
404
+ end
405
+
406
+ it "calling for_reporting should be nil" do
407
+ expect(differ.for_reporting).to be_nil
408
+ end
409
+ end
410
+
411
+ describe "when shell_out returns stderr output" do
412
+ before do
413
+ @result = mock('result', :stdout => "", :stderr => "boom")
414
+ differ.stub!(:shell_out).and_return(@result)
415
+ differ.diff(old_file, new_file)
416
+ end
417
+
418
+ it "calling for_output should return the error message" do
419
+ expect(differ.for_output).to eql(["Could not determine diff. Error: boom"])
420
+ end
421
+
422
+ it "calling for_reporting should be nil" do
423
+ expect(differ.for_reporting).to be_nil
424
+ end
425
+ end
426
+
427
+ describe "when checking if files are binary or text" do
428
+
429
+ it "should identify zero-length files as text" do
430
+ Tempfile.open("chef-util-diff-spec") do |file|
431
+ file.close
432
+ differ.send(:is_binary?, file.path).should be_false
433
+ end
434
+ end
435
+
436
+ it "should identify text files as text" do
437
+ Tempfile.open("chef-util-diff-spec") do |file|
438
+ file.write(plain_ascii)
439
+ file.close
440
+ differ.send(:is_binary?, file.path).should be_false
441
+ end
442
+ end
443
+
444
+ it "should identify a null-terminated string files as binary" do
445
+ Tempfile.open("chef-util-diff-spec") do |file|
446
+ file.write("This is a binary file.\0")
447
+ file.close
448
+ differ.send(:is_binary?, file.path).should be_true
449
+ end
450
+ end
451
+
452
+ it "should identify null-teriminated multi-line string files as binary" do
453
+ Tempfile.open("chef-util-diff-spec") do |file|
454
+ file.write("This is a binary file.\nNo Really\nit is\0")
455
+ file.close
456
+ differ.send(:is_binary?, file.path).should be_true
457
+ end
458
+ end
459
+
460
+ describe "when the default external encoding is UTF-8", :ruby_gte_19_only do
461
+
462
+ before do
463
+ @saved_default_external = Encoding.default_external
464
+ Encoding.default_external = Encoding::UTF_8
465
+ end
466
+
467
+ after do
468
+ Encoding.default_external = @saved_default_external
469
+ end
470
+
471
+ it "should identify normal ASCII as text" do
472
+ Tempfile.open("chef-util-diff-spec") do |file|
473
+ file.write(plain_ascii)
474
+ file.close
475
+ differ.send(:is_binary?, file.path).should be_false
476
+ end
477
+ end
478
+
479
+ it "should identify UTF-8 as text" do
480
+ Tempfile.open("chef-util-diff-spec") do |file|
481
+ file.write(utf_8)
482
+ file.close
483
+ differ.send(:is_binary?, file.path).should be_false
484
+ end
485
+ end
486
+
487
+ it "should identify Latin-1 that is invalid UTF-8 as binary" do
488
+ Tempfile.open("chef-util-diff-spec") do |file|
489
+ file.write(latin_1)
490
+ file.close
491
+ differ.send(:is_binary?, file.path).should be_true
492
+ end
493
+ end
494
+
495
+ it "should identify Shift-JIS that is invalid UTF-8 as binary" do
496
+ Tempfile.open("chef-util-diff-spec") do |file|
497
+ file.write(shift_jis)
498
+ file.close
499
+ differ.send(:is_binary?, file.path).should be_true
500
+ end
501
+ end
502
+
503
+ end
504
+
505
+ describe "when the default external encoding is Latin-1", :ruby_gte_19_only do
506
+
507
+ before do
508
+ @saved_default_external = Encoding.default_external
509
+ Encoding.default_external = Encoding::ISO_8859_1
510
+ end
511
+
512
+ after do
513
+ Encoding.default_external = @saved_default_external
514
+ end
515
+
516
+ it "should identify normal ASCII as text" do
517
+ Tempfile.open("chef-util-diff-spec") do |file|
518
+ file.write(plain_ascii)
519
+ file.close
520
+ differ.send(:is_binary?, file.path).should be_false
521
+ end
522
+ end
523
+
524
+ it "should identify UTF-8 that is invalid Latin-1 as binary" do
525
+ Tempfile.open("chef-util-diff-spec") do |file|
526
+ file.write(utf_8)
527
+ file.close
528
+ differ.send(:is_binary?, file.path).should be_true
529
+ end
530
+ end
531
+
532
+ it "should identify Latin-1 as text" do
533
+ Tempfile.open("chef-util-diff-spec") do |file|
534
+ file.write(latin_1)
535
+ file.close
536
+ differ.send(:is_binary?, file.path).should be_false
537
+ end
538
+ end
539
+
540
+ it "should identify Shift-JIS that is invalid Latin-1 as binary" do
541
+ Tempfile.open("chef-util-diff-spec") do |file|
542
+ file.write(shift_jis)
543
+ file.close
544
+ differ.send(:is_binary?, file.path).should be_true
545
+ end
546
+ end
547
+ end
548
+
549
+ describe "when the default external encoding is Shift-JIS", :ruby_gte_19_only do
550
+
551
+ before do
552
+ @saved_default_external = Encoding.default_external
553
+ Encoding.default_external = Encoding::Shift_JIS
554
+ end
555
+
556
+ after do
557
+ Encoding.default_external = @saved_default_external
558
+ end
559
+
560
+ it "should identify normal ASCII as text" do
561
+ Tempfile.open("chef-util-diff-spec") do |file|
562
+ file.write(plain_ascii)
563
+ file.close
564
+ differ.send(:is_binary?, file.path).should be_false
565
+ end
566
+ end
567
+ it "should identify UTF-8 that is invalid Shift-JIS as binary" do
568
+ Tempfile.open("chef-util-diff-spec") do |file|
569
+ file.write(utf_8)
570
+ file.close
571
+ differ.send(:is_binary?, file.path).should be_true
572
+ end
573
+ end
574
+
575
+ it "should identify Latin-1 that is invalid Shift-JIS as binary" do
576
+ Tempfile.open("chef-util-diff-spec") do |file|
577
+ file.write(latin_1)
578
+ file.close
579
+ differ.send(:is_binary?, file.path).should be_true
580
+ end
581
+ end
582
+
583
+ it "should identify Shift-JIS as text" do
584
+ Tempfile.open("chef-util-diff-spec") do |file|
585
+ file.write(shift_jis)
586
+ file.close
587
+ differ.send(:is_binary?, file.path).should be_false
588
+ end
589
+ end
590
+
591
+ end
592
+ end
593
+
594
+ end
595
+
596
+