From 877711fccfe463588a42e15bf966644fe33b7a2d Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Tue, 12 Sep 2017 07:50:51 -0700 Subject: [PATCH 1/8] Adds stove for inclusion stove is enjoyed by many cookbook developers and should be included Signed-off-by: Samuel Cassiba --- Gemfile | 1 + Gemfile.lock | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 205070661..0fe617aa7 100644 --- a/Gemfile +++ b/Gemfile @@ -82,6 +82,7 @@ group(:omnibus_package) do gem "winrm-fs" gem "winrm-elevated" gem "cucumber" + gem "stove" end # Everything except AIX diff --git a/Gemfile.lock b/Gemfile.lock index e54351548..dbaed6039 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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.43) + aws-sdk-resources (= 2.10.43) + aws-sdk-core (2.10.43) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.37) - aws-sdk-core (= 2.10.37) + aws-sdk-resources (2.10.43) + aws-sdk-core (= 2.10.43) aws-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) @@ -150,6 +151,9 @@ GEM win32-service (~> 0.8.7) windows-api (~> 0.4.4) wmi-lite (~> 1.0) + chef-api (0.7.1) + logify (~> 0.1) + mime-types chef-config (13.3.42) addressable fuzzyurl @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -546,8 +551,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) multi_test (0.1.2) multipart-post (2.0.0) nenv (0.3.0) @@ -555,7 +560,7 @@ GEM 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) @@ -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) @@ -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) @@ -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 (5.2.0) + chef-api (~> 0.5) + logify (~> 0.2) stuartpreston-azure-sdk-for-ruby (0.7.2) json (~> 1.8) mime-types (> 1, < 4) @@ -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) @@ -860,6 +868,7 @@ DEPENDENCIES rubocop ruby-prof ruby-shadow + stove test-kitchen win32-api win32-dir From 250989e0d22f4ebe2b2f27ac8e413a8d2aa9d5f0 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 13 Sep 2017 11:34:34 -0700 Subject: [PATCH 2/8] Bring in the latest net-ssh, rake, kitchen-hyperv, inspec, and foodcritic Signed-off-by: Tim Smith --- Gemfile.lock | 36 ++++++++++++++++++------------------ acceptance/Gemfile.lock | 24 ++++++++++++------------ omnibus/Gemfile.lock | 18 +++++++++--------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 554a77b17..77bc46280 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,13 +34,13 @@ GEM 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.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-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) @@ -201,7 +201,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) @@ -232,7 +232,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) @@ -340,7 +340,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) @@ -399,7 +399,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) @@ -453,7 +453,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) @@ -488,7 +488,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) @@ -546,8 +546,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) multi_test (0.1.2) multipart-post (2.0.0) nenv (0.3.0) @@ -555,7 +555,7 @@ GEM 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) @@ -620,7 +620,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) @@ -679,7 +679,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) @@ -706,7 +706,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 @@ -734,7 +734,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) diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 78f05d0b3..007b6c503 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -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) @@ -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) @@ -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) @@ -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) @@ -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 @@ -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) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b55c914e9..5cd5c9d6a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -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) @@ -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) @@ -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) @@ -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 From 0490607b30de9ab2668efa88c4c2bced7c0fe08a Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Wed, 13 Sep 2017 19:25:26 +0000 Subject: [PATCH 3/8] Bump version to 2.2.4 by Chef Expeditor --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 2 +- VERSION | 2 +- lib/chef-dk/version.rb | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de015ec0..474f81a1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ - -## [v2.2.3](https://github.com/chef/chef-dk/tree/v2.2.3) (2017-09-11) + +## [v2.2.4](https://github.com/chef/chef-dk/tree/v2.2.4) (2017-09-13) #### Merged Pull Requests -- Added LICENSE generation to skeleton [#1383](https://github.com/chef/chef-dk/pull/1383) ([mengesb](https://github.com/mengesb)) +- 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)) ### Changes since 2.1.11 release #### Merged Pull Requests +- 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)) - Added LICENSE generation to skeleton [#1383](https://github.com/chef/chef-dk/pull/1383) ([mengesb](https://github.com/mengesb)) - Update Expeditor config to meet 0.5.0 requirements [#1382](https://github.com/chef/chef-dk/pull/1382) ([tduffield](https://github.com/tduffield)) - bump version for release [#1380](https://github.com/chef/chef-dk/pull/1380) ([thommay](https://github.com/thommay)) diff --git a/Gemfile.lock b/Gemfile.lock index 71e21af74..db14275c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - chef-dk (2.2.3) + chef-dk (2.2.4) addressable (>= 2.3.5, < 2.6) chef (~> 13.0) chef-provisioning (~> 2.0) diff --git a/VERSION b/VERSION index 6b4d15773..047615559 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.3 \ No newline at end of file +2.2.4 \ No newline at end of file diff --git a/lib/chef-dk/version.rb b/lib/chef-dk/version.rb index 071c42498..e6b4fff3a 100644 --- a/lib/chef-dk/version.rb +++ b/lib/chef-dk/version.rb @@ -16,5 +16,5 @@ # module ChefDK - VERSION = "2.2.3" + VERSION = "2.2.4" end From 64f2464bbdfe762f443c08f23dd73fbdaedd2ab0 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 13 Sep 2017 12:36:52 -0700 Subject: [PATCH 4/8] Ship Chef 13.4.19 Signed-off-by: Tim Smith --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 205070661..bfb817b37 100644 --- a/Gemfile +++ b/Gemfile @@ -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" diff --git a/Gemfile.lock b/Gemfile.lock index 77bc46280..bb7e49a61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,10 +79,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) @@ -109,10 +109,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) @@ -150,7 +150,7 @@ GEM win32-service (~> 0.8.7) windows-api (~> 0.4.4) wmi-lite (~> 1.0) - chef-config (13.3.42) + chef-config (13.4.19) addressable fuzzyurl mixlib-config (~> 2.0) @@ -575,7 +575,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) @@ -809,7 +809,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) From 9f851175933afb9530795e98391a45caf0dc6f3b Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Wed, 13 Sep 2017 20:03:58 -0700 Subject: [PATCH 5/8] Updated Gemfile.lock for stove 6.0.0 release --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dbaed6039..cb3e5c846 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,13 +35,13 @@ GEM addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - aws-sdk (2.10.43) - aws-sdk-resources (= 2.10.43) - aws-sdk-core (2.10.43) + 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.43) - aws-sdk-core (= 2.10.43) + aws-sdk-resources (2.10.45) + aws-sdk-core (= 2.10.45) aws-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) @@ -403,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) @@ -684,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) @@ -717,7 +717,7 @@ GEM net-telnet sfl sslshake (1.2.0) - stove (5.2.0) + stove (6.0.0) chef-api (~> 0.5) logify (~> 0.2) stuartpreston-azure-sdk-for-ruby (0.7.2) From b74a4c1886ffec373baab71e2b33844b9f9555cd Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Thu, 14 Sep 2017 03:16:29 +0000 Subject: [PATCH 6/8] Bump version to 2.2.5 by Chef Expeditor --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 2 +- VERSION | 2 +- lib/chef-dk/version.rb | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 474f81a1e..a02e9c724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ - -## [v2.2.4](https://github.com/chef/chef-dk/tree/v2.2.4) (2017-09-13) + +## [v2.2.5](https://github.com/chef/chef-dk/tree/v2.2.5) (2017-09-14) #### Merged Pull Requests -- 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)) +- Ship Chef 13.4.19 [#1387](https://github.com/chef/chef-dk/pull/1387) ([tas50](https://github.com/tas50)) ### 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)) - 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)) - Added LICENSE generation to skeleton [#1383](https://github.com/chef/chef-dk/pull/1383) ([mengesb](https://github.com/mengesb)) - Update Expeditor config to meet 0.5.0 requirements [#1382](https://github.com/chef/chef-dk/pull/1382) ([tduffield](https://github.com/tduffield)) diff --git a/Gemfile.lock b/Gemfile.lock index 105661420..faa6e12b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - chef-dk (2.2.4) + chef-dk (2.2.5) addressable (>= 2.3.5, < 2.6) chef (~> 13.0) chef-provisioning (~> 2.0) diff --git a/VERSION b/VERSION index 047615559..ecf00d901 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.4 \ No newline at end of file +2.2.5 \ No newline at end of file diff --git a/lib/chef-dk/version.rb b/lib/chef-dk/version.rb index e6b4fff3a..db51689c0 100644 --- a/lib/chef-dk/version.rb +++ b/lib/chef-dk/version.rb @@ -16,5 +16,5 @@ # module ChefDK - VERSION = "2.2.4" + VERSION = "2.2.5" end From 3bc551b34e87a6871d5f974cd7f7ba0bd659043a Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Tue, 12 Sep 2017 07:50:51 -0700 Subject: [PATCH 7/8] Adds stove for inclusion stove is enjoyed by many cookbook developers and should be included Signed-off-by: Samuel Cassiba --- Gemfile | 1 + Gemfile.lock | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Gemfile b/Gemfile index bfb817b37..e7d47ca0b 100644 --- a/Gemfile +++ b/Gemfile @@ -82,6 +82,7 @@ group(:omnibus_package) do gem "winrm-fs" gem "winrm-elevated" gem "cucumber" + gem "stove" end # Everything except AIX diff --git a/Gemfile.lock b/Gemfile.lock index faa6e12b8..ab4be9647 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,7 @@ 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) @@ -519,6 +520,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) @@ -712,6 +714,9 @@ GEM net-telnet sfl sslshake (1.2.0) + stove (5.2.0) + chef-api (~> 0.5) + logify (~> 0.2) stuartpreston-azure-sdk-for-ruby (0.7.2) json (~> 1.8) mime-types (> 1, < 4) @@ -860,6 +865,7 @@ DEPENDENCIES rubocop ruby-prof ruby-shadow + stove test-kitchen win32-api win32-dir From 04c70233a09ac786da3cc87e6ef7a5475414fb0d Mon Sep 17 00:00:00 2001 From: Samuel Cassiba Date: Wed, 13 Sep 2017 20:03:58 -0700 Subject: [PATCH 8/8] Updated Gemfile.lock for stove 6.0.0 release --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ab4be9647..5696c4f12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,13 +35,13 @@ GEM addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - aws-sdk (2.10.44) - aws-sdk-resources (= 2.10.44) - aws-sdk-core (2.10.44) + 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.44) - aws-sdk-core (= 2.10.44) + aws-sdk-resources (2.10.45) + aws-sdk-core (= 2.10.45) aws-sdk-v1 (1.67.0) json (~> 1.4) nokogiri (~> 1) @@ -714,7 +714,7 @@ GEM net-telnet sfl sslshake (1.2.0) - stove (5.2.0) + stove (6.0.0) chef-api (~> 0.5) logify (~> 0.2) stuartpreston-azure-sdk-for-ruby (0.7.2)