chef-dk 1.6.11 → 2.0.26

Sign up to get free protection for your applications and to get access to all the features.
Files changed (84) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +25 -38
  3. data/Gemfile.lock +199 -199
  4. data/README.md +4 -2
  5. data/Rakefile +1 -2
  6. data/acceptance/Gemfile +1 -1
  7. data/acceptance/Gemfile.lock +23 -21
  8. data/chef-dk.gemspec +4 -6
  9. data/lib/chef-dk/builtin_commands.rb +1 -1
  10. data/lib/chef-dk/chef_runner.rb +1 -1
  11. data/lib/chef-dk/cli.rb +1 -0
  12. data/lib/chef-dk/command/generate.rb +5 -2
  13. data/lib/chef-dk/command/generator_commands/helpers.rb +36 -0
  14. data/lib/chef-dk/command/generator_commands/{lwrp.rb → resource.rb} +4 -4
  15. data/lib/chef-dk/command/update.rb +11 -18
  16. data/lib/chef-dk/command/verify.rb +1 -16
  17. data/lib/chef-dk/commands_map.rb +3 -3
  18. data/lib/chef-dk/policyfile/artifactory_cookbook_source.rb +102 -0
  19. data/lib/chef-dk/policyfile/cookbook_location_specification.rb +2 -2
  20. data/lib/chef-dk/policyfile/cookbook_sources.rb +1 -0
  21. data/lib/chef-dk/policyfile/dsl.rb +10 -0
  22. data/lib/chef-dk/policyfile/solution_dependencies.rb +15 -1
  23. data/lib/chef-dk/policyfile_lock.rb +1 -1
  24. data/lib/chef-dk/policyfile_services/install.rb +30 -2
  25. data/lib/chef-dk/skeletons/code_generator/files/default/Berksfile +1 -0
  26. data/lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/test-fixture-recipe.rb +1 -0
  27. data/lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README.md +2 -2
  28. data/lib/chef-dk/skeletons/code_generator/files/default/delivery-config.json +3 -0
  29. data/lib/chef-dk/skeletons/code_generator/files/default/delivery-project.toml +1 -1
  30. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb +1 -0
  31. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/metadata.rb +2 -1
  32. data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb +1 -0
  33. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb +1 -0
  34. data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb +1 -0
  35. data/lib/chef-dk/skeletons/code_generator/metadata.rb +3 -2
  36. data/lib/chef-dk/skeletons/code_generator/recipes/app.rb +1 -1
  37. data/lib/chef-dk/skeletons/code_generator/recipes/attribute.rb +1 -0
  38. data/lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb +7 -12
  39. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb +1 -0
  40. data/lib/chef-dk/skeletons/code_generator/recipes/cookbook_file.rb +1 -0
  41. data/lib/chef-dk/skeletons/code_generator/recipes/helpers.rb +21 -0
  42. data/lib/chef-dk/skeletons/code_generator/recipes/policyfile.rb +1 -0
  43. data/lib/chef-dk/skeletons/code_generator/recipes/recipe.rb +1 -0
  44. data/lib/chef-dk/skeletons/code_generator/recipes/repo.rb +1 -0
  45. data/lib/chef-dk/skeletons/code_generator/recipes/{lwrp.rb → resource.rb} +1 -11
  46. data/lib/chef-dk/skeletons/code_generator/recipes/template.rb +3 -3
  47. data/lib/chef-dk/skeletons/code_generator/templates/default/helpers.rb.erb +39 -0
  48. data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb +1 -1
  49. data/lib/chef-dk/skeletons/code_generator/templates/default/resource.rb.erb +1 -0
  50. data/lib/chef-dk/version.rb +2 -2
  51. data/omnibus_overrides.rb +14 -12
  52. data/spec/unit/command/generator_commands/cookbook_spec.rb +7 -1
  53. data/spec/unit/command/generator_commands/helpers_spec.rb +31 -0
  54. data/spec/unit/command/generator_commands/{lwrp_spec.rb → resource_spec.rb} +5 -5
  55. data/spec/unit/command/install_spec.rb +2 -2
  56. data/spec/unit/command/update_spec.rb +11 -3
  57. data/spec/unit/command/verify_spec.rb +2 -1
  58. data/spec/unit/policyfile/artifactory_cookbook_source_spec.rb +59 -0
  59. data/spec/unit/policyfile/read_cookbook_for_compat_mode_upload_spec.rb +1 -1
  60. data/spec/unit/policyfile/solution_dependencies_spec.rb +25 -0
  61. data/spec/unit/policyfile_demands_spec.rb +2 -1
  62. data/spec/unit/policyfile_lock_build_spec.rb +23 -21
  63. data/spec/unit/policyfile_lock_install_spec.rb +2 -2
  64. data/spec/unit/policyfile_lock_validation_spec.rb +3 -3
  65. data/spec/unit/policyfile_services/export_repo_spec.rb +6 -6
  66. data/spec/unit/policyfile_services/install_spec.rb +1 -1
  67. data/spec/unit/policyfile_services/update_spec.rb +143 -0
  68. data/tasks/announce.rb +3 -2
  69. data/tasks/dependencies.rb +35 -111
  70. data/tasks/github_changelog_generator.rb +0 -3
  71. data/tasks/templates/prerelease.md.erb +1 -1
  72. data/tasks/templates/release.md.erb +1 -1
  73. metadata +20 -38
  74. data/lib/chef-dk/skeletons/code_generator/templates/default/provider.rb.erb +0 -0
  75. data/spec/unit/gemfile_util_spec.rb +0 -41
  76. data/spec/unit/helpers_spec.rb +0 -120
  77. data/spec/unit/tasks/helpers_spec.rb +0 -75
  78. data/tasks/bin/bundle-platform +0 -19
  79. data/tasks/bin/create-override-gemfile +0 -110
  80. data/tasks/bundle.rb +0 -96
  81. data/tasks/bundle_util.rb +0 -110
  82. data/tasks/gemfile_util.rb +0 -435
  83. data/tasks/helpers.rb +0 -47
  84. data/version_policy.rb +0 -142
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ef3a094e4cf456331c94b31a92a00222582dd125
4
- data.tar.gz: ad4f929e4cd5ce4c373163edf52822cf4afe4c8c
3
+ metadata.gz: 1dff22a233fa31d95ddc8f9c378a7139d27512c4
4
+ data.tar.gz: b9f03e35987d604d4dc2878c44d7c5ba5da3711a
5
5
  SHA512:
