Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Adds stove for inclusion #1385

Merged
merged 11 commits into from
Sep 14, 2017
Merged

Adds stove for inclusion #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
877711f
Adds stove for inclusion
sbcas Sep 12, 2017
250989e
Bring in the latest net-ssh, rake, kitchen-hyperv, inspec, and foodcr…
tas50 Sep 13, 2017
2bfe61d
Merge pull request #1386 from chef/gem_bumps
tas50 Sep 13, 2017
0490607
Bump version to 2.2.4 by Chef Expeditor
Sep 13, 2017
64f2464
Ship Chef 13.4.19
tas50 Sep 13, 2017
9f85117
Updated Gemfile.lock for stove 6.0.0 release
sbcas Sep 14, 2017
e21903a
Merge pull request #1387 from chef/gem_bumps
tas50 Sep 14, 2017
b74a4c1
Bump version to 2.2.5 by Chef Expeditor
Sep 14, 2017
3bc551b
Adds stove for inclusion
sbcas Sep 12, 2017
04c7023
Updated Gemfile.lock for stove 6.0.0 release
sbcas Sep 14, 2017
2d118c6
Sync stove deps
sbcas Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
<!-- latest_release 2.2.3 -->
## [v2.2.3](https://github.com/chef/chef-dk/tree/v2.2.3) (2017-09-11)
<!-- latest_release 2.2.5 -->
## [v2.2.5](https://github.com/chef/chef-dk/tree/v2.2.5) (2017-09-14)

