Merge pull request #32107 from grahamc/chefdk-bump

chefdk: 1.3.40 -> 2.3.4
This commit is contained in:
Graham Christensen 2017-11-28 06:59:49 -05:00 committed by GitHub
commit ec622a9b38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 369 additions and 324 deletions

View file

@ -1,33 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
app_conf (0.4.2)
artifactory (2.8.1)
ast (2.3.0)
backports (3.7.0)
berkshelf (5.6.4)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
backports (3.10.3)
berkshelf (6.3.1)
buff-config (~> 2.0)
buff-extensions (~> 2.0)
buff-shell_out (~> 1.0)
chef (>= 12.7.2)
cleanroom (~> 1.0)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
mixlib-archive (~> 0.4)
mixlib-shellout (~> 2.0)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 5.0)
solve (> 2.0, < 4.0)
solve (~> 4.0)
thor (~> 0.19, < 0.19.2)
berkshelf-api-client (3.0.0)
faraday (~> 0.9)
httpclient (~> 2.7)
ridley (>= 4.5, < 6.0)
blankslate (2.1.2.4)
buff-config (2.0.0)
buff-extensions (~> 2.0)
varia_model (~> 0.6)
@ -42,16 +36,17 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (12.19.36)
chef (13.6.4)
addressable
bundler (>= 1.10)
chef-config (= 12.19.36)
chef-zero (>= 4.8)
chef-config (= 13.6.4)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
@ -60,7 +55,7 @@ GEM
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.2, >= 1.2.1)
ohai (>= 8.6.0.alpha.1, < 13)
ohai (~> 13.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@ -71,14 +66,14 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef-config (12.19.36)
chef-config (13.6.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-dk (1.3.40)
chef-dk (2.3.4)
addressable (>= 2.3.5, < 2.6)
chef (~> 12.5)
chef (~> 13.0)
chef-provisioning (~> 2.0)
cookbook-omnifetch (~> 0.5)
diff-lcs (~> 1.0)
@ -87,147 +82,153 @@ GEM
mixlib-cli (~> 1.7)
mixlib-shellout (~> 2.0)
paint (~> 1.0)
solve (> 2.0, < 4.0)
chef-provisioning (2.2.1)
cheffish (>= 4.0, < 6.0)
solve (> 2.0, < 5.0)
chef-provisioning (2.6.0)
cheffish (>= 4.0, < 14.0)
inifile (>= 2.0.2)
mixlib-install (>= 1.0, < 3.0)
mixlib-install (>= 1.0)
net-scp (~> 1.0)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
net-ssh-gateway (> 1.2, < 3.0)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.0)
chef-vault (2.9.1)
chef-zero (5.3.2)
chef-vault (3.3.0)
chef-zero (13.1.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack (~> 2.0)
uuidtools (~> 2.1)
cheffish (5.0.1)
chef-zero (~> 5.0)
cheffish (13.1.0)
chef-zero (~> 13.0)
net-ssh
chefspec (6.2.0)
chef (>= 12.0)
fauxhai (>= 3.6, < 5)
chefspec (7.1.0)
chef (>= 12.14.89)
fauxhai (>= 4, < 6)
rspec (~> 3.0)
cleanroom (1.0.0)
coderay (1.1.1)
cookbook-omnifetch (0.5.1)
coderay (1.1.2)
concurrent-ruby (1.0.5)
cookbook-omnifetch (0.8.0)
mixlib-archive (~> 0.4)
cucumber-core (2.0.0)
backports (~> 3.6)
gherkin (~> 4.0)
cucumber-core (3.0.0)
backports (>= 3.8.0)
cucumber-tag_expressions (>= 1.0.1)
gherkin (>= 4.1.3)
cucumber-tag_expressions (1.0.1)
diff-lcs (1.3)
diffy (3.2.0)
docker-api (1.33.3)
excon (>= 0.38.0)
json
docker-api (1.34.0)
excon (>= 0.47.0)
multi_json
erubis (2.7.0)
excon (0.55.0)
faraday (0.9.2)
excon (0.59.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
fauxhai (4.1.0)
fauxhai (5.5.0)
net-ssh
ffi (1.9.18)
ffi-yajl (2.3.0)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
foodcritic (10.2.2)
foodcritic (12.2.1)
cucumber-core (>= 1.3)
erubis
ffi-yajl (~> 2.0)
nokogiri (>= 1.5, < 2.0)
rake
rufus-lru (~> 1.0)
treetop (~> 1.4)
yajl-ruby (~> 1.1)
fuzzyurl (0.9.0)
gherkin (4.1.1)
gherkin (5.0.0)
git (1.3.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.5)
highline (1.7.8)
hitimes (1.2.4)
hashie (3.5.6)
highline (1.7.10)
hitimes (1.2.6)
htmlentities (4.3.4)
httpclient (2.8.3)
inifile (3.0.0)
iniparse (1.4.2)
inspec (1.19.2)
iniparse (1.4.4)
inspec (1.45.13)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
htmlentities
json (>= 1.8, < 3.0)
method_source (~> 0.8)
mixlib-log
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
rubyzip (~> 1.1)
sslshake (~> 1)
semverse
sslshake (~> 1.2)
thor (~> 0.19)
toml (~> 0.1)
train (>= 0.22.0, < 1.0)
tomlrb (~> 1.2)
train (~> 0.29, >= 0.29.2)
ipaddress (0.8.3)
json (2.0.3)
kitchen-inspec (0.17.0)
iso8601 (0.9.1)
json (2.1.0)
kitchen-inspec (0.20.0)
hashie (~> 3.4)
inspec (>= 0.34.0, < 2.0.0)
test-kitchen (~> 1.6)
kitchen-vagrant (1.1.0)
kitchen-vagrant (1.2.1)
test-kitchen (~> 1.4)
knife-spork (1.6.3)
knife-spork (1.7.1)
app_conf (>= 0.4.0)
chef (>= 11.0.0)
diffy (>= 3.0.1)
git (>= 1.2.5)
libyajl2 (1.2.0)
little-plugger (1.1.4)
logging (2.2.0)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.8.2)
mini_portile2 (2.1.0)
method_source (0.9.0)
mini_portile2 (2.3.0)
minitar (0.5.4)
mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
mixlib-install (2.1.12)
artifactory
mixlib-install (3.8.0)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-versioning (1.1.0)
molinillo (0.5.7)
multi_json (1.12.1)
mixlib-shellout (2.3.2)
mixlib-versioning (1.2.2)
molinillo (0.6.4)
multi_json (1.12.2)
multipart-post (2.0.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)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nio4r (2.0.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (8.23.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ohai (13.6.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
@ -239,25 +240,24 @@ GEM
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
paint (1.0.1)
parallel (1.11.1)
parser (2.4.0.0)
ast (~> 2.2)
parslet (1.5.0)
blankslate (~> 2.0)
plist (3.2.0)
parallel (1.12.0)
parser (2.4.0.2)
ast (~> 2.3)
parslet (1.8.1)
plist (3.3.0)
polyglot (0.3.5)
powerpack (0.1.1)
proxifier (1.0.3)
pry (0.10.4)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
rack (2.0.1)
rainbow (2.2.1)
rake (12.0.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
rack (2.0.3)
rainbow (2.2.2)
rake
rake (12.3.0)
retryable (2.0.4)
ridley (5.1.0)
ridley (5.1.1)
addressable
buff-config (~> 2.0)
buff-extensions (~> 2.0)
@ -267,7 +267,7 @@ GEM
celluloid-io (~> 0.16.1)
chef-config (>= 12.5.0)
erubis
faraday (~> 0.9.0)
faraday (~> 0.9)
hashie (>= 2.0.2, < 4.0.0)
httpclient (~> 2.7)
json (>= 1.7.7)
@ -275,33 +275,34 @@ GEM
retryable (~> 2.0)
semverse (~> 2.0)
varia_model (~> 0.6)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.0)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (~> 3.7.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.5.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.48.1)
rubocop (0.51.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1)
rubyntlm (0.6.1)
ruby-progressbar (1.9.0)
rubyntlm (0.6.2)
rubyzip (1.2.1)
rufus-lru (1.1.0)
safe_yaml (1.0.4)
@ -309,38 +310,39 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
serverspec (2.38.0)
serverspec (2.41.3)
multi_json
rspec (~> 3.0)
rspec-its
specinfra (~> 2.53)
specinfra (~> 2.72)
sfl (2.3)
slop (3.6.0)
solve (3.1.0)
molinillo (>= 0.5)
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.67.7)
specinfra (2.72.1)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
sfl
sslshake (1.1.0)
sslshake (1.2.0)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (1.16.0)
mixlib-install (>= 1.2, < 3.0)
test-kitchen (1.19.1)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
safe_yaml (~> 1.0)
thor (~> 0.19, < 0.19.2)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.0.2)
thor (0.19.1)
timers (4.0.4)
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
train (0.23.0)
tomlrb (1.2.6)
train (0.29.2)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
@ -348,14 +350,14 @@ GEM
net-ssh (>= 2.9, < 5.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
treetop (1.6.8)
treetop (1.6.9)
polyglot (~> 0.3)
unicode-display_width (1.1.3)
unicode-display_width (1.3.0)
uuidtools (2.1.5)
varia_model (0.6.0)
buff-extensions (~> 2.0)
hashie (>= 2.0.2, < 4.0.0)
winrm (2.2.1)
winrm (2.2.3)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
@ -367,13 +369,12 @@ GEM
winrm-elevated (1.1.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
winrm-fs (1.0.1)
winrm-fs (1.0.2)
erubis (~> 2.7)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
wmi-lite (1.0.0)
yajl-ruby (1.3.0)
PLATFORMS
ruby
@ -396,4 +397,4 @@ DEPENDENCIES
test-kitchen
BUNDLED WITH
1.14.4
1.14.6

View file

@ -1,9 +1,11 @@
{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }:
bundlerEnv {
name = "chefdk-1.3.40";
# Last updated via:
# nix-shell -p bundix -p gcc -p libxml2 -p zlib --run "bundix -mdl"
name = "chefdk-2.3.4";
inherit ruby;
ruby = ruby_2_4;
gemdir = ./.;
buildInputs = [ perl autoconf ];

File diff suppressed because it is too large Load diff

View file

@ -7076,9 +7076,7 @@ with pkgs;
cheat = callPackage ../applications/misc/cheat { };
chefdk = callPackage ../development/tools/chefdk {
ruby = ruby_2_0;
};
chefdk = callPackage ../development/tools/chefdk { };
matter-compiler = callPackage ../development/compilers/matter-compiler {};