6
- metadata.gz: 24700b45fe87170100cd95b653b4516800a2284c4aef636abf7a750076b910f7ea072aa080d57ae815d4d6ba4d194b163e44111655c57ff9c5f7aa6289b69cad
7
- data.tar.gz: d82db9834b5a6e18fe96adce60e8735a5331acb1069dc05a36dfc98c93bfa519c82a174a5b0fb092afb3e9c374e57467860cc0b335b6fd18254fe27ed4380de3
6
+ metadata.gz: c8bb87919fcfb310d42226ba1d1799d8799d885778af3d8674ccbb5ae5fd8b25f3f07cefe87034331c66279683e9f6fe43cfb7c91f2b5a2a7821efa427a7a2fe
7
+ data.tar.gz: 94c0a5452c7174eea6a084122d4176c2504fae0edfcd64d15ed627d0ebb112b16647c0895267ccc59a079c6d164bd8dac57fd0ea6ef7de826e79e9d1e29dc987
data/Gemfile CHANGED
@@ -17,15 +17,9 @@
17
17
 
18
18
  source "https://rubygems.org"
19
19
 
20
- # Note we do not use the gemspec DSL which restricts to the
21
- # gemspec for the current platform and filters out other platforms
22
- # during a bundle lock operation. We actually want dependencies from
23
- # both of our gemspecs. Also note this this mimics gemspec behavior
24
- # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
25
- gem "chef-dk", path: "."
20
+ gemspec
26
21
 
27
- # EXPERIMENTAL: ALL gems specified here will be installed in chef-dk omnibus.
28
- # This represents all gems that will be part of chef-dk.
22
+ gem "bundler"
29
23
 
30
24
  group(:omnibus_package, :development, :test) do
31
25
  gem "rake"
@@ -34,42 +28,35 @@ group(:omnibus_package, :development, :test) do
34
28
  gem "yard"
35
29
  gem "dep_selector"
36
30
  gem "guard"
37
- gem "ruby-prof"
38
- gem "cookstyle", ">= 1.3.0", "< 2.0"
39
- gem "foodcritic", ">= 9.0"
31
+ gem "cookstyle", ">= 2.0.0"
32
+ gem "foodcritic", ">= 11.2"
40
33
  end
41
34
 
42
- # All software we recognize needs to stay at the latest possible version. But
43
- # since that's not expressible here, we make it >= the last *known* version to
44
- # at least prevent downgrades beyond that:
35
+ # We tend to track latest stable release without pinning.
36
+ # In order to prevent the depsolver from downgrading we pin some floors with ">=".
37
+ # We should only be using "~>" to work around bugs, or temporarily pinning some tech debt.
38
+ # We equality pin the chef gem itself to assert which version we're shipping.
45
39
  group(:omnibus_package) do
46
40
  gem "appbundler"
47
- gem "berkshelf", ">= 5.0"
48
- # Chef 12.8.1 Gem includes some extra files which can break gem installation on
49
- # windows. For now we are pulling chef from github at the tag as a workaround.
50
- gem "chef-provisioning", ">= 2.0"
41
+ gem "berkshelf", ">= 6.2"
42
+ gem "chef-provisioning", ">= 2.4.0"
51
43
  gem "chef-provisioning-aws", ">= 2.0"
52
44
  gem "chef-provisioning-azure", ">= 0.6.0"
53
45
  gem "chef-provisioning-fog", ">= 0.20.0"
54
- gem "chef-provisioning-vagrant", ">= 0.11.0"
55
- gem "chef-vault", "~> 2"
56
- # The chef version is pinned by "rake dependencies", which grabs the current version from omnibus.
57
- gem "chef", github: "chef/chef", branch: "v12.21.26"
58
- # Pinned cheffish to version 5.0.1 since the latest version 13.0.0 has
59
- # a dependency to ruby 2.3.3 but we are shipping ChefDK with ruby 2.3.1
60
- #
61
- # TODO: Remove this pin once we have solve the problem
62
- gem "cheffish", "= 5.0.1"
46
+ gem "chef-vault"
47
+ gem "chef", "= 13.2.20"
48
+ gem "cheffish", ">= 13.0"
63
49
  gem "chefspec"
64
50
  gem "fauxhai"
65
- gem "inspec", ">= 0.17.1"
51
+ gem "inspec", ">= 0.29.0"
66
52
  gem "kitchen-ec2"
67
- gem "kitchen-dokken", ">= 2.1.0"
53
+ gem "kitchen-dokken", ">= 2.5.0"
54
+ gem "kitchen-hyperv"
68
55
  gem "kitchen-inspec"
69
56
  gem "kitchen-vagrant"
70
57
  gem "knife-windows"
71
58
  gem "knife-opc", ">= 0.3.2"
72
- gem "ohai", ">= 8.13.0"
59
+ gem "ohai", ">= 13.1.0"
73
60
  gem "test-kitchen"
74
61
  gem "listen"
75
62
  gem "dco"
@@ -78,15 +65,14 @@ group(:omnibus_package) do
78
65
  gem "chef-sugar"
79
66
  gem "mixlib-versioning"
80
67
  gem "artifactory"
81
- # The opscode-pushy-client version is pinned by "rake dependencies", which grabs the current version from omnibus.
82
- gem "opscode-pushy-client", github: "chef/opscode-pushy-client", branch: "2.4.5"
68
+ gem "opscode-pushy-client", ">= 2.3.0"
83
69
  gem "ffi-rzmq-core"