#### Merged Pull Requests
- Added LICENSE generation to skeleton [#1383](https://github.com/chef/chef-dk/pull/1383) ([mengesb](https://github.com/mengesb))
- Ship Chef 13.4.19 [#1387](https://github.com/chef/chef-dk/pull/1387) ([tas50](https://github.com/tas50))
<!-- latest_release -->

<!-- release_rollup since=2.1.11 -->
### Changes since 2.1.11 release

#### Merged Pull Requests
- Ship Chef 13.4.19 [#1387](https://github.com/chef/chef-dk/pull/1387) ([tas50](https://github.com/tas50)) <!-- 2.2.5 -->
- Bring in the latest net-ssh, rake, kitchen-hyperv, inspec, and foodcritic [#1386](https://github.com/chef/chef-dk/pull/1386) ([tas50](https://github.com/tas50)) <!-- 2.2.4 -->
- Added LICENSE generation to skeleton [#1383](https://github.com/chef/chef-dk/pull/1383) ([mengesb](https://github.com/mengesb)) <!-- 2.2.3 -->
- Update Expeditor config to meet 0.5.0 requirements [#1382](https://github.com/chef/chef-dk/pull/1382) ([tduffield](https://github.com/tduffield)) <!-- 2.2.2 -->
- bump version for release [#1380](https://github.com/chef/chef-dk/pull/1380) ([thommay](https://github.com/thommay)) <!-- 2.2.1 -->
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ group(:omnibus_package) do
gem "chef-provisioning-azure", ">= 0.6.0"
gem "chef-provisioning-fog", ">= 0.20.0"
gem "chef-vault"
gem "chef", "= 13.3.42"
gem "chef", "= 13.4.19"
gem "cheffish", ">= 13.0"
gem "chefspec"
gem "fauxhai"
Expand Down Expand Up @@ -82,6 +82,7 @@ group(:omnibus_package) do
gem "winrm-fs"
gem "winrm-elevated"
gem "cucumber"
gem "stove"
end

# Everything except AIX
Expand Down
61 changes: 35 additions & 26 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
chef-dk (2.2.3)
chef-dk (2.2.5)
addressable (>= 2.3.5, < 2.6)
chef (~> 13.0)
chef-provisioning (~> 2.0)
Expand All @@ -28,19 +28,20 @@ GEM
app_conf (0.4.2)
appbundler (0.10.0)
mixlib-cli (~> 1.4)
mixlib-shellout (~> 2.0)
artifactory (2.8.2)
ast (2.3.0)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
aws-sdk (2.10.37)
aws-sdk-resources (= 2.10.37)
aws-sdk-core (2.10.37)
aws-sdk (2.10.45)
aws-sdk-resources (= 2.10.45)
aws-sdk-core (2.10.45)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.10.37)
aws-sdk-core (= 2.10.37)
aws-sdk-resources (2.10.45)
aws-sdk-core (= 2.10.45)
aws-sdk-v1 (1.67.0)
json (~> 1.4)
nokogiri (~> 1)
Expand Down Expand Up @@ -79,10 +80,10 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (13.3.42)
chef (13.4.19)
addressable
bundler (>= 1.10)
chef-config (= 13.3.42)
chef-config (= 13.4.19)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
Expand All @@ -109,10 +110,10 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef (13.3.42-universal-mingw32)
chef (13.4.19-universal-mingw32)
addressable
bundler (>= 1.10)
chef-config (= 13.3.42)
chef-config (= 13.4.19)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
Expand Down Expand Up @@ -150,7 +151,10 @@ GEM
win32-service (~> 0.8.7)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
chef-config (13.3.42)
chef-api (0.7.1)
logify (~> 0.1)
mime-types
chef-config (13.4.19)
addressable
fuzzyurl
mixlib-config (~> 2.0)
Expand Down Expand Up @@ -201,7 +205,7 @@ GEM
chefstyle (0.6.0)
rubocop (= 0.49.1)
cleanroom (1.0.0)
coderay (1.1.1)
coderay (1.1.2)
concurrent-ruby (1.0.5)
cookbook-omnifetch (0.6.0)
mixlib-archive (~> 0.4)
Expand Down Expand Up @@ -232,7 +236,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
excon (0.58.0)
excon (0.59.0)
extlib (0.9.16)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
Expand Down Expand Up @@ -340,7 +344,7 @@ GEM
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
fog-local (0.3.1)
fog-local (0.4.0)
fog-core (~> 1.27)
fog-openstack (0.1.21)
fog-core (>= 1.40)
Expand Down Expand Up @@ -399,7 +403,7 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
foodcritic (11.3.1)
foodcritic (11.4.0)
cucumber-core (>= 1.3)
erubis
ffi-yajl (~> 2.0)
Expand Down Expand Up @@ -453,7 +457,7 @@ GEM
inflecto (0.0.2)
inifile (3.0.0)
iniparse (1.4.4)
inspec (1.35.1)
inspec (1.36.1)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
Expand Down Expand Up @@ -488,7 +492,7 @@ GEM
multi_json
retryable (~> 2.0)
test-kitchen (~> 1.4, >= 1.4.1)
kitchen-hyperv (0.5.0)
kitchen-hyperv (0.5.1)
test-kitchen (~> 1.4)
kitchen-inspec (0.19.0)
hashie (~> 3.4)
Expand Down Expand Up @@ -519,6 +523,7 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
logify (0.2.0)
lumberjack (1.0.12)
macaddr (1.7.1)
systemu (~> 2.6.2)
Expand Down Expand Up @@ -546,16 +551,16 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.2.2)
molinillo (0.6.2)
multi_json (1.12.1)
molinillo (0.6.3)
multi_json (1.12.2)
multi_test (0.1.2)
multipart-post (2.0.0)
nenv (0.3.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
net-ssh (4.2.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.1)
Expand All @@ -575,7 +580,7 @@ GEM
shellany (~> 0.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (13.3.0)
ohai (13.4.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand Down Expand Up @@ -620,7 +625,7 @@ GEM
rack (2.0.3)
rainbow (2.2.2)
rake
rake (12.0.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
Expand Down Expand Up @@ -679,7 +684,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-prof (0.16.2)
ruby-progressbar (1.8.1)
ruby-progressbar (1.8.3)
ruby-shadow (2.5.0)
ruby_dep (1.5.0)
rubyntlm (0.6.2)
Expand All @@ -706,12 +711,15 @@ GEM
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.71.1)
specinfra (2.71.2)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
sfl
sslshake (1.2.0)
stove (6.0.0)
chef-api (~> 0.5)
logify (~> 0.2)
stuartpreston-azure-sdk-for-ruby (0.7.2)
json (~> 1.8)
mime-types (> 1, < 4)
Expand All @@ -734,7 +742,7 @@ GEM
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
train (0.26.1)
train (0.26.2)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
Expand Down Expand Up @@ -809,7 +817,7 @@ DEPENDENCIES
artifactory
berkshelf (>= 6.3)
bundler
chef (= 13.3.42)
chef (= 13.4.19)
chef-dk!
chef-provisioning (>= 2.4.0)
chef-provisioning-aws (>= 2.0)
Expand Down Expand Up @@ -860,6 +868,7 @@ DEPENDENCIES
rubocop
ruby-prof
ruby-shadow
stove
test-kitchen
win32-api
win32-dir
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.3
2.2.5
24 changes: 12 additions & 12 deletions acceptance/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
artifactory (2.8.2)
aws-sdk (2.10.37)
aws-sdk-resources (= 2.10.37)
aws-sdk-core (2.10.37)
aws-sdk (2.10.44)
aws-sdk-resources (= 2.10.44)
aws-sdk-core (2.10.44)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.10.37)
aws-sdk-core (= 2.10.37)
aws-sdk-resources (2.10.44)
aws-sdk-core (= 2.10.44)
aws-sigv4 (1.0.2)
berkshelf (6.3.1)
buff-config (~> 2.0)
Expand Down Expand Up @@ -89,14 +89,14 @@ GEM
rack (< 2)
uuidtools (~> 2.1)
cleanroom (1.0.0)
coderay (1.1.1)
coderay (1.1.2)
concurrent-ruby (1.0.5)
diff-lcs (1.3)
docker-api (1.33.6)
excon (>= 0.38.0)
json
erubis (2.7.0)
excon (0.58.0)
excon (0.59.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
Expand All @@ -113,7 +113,7 @@ GEM
htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.4.4)
inspec (1.35.1)
inspec (1.36.1)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
Expand Down Expand Up @@ -167,8 +167,8 @@ GEM
mixlib-log (1.7.1)
mixlib-shellout (2.3.2)
mixlib-versioning (1.2.2)
molinillo (0.6.2)
multi_json (1.12.1)
molinillo (0.6.3)
multi_json (1.12.2)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
Expand Down Expand Up @@ -264,7 +264,7 @@ GEM
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.71.1)
specinfra (2.71.2)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
Expand All @@ -285,7 +285,7 @@ GEM
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
train (0.26.1)
train (0.26.2)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
Expand Down
2 changes: 1 addition & 1 deletion lib/chef-dk/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
#

module ChefDK
VERSION = "2.2.3"
VERSION = "2.2.5"
end
18 changes: 9 additions & 9 deletions omnibus/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
artifactory (2.8.2)
awesome_print (1.8.0)
aws-sdk (2.10.37)
aws-sdk-resources (= 2.10.37)
aws-sdk-core (2.10.37)
aws-sdk (2.10.44)
aws-sdk-resources (= 2.10.44)
aws-sdk-core (2.10.44)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.10.37)
aws-sdk-core (= 2.10.37)
aws-sdk-resources (2.10.44)
aws-sdk-core (= 2.10.44)
aws-sigv4 (1.0.2)
berkshelf (6.3.1)
buff-config (~> 2.0)
Expand Down Expand Up @@ -200,8 +200,8 @@ GEM
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.2.2)
molinillo (0.6.2)
multi_json (1.12.1)
molinillo (0.6.3)
multi_json (1.12.2)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
Expand Down Expand Up @@ -279,7 +279,7 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
ruby-progressbar (1.8.1)
ruby-progressbar (1.8.3)
rubyntlm (0.6.2)
rubyzip (1.2.1)
safe_yaml (1.0.4)
Expand All @@ -296,7 +296,7 @@ GEM
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.71.1)
specinfra (2.71.2)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
Expand Down