diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 85 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 2 |
3 files changed, 68 insertions, 22 deletions
@@ -16,7 +16,8 @@ gem "cheffish", "~> 14" group(:omnibus_package) do gem "appbundler" gem "rb-readline" - gem "inspec-core", git: "https://github.com/chef/inspec.git", branch: "master" + gem "inspec-core", git: "https://github.com/inspec/inspec.git", branch: "master" + gem "train-core", git: "https://github.com/inspec/train.git", branch: "ed25519" gem "chef-vault" end diff --git a/Gemfile.lock b/Gemfile.lock index 85b7fc5e6a..cc2898aa10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,11 +7,29 @@ GIT rubocop (= 0.62.0) GIT - remote: https://github.com/chef/inspec.git - revision: e76978cd679155938242499860645ecaa17fef37 + remote: https://github.com/chef/ohai.git + revision: 3cbf90d12abb2fe11bc486b87449a98ea02988d2 branch: master specs: - inspec-core (4.1.0) + ohai (15.0.32) + chef-config (>= 12.8, < 16) + ffi (~> 1.9) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli (>= 1.7.0) + mixlib-config (>= 2.0, < 4.0) + mixlib-log (>= 2.0.1, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + plist (~> 3.1) + systemu (~> 2.6.4) + wmi-lite (~> 1.0) + +GIT + remote: https://github.com/inspec/inspec.git + revision: e3999a0814cffdb97257350352fa66272499a687 + branch: master + specs: + inspec-core (4.1.2) addressable (~> 2.4) faraday (>= 0.9.0) faraday_middleware (~> 0.12.2) @@ -38,22 +56,19 @@ GIT tty-table (~> 0.10) GIT - remote: https://github.com/chef/ohai.git - revision: 3cbf90d12abb2fe11bc486b87449a98ea02988d2 - branch: master + remote: https://github.com/inspec/train.git + revision: 5d9b4f561883ee7946053fe83ef833f2137fa1b3 + branch: ed25519 specs: - ohai (15.0.32) - chef-config (>= 12.8, < 16) - ffi (~> 1.9) - ffi-yajl (~> 2.2) - ipaddress - mixlib-cli (>= 1.7.0) - mixlib-config (>= 2.0, < 4.0) - mixlib-log (>= 2.0.1, < 4.0) + train-core (2.0.7) + bcrypt_pbkdf (~> 1.0) + ed25519 (~> 1.2) + json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - plist (~> 3.1) - systemu (~> 2.6.4) - wmi-lite (~> 1.0) + net-scp (>= 1.2, < 3.0) + net-ssh (>= 2.9, < 6.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) PATH remote: . @@ -142,6 +157,9 @@ GEM mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) ast (2.4.0) + bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.0.1-x64-mingw32) + bcrypt_pbkdf (1.0.1-x86-mingw32) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) @@ -162,6 +180,7 @@ GEM debug_inspector (0.0.3) diff-lcs (1.3) docile (1.3.1) + ed25519 (1.2.4) equatable (0.5.0) erubis (2.7.0) faraday (0.15.4) @@ -178,10 +197,15 @@ GEM ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) + gssapi (1.2.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) hashdiff (0.3.8) hashie (3.6.0) highline (1.7.10) htmlentities (4.3.4) + httpclient (2.8.3) iniparse (1.4.4) ipaddress (0.8.3) iso8601 (0.12.1) @@ -193,6 +217,10 @@ GEM tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) method_source (0.9.2) mixlib-archive (1.0.1) mixlib-log @@ -207,8 +235,11 @@ GEM mixlib-shellout (2.4.4-universal-mingw32) win32-process (~> 0.8.2) wmi-lite (~> 1.0) + multi_json (1.13.1) multipart-post (2.0.0) necromancer (0.4.0) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) net-ssh (5.2.0) @@ -218,6 +249,7 @@ GEM net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) netrc (0.11.0) + nori (2.6.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.17.0) @@ -277,6 +309,7 @@ GEM ruby-prof (0.17.0) ruby-progressbar (1.10.0) ruby-shadow (2.5.0) + rubyntlm (0.6.2) rubyzip (1.2.2) safe_yaml (1.0.5) sawyer (0.8.1) @@ -304,9 +337,6 @@ GEM timers (4.3.0) tins (1.20.2) tomlrb (1.2.8) - train-core (2.0.5) - json (>= 1.8, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) tty-box (0.3.0) pastel (~> 0.7.2) strings (~> 0.1.4) @@ -361,6 +391,20 @@ GEM win32-taskscheduler (2.0.4) ffi structured_warnings + winrm (2.3.1) + builder (>= 2.1.2) + erubis (~> 2.7) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.1) + winrm-fs (1.3.2) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 2.0) wisper (2.0.0) wmi-lite (1.0.2) yard (0.9.19) @@ -395,6 +439,7 @@ DEPENDENCIES ruby-shadow simplecov tomlrb + train-core! webmock yard diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 2f6df00caf..039b932bad 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -320,7 +320,7 @@ GEM win32-ipc (>= 0.6.0) win32-process (0.8.3) ffi (>= 1.0.0) - win32-service (2.1.2) + win32-service (2.1.4) ffi ffi-win32-extensions win32-taskscheduler (2.0.4) |