84
70
  gem "knife-push"
85
71
 
86
72
  # All of the following used to be software definitions we included:
87
73
  gem "knife-spork"
88
74
  gem "dep-selector-libgecode"
89
- # gem "nokogiri"
75
+ gem "nokogiri"
90
76
  gem "pry-byebug"
91
77
  gem "pry-remote"
92
78
  gem "pry-stack_explorer"
@@ -95,19 +81,20 @@ group(:omnibus_package) do
95
81
  gem "winrm-fs"
96
82
  gem "winrm-elevated"
97
83
  gem "cucumber"
84
+ end
98
85
 
99
- # TODO Pinning these for now because github_changelog_generator has a bunch
100
- # of different versions across our products
101
- gem "nokogiri", "~> 1.7.2"
86
+ # Everything except AIX
87
+ group(:ruby_prof) do
88
+ gem "ruby-prof"
102
89
  end
103
90
 
104
91
  # Everything except AIX and Windows
105
- group(:linux, :bsd, :mac_os_x, :solaris) do
92
+ group(:ruby_shadow) do
106
93
  gem "ruby-shadow", platform: :ruby
107
94
  end
108
95
 
109
96
  group(:changelog) do
110
- gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping"
97
+ gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
111
98
  end
112
99
 
113
100
  # mixlib-install is used by two groups
data/Gemfile.lock CHANGED
@@ -1,98 +1,6 @@
1
1
  GIT
2
- remote: git://github.com/chef/chef.git
3
- revision: 3365b635aef810b8f12a194e59dd51e182234731
4
- branch: v12.21.26
5
- specs:
6
- chef (12.21.26)
7
- addressable
8
- bundler (>= 1.10)
9
- chef-config (= 12.21.26)
10
- chef-zero (>= 4.8, < 13)
11
- diff-lcs (~> 1.2, >= 1.2.4)
12
- erubis (~> 2.7)
13
- ffi-yajl (~> 2.2)
14
- highline (~> 1.6, >= 1.6.9)
15
- iniparse (~> 1.4)
16
- mixlib-archive (~> 0.4)
17
- mixlib-authentication (~> 1.4)
18
- mixlib-cli (~> 1.7)
19
- mixlib-log (~> 1.3)
20
- mixlib-shellout (~> 2.0)
21
- net-sftp (~> 2.1, >= 2.1.2)
22
- net-ssh (>= 2.9, < 5.0)
23
- net-ssh-multi (~> 1.2, >= 1.2.1)
24
- ohai (>= 8.6.0.alpha.1, < 13)
25
- plist (~> 3.2)
26
- proxifier (~> 1.0)
27
- rspec-core (~> 3.5)
28
- rspec-expectations (~> 3.5)
29
- rspec-mocks (~> 3.5)
30
- rspec_junit_formatter (~> 0.2.0)
31
- serverspec (~> 2.7)
32
- specinfra (~> 2.10)
33
- syslog-logger (~> 1.6)
34
- uuidtools (~> 2.1.5)
35
- chef (12.21.26-universal-mingw32)
36
- addressable
37
- bundler (>= 1.10)
38
- chef-config (= 12.21.26)
39
- chef-zero (>= 4.8, < 13)
40
- diff-lcs (~> 1.2, >= 1.2.4)
41
- erubis (~> 2.7)
42
- ffi (~> 1.9)
43
- ffi-yajl (~> 2.2)
44
- highline (~> 1.6, >= 1.6.9)
45
- iniparse (~> 1.4)
46
- mixlib-archive (~> 0.4)
47
- mixlib-authentication (~> 1.4)
48
- mixlib-cli (~> 1.7)
49
- mixlib-log (~> 1.3)
50
- mixlib-shellout (~> 2.0)
51
- net-sftp (~> 2.1, >= 2.1.2)
52
- net-ssh (>= 2.9, < 5.0)
53
- net-ssh-multi (~> 1.2, >= 1.2.1)
54
- ohai (>= 8.6.0.alpha.1, < 13)
55
- plist (~> 3.2)
56
- proxifier (~> 1.0)
57
- rspec-core (~> 3.5)
58
- rspec-expectations (~> 3.5)
59
- rspec-mocks (~> 3.5)
60
- rspec_junit_formatter (~> 0.2.0)
61
- serverspec (~> 2.7)
62
- specinfra (~> 2.10)
63
- syslog-logger (~> 1.6)
64
- uuidtools (~> 2.1.5)
65
- win32-api (~> 1.5.3)
66
- win32-dir (~> 0.5.0)
67
- win32-event (~> 0.6.1)
68
- win32-eventlog (= 0.6.3)
69
- win32-mmap (~> 0.4.1)
70
- win32-mutex (~> 0.4.2)
71
- win32-process (~> 0.8.2)
72
- win32-service (~> 0.8.7)
73
- windows-api (~> 0.4.4)
74
- wmi-lite (~> 1.0)
75
- chef-config (12.21.26)
76
- addressable
77
- fuzzyurl
78
- mixlib-config (~> 2.0)
79
- mixlib-shellout (~> 2.0)
80
-
81
- GIT
82
- remote: git://github.com/chef/opscode-pushy-client.git
83
- revision: 52065af8c203e11befc7efb338867813ff10b574
84
- branch: 2.4.5
85
- specs:
86
- opscode-pushy-client (2.4.5)
87
- chef (>= 12.19, < 14.0)
88
- ffi-rzmq
89
- ohai (>= 8.23, < 14.0)
90
- uuidtools
91
-
92
- GIT
93
- remote: https://github.com/tduffield/github-changelog-generator
94
- revision: c6245b58b91b863464ca88e02aa752a0658b5f30
95
- branch: adjust-tag-section-mapping
2
+ remote: https://github.com/chef/github-changelog-generator
3
+ revision: 7ab4953b47598dccf10e106058673c1592b8f9bf
96
4
  specs:
