diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 29 | ||||
| -rw-r--r-- | chef.gemspec | 25 |
3 files changed, 8 insertions, 48 deletions
@@ -22,8 +22,6 @@ end gem "cheffish", ">= 17" -gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep - group(:omnibus_package) do gem "appbundler" gem "rb-readline" diff --git a/Gemfile.lock b/Gemfile.lock index 98b835a896..3d57c82b85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,18 +37,15 @@ PATH specs: chef (17.1.9) addressable - bcrypt_pbkdf (~> 1.1) chef-config (= 17.1.9) chef-utils (= 17.1.9) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) - ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.5.0) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 3) iniparse (~> 1.4) inspec-core (~> 4.23) license-acceptance (>= 1.0.5, < 3) @@ -58,33 +55,24 @@ PATH mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) net-sftp (>= 2.1.2, < 4.0) - net-ssh (>= 5.1, < 7) - net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 17.0) - pastel plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) - tty-prompt (~> 0.21) - tty-screen (~> 0.6) - tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) chef (17.1.9-universal-mingw32) addressable - bcrypt_pbkdf (~> 1.1) chef-config (= 17.1.9) chef-utils (= 17.1.9) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) - ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.5.0) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 3) iniparse (~> 1.4) inspec-core (~> 4.23) iso8601 (>= 0.12.1, < 0.14) @@ -95,18 +83,12 @@ PATH mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) net-sftp (>= 2.1.2, < 4.0) - net-ssh (>= 5.1, < 7) - net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 17.0) - pastel plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) - tty-prompt (~> 0.21) - tty-screen (~> 0.6) - tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) win32-api (~> 1.5.3) win32-certstore (~> 0.6.2) @@ -151,9 +133,6 @@ GEM mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) - bcrypt_pbkdf (1.1.0) - bcrypt_pbkdf (1.1.0-x64-mingw32) - bcrypt_pbkdf (1.1.0-x86-mingw32) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) builder (3.2.4) @@ -178,7 +157,6 @@ GEM rexml debug_inspector (1.1.0) diff-lcs (1.3) - ed25519 (1.2.4) erubi (1.10.0) erubis (2.7.0) faraday (1.4.1) @@ -210,7 +188,6 @@ GEM builder (>= 2.1.2) hashdiff (1.0.1) hashie (4.1.0) - highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) inspec-core (4.36.4) @@ -275,11 +252,6 @@ GEM net-sftp (3.0.0) net-ssh (>= 5.0.0, < 7.0.0) net-ssh (6.1.0) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - net-ssh-multi (1.2.1) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) nori (2.6.0) parallel (1.20.1) parser (3.0.1.1) @@ -434,7 +406,6 @@ DEPENDENCIES chef! chef-bin! chef-config! - chef-telemetry (>= 1.0.8) chef-utils! chef-vault cheffish (>= 17) diff --git a/chef.gemspec b/chef.gemspec index 21641258c5..76f562cc71 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -40,27 +40,18 @@ Gem::Specification.new do |s| s.add_dependency "ffi", ">= 1.5.0" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "net-ssh", ">= 5.1", "< 7" - s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" - s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" - s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support - s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support - s.add_dependency "highline", ">= 1.6.9", "< 3" - s.add_dependency "tty-prompt", "~> 0.21" # knife ui.ask prompt - s.add_dependency "tty-screen", "~> 0.6" # knife list - s.add_dependency "tty-table", "~> 0.11" # knife render table output. - s.add_dependency "pastel" # knife ui.color - s.add_dependency "erubis", "~> 2.7" - s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output - s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" + s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" # remote_file resource + s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check + s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output. Used in lib/chef/util/diff + s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource s.add_dependency "chef-zero", ">= 14.0.11" - s.add_dependency "chef-vault" + s.add_dependency "chef-vault" # chef-vault resources and helpers - s.add_dependency "plist", "~> 3.2" - s.add_dependency "iniparse", "~> 1.4" + s.add_dependency "plist", "~> 3.2" # launchd, dscl/mac user, macos_userdefaults, osx_profile and plist resources + s.add_dependency "iniparse", "~> 1.4" # systemd_unit resource s.add_dependency "addressable" s.add_dependency "syslog-logger", "~> 1.6" - s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0" + s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0" # osx_profile resource s.add_dependency "proxifier", "~> 1.0" |