test-kitchen 2.5.1 → 2.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +0 -11
- data/Rakefile +1 -3
- data/bin/kitchen +1 -3
- data/lib/kitchen.rb +1 -2
- data/lib/kitchen/base64_stream.rb +0 -1
- data/lib/kitchen/cli.rb +2 -2
- data/lib/kitchen/collection.rb +0 -1
- data/lib/kitchen/color.rb +0 -1
- data/lib/kitchen/command.rb +0 -1
- data/lib/kitchen/command/action.rb +1 -2
- data/lib/kitchen/command/console.rb +0 -1
- data/lib/kitchen/command/diagnose.rb +1 -2
- data/lib/kitchen/command/doctor.rb +0 -1
- data/lib/kitchen/command/exec.rb +0 -1
- data/lib/kitchen/command/list.rb +1 -2
- data/lib/kitchen/command/login.rb +0 -1
- data/lib/kitchen/command/package.rb +0 -1
- data/lib/kitchen/command/sink.rb +0 -1
- data/lib/kitchen/command/test.rb +1 -2
- data/lib/kitchen/config.rb +0 -1
- data/lib/kitchen/configurable.rb +0 -1
- data/lib/kitchen/data_munger.rb +0 -1
- data/lib/kitchen/diagnostic.rb +0 -1
- data/lib/kitchen/driver.rb +0 -1
- data/lib/kitchen/driver/base.rb +2 -39
- data/lib/kitchen/driver/dummy.rb +0 -1
- data/lib/kitchen/driver/exec.rb +0 -1
- data/lib/kitchen/driver/proxy.rb +0 -1
- data/lib/kitchen/driver/ssh_base.rb +3 -40
- data/lib/kitchen/errors.rb +0 -1
- data/lib/kitchen/generator/init.rb +0 -1
- data/lib/kitchen/instance.rb +41 -15
- data/lib/kitchen/lazy_hash.rb +0 -1
- data/lib/kitchen/lifecycle_hooks.rb +0 -1
- data/lib/kitchen/loader/yaml.rb +2 -3
- data/lib/kitchen/logger.rb +1 -2
- data/lib/kitchen/logging.rb +0 -1
- data/lib/kitchen/login_command.rb +0 -1
- data/lib/kitchen/metadata_chopper.rb +0 -1
- data/lib/kitchen/platform.rb +0 -1
- data/lib/kitchen/plugin.rb +0 -1
- data/lib/kitchen/plugin_base.rb +60 -0
- data/lib/kitchen/provisioner.rb +0 -1
- data/lib/kitchen/provisioner/base.rb +2 -2
- data/lib/kitchen/provisioner/chef/berkshelf.rb +0 -1
- data/lib/kitchen/provisioner/chef/common_sandbox.rb +1 -2
- data/lib/kitchen/provisioner/chef/policyfile.rb +2 -3
- data/lib/kitchen/provisioner/chef_apply.rb +2 -3
- data/lib/kitchen/provisioner/chef_base.rb +29 -19
- data/lib/kitchen/provisioner/chef_solo.rb +0 -1
- data/lib/kitchen/provisioner/chef_zero.rb +0 -1
- data/lib/kitchen/provisioner/dummy.rb +0 -1
- data/lib/kitchen/provisioner/shell.rb +1 -2
- data/lib/kitchen/rake_tasks.rb +0 -1
- data/lib/kitchen/shell_out.rb +1 -2
- data/lib/kitchen/ssh.rb +2 -3
- data/lib/kitchen/state_file.rb +1 -2
- data/lib/kitchen/suite.rb +0 -1
- data/lib/kitchen/thor_tasks.rb +1 -2
- data/lib/kitchen/transport.rb +0 -1
- data/lib/kitchen/transport/base.rb +2 -2
- data/lib/kitchen/transport/dummy.rb +0 -1
- data/lib/kitchen/transport/exec.rb +1 -2
- data/lib/kitchen/transport/ssh.rb +4 -5
- data/lib/kitchen/transport/winrm.rb +3 -4
- data/lib/kitchen/util.rb +0 -1
- data/lib/kitchen/verifier.rb +0 -1
- data/lib/kitchen/verifier/base.rb +2 -2
- data/lib/kitchen/verifier/busser.rb +2 -3
- data/lib/kitchen/verifier/dummy.rb +0 -1
- data/lib/kitchen/verifier/shell.rb +1 -2
- data/lib/kitchen/version.rb +1 -2
- data/lib/vendor/hash_recursive_merge.rb +0 -1
- data/templates/init/kitchen.yml.erb +2 -2
- data/test-kitchen.gemspec +4 -5
- metadata +21 -14
data/lib/kitchen/transport.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Author:: Salim Afiune (<salim@afiunemaya.com.mx>)
|
4
3
|
# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
|
@@ -22,6 +21,7 @@ require_relative "../errors"
|
|
22
21
|
require_relative "../lazy_hash"
|
23
22
|
require_relative "../logging"
|
24
23
|
require_relative "../login_command"
|
24
|
+
require_relative "../plugin_base"
|
25
25
|
|
26
26
|
module Kitchen
|
27
27
|
module Transport
|
@@ -41,7 +41,7 @@ module Kitchen
|
|
41
41
|
#
|
42
42
|
# @author Salim Afiune <salim@afiunemaya.com.mx>
|
43
43
|
# @author Fletcher Nichol <fnichol@nichol.ca>
|
44
|
-
class Base
|
44
|
+
class Base < Kitchen::Plugin::Base
|
45
45
|
include Configurable
|
46
46
|
include Logging
|
47
47
|
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
4
3
|
# you may not use this file except in compliance with the License.
|
@@ -12,7 +11,7 @@
|
|
12
11
|
# See the License for the specific language governing permissions and
|
13
12
|
# limitations under the License.
|
14
13
|
|
15
|
-
require "fileutils"
|
14
|
+
require "fileutils" unless defined?(FileUtils)
|
16
15
|
|
17
16
|
require_relative "../shell_out"
|
18
17
|
require_relative "base"
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
|
4
3
|
#
|
@@ -18,13 +17,13 @@
|
|
18
17
|
|
19
18
|
require_relative "../../kitchen"
|
20
19
|
|
21
|
-
require "fileutils"
|
22
|
-
require "net/ssh"
|
20
|
+
require "fileutils" unless defined?(FileUtils)
|
21
|
+
require "net/ssh" unless defined?(Net::SSH)
|
23
22
|
require "net/ssh/gateway"
|
24
23
|
require "net/ssh/proxy/http"
|
25
24
|
require "net/scp"
|
26
|
-
require "timeout"
|
27
|
-
require "benchmark"
|
25
|
+
require "timeout" unless defined?(Timeout)
|
26
|
+
require "benchmark" unless defined?(Benchmark)
|
28
27
|
|
29
28
|
module Kitchen
|
30
29
|
module Transport
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Author:: Salim Afiune (<salim@afiunemaya.com.mx>)
|
4
3
|
# Author:: Matt Wrock (<matt@mattwrock.com>)
|
@@ -18,10 +17,10 @@
|
|
18
17
|
# See the License for the specific language governing permissions and
|
19
18
|
# limitations under the License.
|
20
19
|
|
21
|
-
require "rbconfig"
|
22
|
-
require "uri"
|
20
|
+
require "rbconfig" unless defined?(RbConfig)
|
21
|
+
require "uri" unless defined?(URI)
|
23
22
|
require_relative "../../kitchen"
|
24
|
-
require "winrm"
|
23
|
+
require "winrm" unless defined?(WinRM::Connection)
|
25
24
|
|
26
25
|
module Kitchen
|
27
26
|
module Transport
|
data/lib/kitchen/util.rb
CHANGED
data/lib/kitchen/verifier.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
|
4
3
|
#
|
@@ -19,13 +18,14 @@
|
|
19
18
|
require_relative "../errors"
|
20
19
|
require_relative "../configurable"
|
21
20
|
require_relative "../logging"
|
21
|
+
require_relative "../plugin_base"
|
22
22
|
|
23
23
|
module Kitchen
|
24
24
|
module Verifier
|
25
25
|
# Base class for a verifier.
|
26
26
|
#
|
27
27
|
# @author Fletcher Nichol <fnichol@nichol.ca>
|
28
|
-
class Base
|
28
|
+
class Base < Kitchen::Plugin::Base
|
29
29
|
include Configurable
|
30
30
|
include Logging
|
31
31
|
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
|
4
3
|
#
|
@@ -16,8 +15,8 @@
|
|
16
15
|
# See the License for the specific language governing permissions and
|
17
16
|
# limitations under the License.
|
18
17
|
|
19
|
-
require "base64"
|
20
|
-
require "digest"
|
18
|
+
require "base64" unless defined?(Base64)
|
19
|
+
require "digest" unless defined?(Digest)
|
21
20
|
|
22
21
|
require_relative "base"
|
23
22
|
|
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
#
|
3
2
|
# Author:: SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
|
4
3
|
#
|
@@ -24,7 +23,7 @@ module Kitchen
|
|
24
23
|
#
|
25
24
|
# @author SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
|
26
25
|
class Shell < Kitchen::Verifier::Base
|
27
|
-
require "mixlib/shellout"
|
26
|
+
require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
|
28
27
|
|
29
28
|
kitchen_verifier_api_version 1
|
30
29
|
|
data/lib/kitchen/version.rb
CHANGED
data/test-kitchen.gemspec
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
1
|
lib = File.expand_path("../lib", __FILE__)
|
3
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
3
|
require "kitchen/version"
|
@@ -16,12 +15,12 @@ Gem::Specification.new do |gem|
|
|
16
15
|
gem.summary = gem.description
|
17
16
|
gem.homepage = "https://kitchen.ci/"
|
18
17
|
|
19
|
-
# The gemfile and gemspec are necessary for appbundler in
|
18
|
+
# The gemfile and gemspec are necessary for appbundler in ChefDK / Workstation
|
20
19
|
gem.files = %w{LICENSE test-kitchen.gemspec Gemfile Rakefile} + Dir.glob("{bin,lib,templates,support}/**/*")
|
21
20
|
gem.executables = %w{kitchen}
|
22
21
|
gem.require_paths = ["lib"]
|
23
22
|
|
24
|
-
gem.required_ruby_version = ">= 2.
|
23
|
+
gem.required_ruby_version = ">= 2.4"
|
25
24
|
|
26
25
|
gem.add_dependency "mixlib-shellout", ">= 1.2", "< 4.0"
|
27
26
|
gem.add_dependency "net-scp", ">= 1.1", "< 4.0" # pinning until we can confirm 4+ works
|
@@ -29,14 +28,14 @@ Gem::Specification.new do |gem|
|
|
29
28
|
gem.add_dependency "net-ssh-gateway", ">= 1.2", "< 3.0" # pinning until we can confirm 3+ works
|
30
29
|
gem.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
|
31
30
|
gem.add_dependency "bcrypt_pbkdf", "~> 1.0" # ed25519 ssh key support
|
32
|
-
gem.add_dependency "thor", "
|
31
|
+
gem.add_dependency "thor", ">= 0.19", "< 2.0"
|
33
32
|
gem.add_dependency "mixlib-install", "~> 3.6"
|
34
33
|
gem.add_dependency "winrm", "~> 2.0"
|
35
34
|
gem.add_dependency "winrm-elevated", "~> 1.0"
|
36
35
|
gem.add_dependency "winrm-fs", "~> 1.1"
|
37
36
|
# Required to run the Chef provisioner local license check for remote systems
|
38
37
|
# TK is not under Chef EULA
|
39
|
-
gem.add_dependency "license-acceptance", "
|
38
|
+
gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3.0" # pinning until we can confirm 3+ works
|
40
39
|
|
41
40
|
gem.add_development_dependency "rb-readline"
|
42
41
|
gem.add_development_dependency "bundler"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: test-kitchen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.7.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fletcher Nichol
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|
@@ -122,16 +122,22 @@ dependencies:
|
|
122
122
|
name: thor
|
123
123
|
requirement: !ruby/object:Gem::Requirement
|
124
124
|
requirements:
|
125
|
-
- - "
|
125
|
+
- - ">="
|
126
126
|
- !ruby/object:Gem::Version
|
127
127
|
version: '0.19'
|
128
|
+
- - "<"
|
129
|
+
- !ruby/object:Gem::Version
|
130
|
+
version: '2.0'
|
128
131
|
type: :runtime
|
129
132
|
prerelease: false
|
130
133
|
version_requirements: !ruby/object:Gem::Requirement
|
131
134
|
requirements:
|
132
|
-
- - "
|
135
|
+
- - ">="
|
133
136
|
- !ruby/object:Gem::Version
|
134
137
|
version: '0.19'
|
138
|
+
- - "<"
|
139
|
+
- !ruby/object:Gem::Version
|
140
|
+
version: '2.0'
|
135
141
|
- !ruby/object:Gem::Dependency
|
136
142
|
name: mixlib-install
|
137
143
|
requirement: !ruby/object:Gem::Requirement
|
@@ -192,22 +198,22 @@ dependencies:
|
|
192
198
|
name: license-acceptance
|
193
199
|
requirement: !ruby/object:Gem::Requirement
|
194
200
|
requirements:
|
195
|
-
- - "~>"
|
196
|
-
- !ruby/object:Gem::Version
|
197
|
-
version: '1.0'
|
198
201
|
- - ">="
|
199
202
|
- !ruby/object:Gem::Version
|
200
203
|
version: 1.0.11
|
204
|
+
- - "<"
|
205
|
+
- !ruby/object:Gem::Version
|
206
|
+
version: '3.0'
|
201
207
|
type: :runtime
|
202
208
|
prerelease: false
|
203
209
|
version_requirements: !ruby/object:Gem::Requirement
|
204
210
|
requirements:
|
205
|
-
- - "~>"
|
206
|
-
- !ruby/object:Gem::Version
|
207
|
-
version: '1.0'
|
208
211
|
- - ">="
|
209
212
|
- !ruby/object:Gem::Version
|
210
213
|
version: 1.0.11
|
214
|
+
- - "<"
|
215
|
+
- !ruby/object:Gem::Version
|
216
|
+
version: '3.0'
|
211
217
|
- !ruby/object:Gem::Dependency
|
212
218
|
name: rb-readline
|
213
219
|
requirement: !ruby/object:Gem::Requirement
|
@@ -417,6 +423,7 @@ files:
|
|
417
423
|
- lib/kitchen/metadata_chopper.rb
|
418
424
|
- lib/kitchen/platform.rb
|
419
425
|
- lib/kitchen/plugin.rb
|
426
|
+
- lib/kitchen/plugin_base.rb
|
420
427
|
- lib/kitchen/provisioner.rb
|
421
428
|
- lib/kitchen/provisioner/base.rb
|
422
429
|
- lib/kitchen/provisioner/chef/berkshelf.rb
|
@@ -478,7 +485,7 @@ homepage: https://kitchen.ci/
|
|
478
485
|
licenses:
|
479
486
|
- Apache-2.0
|
480
487
|
metadata: {}
|
481
|
-
post_install_message:
|
488
|
+
post_install_message:
|
482
489
|
rdoc_options: []
|
483
490
|
require_paths:
|
484
491
|
- lib
|
@@ -486,7 +493,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
486
493
|
requirements:
|
487
494
|
- - ">="
|
488
495
|
- !ruby/object:Gem::Version
|
489
|
-
version: '2.
|
496
|
+
version: '2.4'
|
490
497
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
491
498
|
requirements:
|
492
499
|
- - ">="
|
@@ -494,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
494
501
|
version: '0'
|
495
502
|
requirements: []
|
496
503
|
rubygems_version: 3.1.2
|
497
|
-
signing_key:
|
504
|
+
signing_key:
|
498
505
|
specification_version: 4
|
499
506
|
summary: Test Kitchen is an integration tool for developing and testing infrastructure
|
500
507
|
code and software on isolated target platforms.
|