97
5
  github_changelog_generator (1.14.2)
98
6
  activesupport
@@ -106,9 +14,9 @@ GIT
106
14
  PATH
107
15
  remote: .
108
16
  specs:
109
- chef-dk (1.6.11)
17
+ chef-dk (2.0.26)
110
18
  addressable (>= 2.3.5, < 2.6)
111
- chef (~> 12.5)
19
+ chef (~> 13.0)
112
20
  chef-provisioning (~> 2.0)
113
21
  cookbook-omnifetch (~> 0.5)
114
22
  diff-lcs (~> 1.0)
@@ -123,52 +31,52 @@ GEM
123
31
  remote: https://rubygems.org/
124
32
  specs:
125
33
  CFPropertyList (2.3.5)
126
- activesupport (4.2.8)
34
+ activesupport (4.2.9)
127
35
  i18n (~> 0.7)
128
36
  minitest (~> 5.1)
129
37
  thread_safe (~> 0.3, >= 0.3.4)
130
38
  tzinfo (~> 1.1)
131
- addressable (2.4.0)
39
+ addressable (2.5.1)
40
+ public_suffix (~> 2.0, >= 2.0.2)
132
41
  app_conf (0.4.2)
133
42
  appbundler (0.10.0)
134
43
  mixlib-cli (~> 1.4)
135
- artifactory (2.8.1)
44
+ artifactory (2.8.2)
136
45
  ast (2.3.0)
137
46
  autoparse (0.3.3)
138
47
  addressable (>= 2.3.1)
139
48
  extlib (>= 0.9.15)
140
49
  multi_json (>= 1.0.0)
141
- aws-sdk (2.9.3)
142
- aws-sdk-resources (= 2.9.3)
143
- aws-sdk-core (2.9.3)
50
+ aws-sdk (2.10.7)
51
+ aws-sdk-resources (= 2.10.7)
52
+ aws-sdk-core (2.10.7)
144
53
  aws-sigv4 (~> 1.0)
145
54
  jmespath (~> 1.0)
146
- aws-sdk-resources (2.9.3)
147
- aws-sdk-core (= 2.9.3)
55
+ aws-sdk-resources (2.10.7)
56
+ aws-sdk-core (= 2.10.7)
148
57
  aws-sdk-v1 (1.67.0)
149
58
  json (~> 1.4)
150
59
  nokogiri (~> 1)
151
60
  aws-sigv4 (1.0.0)
152
- berkshelf (5.6.4)
61
+ berkshelf (6.2.0)
153
62
  addressable (~> 2.3, >= 2.3.4)
154
- berkshelf-api-client (>= 2.0.2, < 4.0)
63
+ berkshelf-api-client (>= 4.0.0)
155
64
  buff-config (~> 2.0)
156
65
  buff-extensions (~> 2.0)
157
- buff-shell_out (~> 1.0)
158
66
  cleanroom (~> 1.0)
67
+ concurrent-ruby (~> 1.0)
159
68
  faraday (~> 0.9)
160
69
  httpclient (~> 2.7)
161
70
  minitar (~> 0.5, >= 0.5.4)
162
71
  mixlib-archive (~> 0.4)
72
+ mixlib-shellout (~> 2.0)
163
73
  octokit (~> 4.0)
164
74
  retryable (~> 2.0)
165
75
  ridley (~> 5.0)
166
76
  solve (> 2.0, < 4.0)
167
77
  thor (~> 0.19, < 0.19.2)
168
- berkshelf-api-client (3.0.0)
169
- faraday (~> 0.9)
170
- httpclient (~> 2.7)
171
- ridley (>= 4.5, < 6.0)
78
+ berkshelf-api-client (4.0.1)
79
+ chef (>= 12.0)
172
80
  binding_of_caller (0.7.2)
173
81
  debug_inspector (>= 0.0.1)
174
82
  blankslate (2.1.2.4)
@@ -187,17 +95,93 @@ GEM
187
95
  celluloid-io (0.16.2)
188
96
  celluloid (>= 0.16.0)
189
97
  nio4r (>= 1.1.0)
190
- chef-provisioning (2.2.1)
191
- cheffish (>= 4.0, < 6.0)
98
+ chef (13.2.20)
99
+ addressable
100
+ bundler (>= 1.10)
101
+ chef-config (= 13.2.20)
102
+ chef-zero (>= 13.0)
103
+ diff-lcs (~> 1.2, >= 1.2.4)
104
+ erubis (~> 2.7)
105
+ ffi-yajl (~> 2.2)
106
+ highline (~> 1.6, >= 1.6.9)
107
+ iniparse (~> 1.4)
108
+ iso8601 (~> 0.9.1)
109
+ mixlib-archive (~> 0.4)
110
+ mixlib-authentication (~> 1.4)
111
+ mixlib-cli (~> 1.7)
112
+ mixlib-log (~> 1.3)
113
+ mixlib-shellout (~> 2.0)
114
+ net-sftp (~> 2.1, >= 2.1.2)
115
+ net-ssh (>= 2.9, < 5.0)
116
+ net-ssh-multi (~> 1.2, >= 1.2.1)
117
+ ohai (~> 13.0)
118
+ plist (~> 3.2)
119
+ proxifier (~> 1.0)
120
+ rspec-core (~> 3.5)
121
+ rspec-expectations (~> 3.5)
122
+ rspec-mocks (~> 3.5)
123
+ rspec_junit_formatter (~> 0.2.0)
124
+ serverspec (~> 2.7)
125
+ specinfra (~> 2.10)
126
+ syslog-logger (~> 1.6)
127
+ uuidtools (~> 2.1.5)
128
+ chef (13.2.20-universal-mingw32)
129
+ addressable
130
+ bundler (>= 1.10)
131
+ chef-config (= 13.2.20)
132
+ chef-zero (>= 13.0)
133
+ diff-lcs (~> 1.2, >= 1.2.4)
134
+ erubis (~> 2.7)
135
+ ffi (~> 1.9)
136
+ ffi-yajl (~> 2.2)
137
+ highline (~> 1.6, >= 1.6.9)
138
+ iniparse (~> 1.4)
139
+ iso8601 (~> 0.9.1)
140
+ mixlib-archive (~> 0.4)
141
+ mixlib-authentication (~> 1.4)
142
+ mixlib-cli (~> 1.7)
143
+ mixlib-log (~> 1.3)
144
+ mixlib-shellout (~> 2.0)
145
+ net-sftp (~> 2.1, >= 2.1.2)
146
+ net-ssh (>= 2.9, < 5.0)
147
+ net-ssh-multi (~> 1.2, >= 1.2.1)
148
+ ohai (~> 13.0)
149
+ plist (~> 3.2)
150
+ proxifier (~> 1.0)
151
+ rspec-core (~> 3.5)
152
+ rspec-expectations (~> 3.5)
153
+ rspec-mocks (~> 3.5)
154
+ rspec_junit_formatter (~> 0.2.0)
155
+ serverspec (~> 2.7)
156
+ specinfra (~> 2.10)
157
+ syslog-logger (~> 1.6)
158
+ uuidtools (~> 2.1.5)
159
+ win32-api (~> 1.5.3)
160
+ win32-dir (~> 0.5.0)
161
+ win32-event (~> 0.6.1)
162
+ win32-eventlog (= 0.6.3)
163
+ win32-mmap (~> 0.4.1)
164
+ win32-mutex (~> 0.4.2)
165
+ win32-process (~> 0.8.2)
166
+ win32-service (~> 0.8.7)
167
+ windows-api (~> 0.4.4)
168
+ wmi-lite (~> 1.0)
169
+ chef-config (13.2.20)
170
+ addressable
171
+ fuzzyurl
172
+ mixlib-config (~> 2.0)
173
+ mixlib-shellout (~> 2.0)
174
+ chef-provisioning (2.4.0)
175
+ cheffish (>= 4.0, < 14.0)
192
176
  inifile (>= 2.0.2)
193
177
  mixlib-install (>= 1.0, < 3.0)
194
178
  net-scp (~> 1.0)
195
179
  net-ssh (>= 2.9, < 5.0)
196
- net-ssh-gateway (~> 1.2)
180
+ net-ssh-gateway (> 1.2, < 3.0)
197
181
  winrm (~> 2.0)
198
182
  winrm-elevated (~> 1.0)
199
183
  winrm-fs (~> 1.0)
200
- chef-provisioning-aws (2.2.0)
184
+ chef-provisioning-aws (2.2.2)
201
185
  aws-sdk (>= 2.2.18, < 3.0)
202
186
  aws-sdk-v1 (>= 1.59.0)
203
187
  chef-provisioning (>= 1.0, < 3.0)
@@ -206,39 +190,37 @@ GEM
206
190
  chef-provisioning-azure (0.6.0)
207
191
  chef-provisioning (>= 1.0, < 3.0)
208
192
  stuartpreston-azure-sdk-for-ruby (~> 0.7)
209
- chef-provisioning-fog (0.24.0)
193
+ chef-provisioning-fog (0.21.0)
210
194
  chef-provisioning (>= 1.0, < 3.0)
211
- cheffish (>= 4.0, < 6.0)
212
195
  fog (>= 1.37.0)
213
196
  fog-digitalocean
214
197
  fog-scaleway
215
- fog-softlayer (~> 1.1)
198
+ fog-softlayer (~> 1.1.0)
216
199
  google-api-client (~> 0.8.0)
217
200
  retryable
218
201
  winrm-elevated
219
- chef-provisioning-vagrant (0.11.0)
220
- chef-provisioning
221
202
  chef-sugar (3.4.0)
222
- chef-vault (2.9.2)
223
- chef-zero (5.3.2)
203
+ chef-vault (3.1.0)
204
+ chef-zero (13.0.0)
224
205
  ffi-yajl (~> 2.2)
225
206
  hashie (>= 2.0, < 4.0)
226
207
  mixlib-log (~> 1.3)
227
208
  rack (~> 2.0)
228
209
  uuidtools (~> 2.1)
229
- cheffish (5.0.1)
230
- chef-zero (~> 5.0)
210
+ cheffish (13.0.0)
211
+ chef-zero (~> 13.0)
231
212
  net-ssh
232
- chefspec (6.2.0)
233
- chef (>= 12.0)
234
- fauxhai (>= 3.6, < 5)
213
+ chefspec (7.1.0)
214
+ chef (>= 12.14.89)
215
+ fauxhai (>= 4, < 6)
235
216
  rspec (~> 3.0)
236
217
  cleanroom (1.0.0)
237
218
  coderay (1.1.1)
238
- cookbook-omnifetch (0.5.1)
219
+ concurrent-ruby (1.0.5)
220
+ cookbook-omnifetch (0.6.0)
239
221
  mixlib-archive (~> 0.4)
240
- cookstyle (1.4.0)
241
- rubocop (= 0.47.1)
222
+ cookstyle (2.0.0)
223
+ rubocop (= 0.49.1)
242
224
  cucumber (2.4.0)
243
225
  builder (>= 2.1.2)
244
226
  cucumber-core (~> 1.5.0)
@@ -253,26 +235,27 @@ GEM
253
235
  dco (1.0.1)
254
236
  git (~> 1.3)
255
237
  thor (~> 0.19)
256
- debug_inspector (0.0.2)
238
+ debug_inspector (0.0.3)
257
239
  dep-selector-libgecode (1.3.1)
258
- dep_selector (1.0.4)
240
+ dep_selector (1.0.5)
259
241
  dep-selector-libgecode (~> 1.0)
260
242
  ffi (~> 1.9)
261
243
  diff-lcs (1.3)
262
244
  diffy (3.2.0)
263
- docker-api (1.33.3)
245
+ docker-api (1.33.6)
264
246
  excon (>= 0.38.0)
265
247
  json
266
248
  erubis (2.7.0)
267
- excon (0.55.0)
249
+ excon (0.57.1)
268
250
  extlib (0.9.16)
269
- faraday (0.9.2)
251
+ faraday (0.12.1)
270
252
  multipart-post (>= 1.2, < 3)
271
253
  faraday-http-cache (2.0.0)
272
254
  faraday (~> 0.8)
273
- fauxhai (4.1.0)
255
+ fauxhai (5.2.0)
274
256
  net-ssh
275
257
  ffi (1.9.18)
258
+ ffi (1.9.18-x64-mingw32)
276
259
  ffi (1.9.18-x86-mingw32)
277
260
  ffi-rzmq (2.0.5)
278
261
  ffi-rzmq-core (>= 1.0.6)
@@ -324,7 +307,7 @@ GEM
324
307
  fog-atmos (0.1.0)
325
308
  fog-core
326
309
  fog-xml
327
- fog-aws (1.3.0)
310
+ fog-aws (1.4.0)
328
311
  fog-core (~> 1.38)
329
312
  fog-json (~> 1.0)
330
313
  fog-xml (~> 0.1)
@@ -338,7 +321,7 @@ GEM
338
321
  fog-json (~> 1.0)
339
322
  fog-xml (~> 0.1)
340
323
  ipaddress (~> 0.8)
341
- fog-core (1.43.0)
324
+ fog-core (1.44.3)
342
325
  builder
343
326
  excon (~> 0.49)
344
327
  formatador (~> 0.2)
@@ -366,7 +349,7 @@ GEM
366
349
  multi_json (~> 1.10)
367
350
  fog-local (0.3.1)
368
351
  fog-core (~> 1.27)
369
- fog-openstack (0.1.20)
352
+ fog-openstack (0.1.21)
370
353
  fog-core (>= 1.40)
371
354
  fog-json (>= 1.0)
372
355
  ipaddress (>= 0.8)
@@ -377,7 +360,7 @@ GEM
377
360
  fog-profitbricks (3.0.0)
378
361
  fog-core (~> 1.42)
379
362
  fog-json (~> 1.0)
380
- fog-rackspace (0.1.4)
363
+ fog-rackspace (0.1.5)
381
364
  fog-core (>= 1.35)
382
365
  fog-json (>= 1.0)
383
366
  fog-xml (>= 0.1)
@@ -414,7 +397,7 @@ GEM
414
397
  fog-voxel (0.1.0)
415
398
  fog-core
416
399
  fog-xml
417
- fog-vsphere (1.9.0)
400
+ fog-vsphere (1.11.0)
418
401
  fog-core
419
402
  rbvmomi (~> 1.9)
420
403
  fog-xenserver (0.3.0)
@@ -423,7 +406,7 @@ GEM
423
406
  fog-xml (0.1.3)
424
407
  fog-core
425
408
  nokogiri (>= 1.5.11, < 2.0.0)
426
- foodcritic (10.2.2)
409
+ foodcritic (11.2.0)
427
410
  cucumber-core (>= 1.3)
428
411
  erubis
429
412
  nokogiri (>= 1.5, < 2.0)
@@ -433,7 +416,7 @@ GEM
433
416
  yajl-ruby (~> 1.1)
434
417
  formatador (0.2.5)
435
418
  fuzzyurl (0.9.0)
436
- gherkin (4.1.1)
419
+ gherkin (4.1.3)
437
420
  git (1.3.0)
438
421
  google-api-client (0.8.7)
439
422
  activesupport (>= 3.2, < 5.0)
@@ -467,19 +450,21 @@ GEM
467
450
  thor (>= 0.18.1)
468
451
  gyoku (1.3.1)
469
452
  builder (>= 2.1.2)
470
- hashie (3.5.6)
471
- highline (1.7.10)
472
- hitimes (1.2.4)
473
- hitimes (1.2.4-x86-mingw32)
453
+ hashie (3.5.5)
454
+ highline (1.7.8)
455
+ hitimes (1.2.5)
456
+ hitimes (1.2.5-x86-mingw32)
457
+ htmlentities (4.3.4)
474
458
  httpclient (2.8.3)
475
- i18n (0.8.1)
459
+ i18n (0.8.4)
476
460
  inflecto (0.0.2)
477
461
  inifile (3.0.0)
478
462
  iniparse (1.4.4)
479
- inspec (1.25.1)
463
+ inspec (1.30.0)
480
464
  addressable (~> 2.4)
481
465
  faraday (>= 0.9.0)
482
466
  hashie (~> 3.4)
467
+ htmlentities
483
468
  json (>= 1.8, < 3.0)
484
469
  method_source (~> 0.8)
485
470
  mixlib-log
@@ -494,13 +479,15 @@ GEM
494
479
  sslshake (~> 1.2)
495
480
  thor (~> 0.19)
496
481
  toml (~> 0.1)
497
- train (>= 0.22.0, < 1.0)
482
+ train (>= 0.24.0, < 1.0)
498
483
  ipaddress (0.8.3)
484
+ iso8601 (0.9.1)
499
485
  jmespath (1.3.1)
500
486
  json (1.8.6)
501
487
  jwt (1.5.6)
502
- kitchen-dokken (2.1.2)
488
+ kitchen-dokken (2.5.1)
503
489
  docker-api (~> 1.33)
490
+ lockfile (~> 2.1)
504
491
  test-kitchen (~> 1.15)
505
492
  kitchen-ec2 (1.3.2)
506
493
  aws-sdk (~> 2)
@@ -508,14 +495,16 @@ GEM
508
495
  multi_json
509
496
  retryable (~> 2.0)
510
497
  test-kitchen (~> 1.4, >= 1.4.1)
511
- kitchen-inspec (0.17.0)
498
+ kitchen-hyperv (0.4.1)
499
+ test-kitchen (~> 1.4)
500
+ kitchen-inspec (0.19.0)
512
501
  hashie (~> 3.4)
513
502
  inspec (>= 0.34.0, < 2.0.0)
514
503
  test-kitchen (~> 1.6)
515
504
  kitchen-vagrant (1.1.0)
516
505
  test-kitchen (~> 1.4)
517
506
  knife-opc (0.3.2)
518
- knife-push (1.0.3)
507
+ knife-push (1.0.2)
519
508
  chef (>= 12.7.2)
520
509
  knife-spork (1.6.3)
521
510
  app_conf (>= 0.4.0)
@@ -533,20 +522,21 @@ GEM
533
522
  rb-inotify (~> 0.9, >= 0.9.7)
534
523
  ruby_dep (~> 1.2)
535
524
  little-plugger (1.1.4)
536
- logging (2.2.0)
525
+ lockfile (2.1.3)
526
+ logging (2.2.2)
537
527
  little-plugger (~> 1.1)
538
528
  multi_json (~> 1.10)
539
- lumberjack (1.0.11)
529
+ lumberjack (1.0.12)
540
530
  macaddr (1.7.1)
541
531
  systemu (~> 2.6.2)
542
- memoist (0.15.0)
532
+ memoist (0.16.0)
543
533
  method_source (0.8.2)
544
534
  mime-types (3.1)
545
535
  mime-types-data (~> 3.2015)
546
536
  mime-types-data (3.2016.0521)
547
- mini_portile2 (2.1.0)
537
+ mini_portile2 (2.2.0)
548
538
  minitar (0.5.4)
549
- minitest (5.10.1)
539
+ minitest (5.10.2)
550
540
  mixlib-archive (0.4.1)
551
541
  mixlib-log
552
542
  mixlib-authentication (1.4.1)
@@ -559,8 +549,8 @@ GEM
559
549
  mixlib-versioning
560
550
  thor
561
551
  mixlib-log (1.7.1)
562
- mixlib-shellout (2.3.2)
563
- mixlib-shellout (2.3.2-universal-mingw32)
552
+ mixlib-shellout (2.2.7)
553
+ mixlib-shellout (2.2.7-universal-mingw32)
564
554
  win32-process (~> 0.8.2)
565
555
  wmi-lite (~> 1.0)
566
556
  mixlib-versioning (1.1.0)
@@ -580,20 +570,20 @@ GEM
580
570
  net-ssh (>= 2.6.5)
581
571
  net-ssh-gateway (>= 1.2.0)
582
572
  net-telnet (0.1.1)
583
- nio4r (2.0.0)
584
- nokogiri (1.7.2)
585
- mini_portile2 (~> 2.1.0)
586
- nokogiri (1.7.2-x86-mingw32)
587
- mini_portile2 (~> 2.1.0)
588
- nokogiri (1.7.2-x64-mingw32)
589
- mini_portile2 (~> 2.1.0)
573
+ nio4r (2.1.0)
574
+ nokogiri (1.8.0)
575
+ mini_portile2 (~> 2.2.0)
576
+ nokogiri (1.8.0-x64-mingw32)
577
+ mini_portile2 (~> 2.2.0)
578
+ nokogiri (1.8.0-x86-mingw32)
579
+ mini_portile2 (~> 2.2.0)
590
580
  nori (2.6.0)
591
581
  notiffany (0.1.1)
592
582
  nenv (~> 0.1)
593
583
  shellany (~> 0.0)
594
- octokit (4.6.2)
584
+ octokit (4.7.0)
595
585
  sawyer (~> 0.8.0, >= 0.5.3)
596
- ohai (8.25.1)
586
+ ohai (13.2.0)
597
587
  chef-config (>= 12.5.0.alpha.1, < 14)
598
588
  ffi (~> 1.9)
599
589
  ffi-yajl (~> 2.2)
@@ -605,9 +595,14 @@ GEM
605
595
  plist (~> 3.1)
606
596
  systemu (~> 2.6.4)
607
597
  wmi-lite (~> 1.0)
598
+ opscode-pushy-client (2.3.0)
599
+ chef (>= 12.19, < 14.0)
600
+ ffi-rzmq
601
+ ohai (>= 8.23, < 14.0)
602
+ uuidtools
608
603
  os (0.9.6)
609
604
  paint (1.0.1)
610
- parallel (1.11.1)
605
+ parallel (1.11.2)
611
606
  parser (2.4.0.0)
612
607
  ast (~> 2.2)
613
608
  parslet (1.5.0)
@@ -633,12 +628,12 @@ GEM
633
628
  rack (2.0.3)
634
629
  rainbow (2.2.2)
635
630
  rake
636
- rake (12.3.0)
637
- rb-fsevent (0.9.8)
638
- rb-inotify (0.9.8)
639
- ffi (>= 0.5.0)
631
+ rake (12.0.0)
632
+ rb-fsevent (0.10.2)
633
+ rb-inotify (0.9.10)
634
+ ffi (>= 0.5.0, < 2)
640
635
  rb-readline (0.5.4)
641
- rbvmomi (1.10.0)
636
+ rbvmomi (1.11.3)
642
637
  builder (~> 3.0)
643
638
  json (>= 1.8)
644
639
  nokogiri (~> 1.5)
@@ -647,7 +642,7 @@ GEM
647
642
  rdp-ruby-wmi (0.3.1)
648
643
  retriable (1.4.1)
649
644
  retryable (2.0.4)
650
- ridley (5.1.0)
645
+ ridley (5.1.1)
651
646
  addressable
652
647
  buff-config (~> 2.0)
653
648
  buff-extensions (~> 2.0)
@@ -657,7 +652,7 @@ GEM
657
652
  celluloid-io (~> 0.16.1)
658
653
  chef-config (>= 12.5.0)
659
654
  erubis
660
- faraday (~> 0.9.0)
655
+ faraday (~> 0.9)
661
656
  hashie (>= 2.0.2, < 4.0.0)
662
657
  httpclient (~> 2.7)
663
658
  json (>= 1.7.7)
@@ -684,7 +679,8 @@ GEM
684
679
  rspec_junit_formatter (0.2.3)
685
680
  builder (< 4)
686
681
  rspec-core (>= 2, < 4, != 2.12.0)
687
- rubocop (0.47.1)
682
+ rubocop (0.49.1)
683
+ parallel (~> 1.10)
688
684
  parser (>= 2.3.3.1, < 3.0)
689
685
  powerpack (~> 0.1)
690
686
  rainbow (>= 1.99.1, < 3.0)
@@ -694,7 +690,7 @@ GEM
694
690
  ruby-progressbar (1.8.1)
695
691
  ruby-shadow (2.5.0)
696
692
  ruby_dep (1.5.0)
697
- rubyntlm (0.6.1)
693
+ rubyntlm (0.6.2)
698
694
  rubyzip (1.2.1)
699
695
  rufus-lru (1.1.0)
700
696
  safe_yaml (1.0.4)
@@ -702,11 +698,11 @@ GEM
702
698
  addressable (>= 2.3.5, < 2.6)
703
699
  faraday (~> 0.8, < 1.0)
704
700
  semverse (2.0.0)
705
- serverspec (2.41.3)
701
+ serverspec (2.39.1)
706
702
  multi_json
707
703
  rspec (~> 3.0)
708
704
  rspec-its
709
- specinfra (~> 2.72)
705
+ specinfra (~> 2.68)
710
706
  sfl (2.3)
711
707
  shellany (0.0.1)
712
708
  signet (0.7.3)
@@ -718,7 +714,7 @@ GEM
718
714
  solve (3.1.0)
719
715
  molinillo (>= 0.5)
720
716
  semverse (>= 1.1, < 3.0)
721
- specinfra (2.72.1)
717
+ specinfra (2.68.1)
722
718
  net-scp
723
719
  net-ssh (>= 2.7, < 5.0)
724
720
  net-telnet
@@ -746,7 +742,7 @@ GEM
746
742
  hitimes
747
743
  toml (0.1.2)
748
744
  parslet (~> 1.5.0)
749
- train (0.23.0)
745
+ train (0.25.0)
750
746
  docker-api (~> 1.26)
751
747
  json (>= 1.8, < 3.0)
752
748
  mixlib-shellout (~> 2.0)
@@ -790,7 +786,7 @@ GEM
790
786
  windows-pr (1.2.6)
791
787
  win32-api (>= 1.4.5)
792
788
  windows-api (>= 0.4.0)
793
- winrm (2.2.1)
789
+ winrm (2.2.3)
794
790
  builder (>= 2.1.2)
795
791
  erubis (~> 2.7)
796
792
  gssapi (~> 1.2)
@@ -810,7 +806,7 @@ GEM
810
806
  wmi-lite (1.0.0)
811
807
  xml-simple (1.1.5)
812
808
  yajl-ruby (1.3.0)
813
- yard (0.9.8)
809
+ yard (0.9.9)
814
810
 
815
811
  PLATFORMS
816
812
  ruby
@@ -820,19 +816,19 @@ PLATFORMS
820
816
  DEPENDENCIES
821
817
  appbundler
822
818
  artifactory
823
- berkshelf (>= 5.0)
824
- chef!
819
+ berkshelf (>= 6.2)
820
+ bundler
821
+ chef (= 13.2.20)
825
822
  chef-dk!
826
- chef-provisioning (>= 2.0)
823
+ chef-provisioning (>= 2.4.0)
827
824
  chef-provisioning-aws (>= 2.0)
828
825
  chef-provisioning-azure (>= 0.6.0)
829
826
  chef-provisioning-fog (>= 0.20.0)
830
- chef-provisioning-vagrant (>= 0.11.0)
831
827
  chef-sugar
832
- chef-vault (~> 2)
833
- cheffish (= 5.0.1)
828
+ chef-vault
829
+ cheffish (>= 13.0)
834
830
  chefspec
835
- cookstyle (>= 1.3.0, < 2.0)
831
+ cookstyle (>= 2.0.0)
836
832
  cucumber
837
833
  dco
838
834
  dep-selector-libgecode
@@ -840,12 +836,13 @@ DEPENDENCIES
840
836
  fauxhai
841
837
  ffi
842
838
  ffi-rzmq-core
843
- foodcritic (>= 9.0)
839
+ foodcritic (>= 11.2)
844
840
  github_changelog_generator!
845
841
  guard
846
- inspec (>= 0.17.1)
847
- kitchen-dokken (>= 2.1.0)
842
+ inspec (>= 0.29.0)
843
+ kitchen-dokken (>= 2.5.0)
848
844
  kitchen-ec2
845
+ kitchen-hyperv
849
846
  kitchen-inspec
850
847
  kitchen-vagrant
851
848
  knife-opc (>= 0.3.2)
@@ -855,9 +852,9 @@ DEPENDENCIES
855
852
  listen
856
853
  mixlib-install
857
854
  mixlib-versioning
858
- nokogiri (~> 1.7.2)
859
- ohai (>= 8.13.0)
860
- opscode-pushy-client!
855
+ nokogiri
856
+ ohai (>= 13.1.0)
857
+ opscode-pushy-client (>= 2.3.0)
861
858
  pry
862
859
  pry-byebug
863
860
  pry-remote
@@ -866,6 +863,9 @@ DEPENDENCIES
866
863
  rb-readline
867
864
  rdoc
868
865
  rdp-ruby-wmi
866
+ rspec-core (~> 3.0)
867
+ rspec-expectations (~> 3.0)
868
+ rspec-mocks (~> 3.0)
869
869
  rubocop
870
870
  ruby-prof
871
871
  ruby-shadow
@@ -883,4 +883,4 @@ DEPENDENCIES
883
883
  yard
884
884
 
885
885
  BUNDLED WITH
886
- 1.16.0
886
+ 1.15.1