summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2019-04-20 00:11:33 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2019-04-20 00:11:33 -0400
commitc49a96371eef4355d4b4132e99536624b9a34b1c (patch)
tree6d718a6a9cb1a9803788140dc0646bf4b0d2cb5a
parentf1a97f33d4b67645ed55ce6e15274d6adf396670 (diff)
downloadchef-mp/add-train-to-omnibus-package.tar.gz
This is temporary. Once inspec 4 gem is released, correct deps will get pulled in, and we'll be moving chef-core to also use train-core instead of train. In the interim in order to get appbundler builds passing for the bootstrap branch with a train dep from git, this needs to be merged to master. This will ensure the train dep is included in the package used to seed appbundler-update. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock83
2 files changed, 84 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index f28838e38b..3b891fb15d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ group(:omnibus_package) do
gem "rb-readline"
gem "inspec-core", git: "https://github.com/inspec/inspec.git", branch: "master"
gem "train-core", git: "https://github.com/inspec/train.git", branch: "master"
+ gem "train", git: "https://github.com/inspec/train.git", branch: "master"
gem "chef-vault"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index cdf2cd3c6a..6391354e48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,6 +60,22 @@ GIT
revision: e68511376de81172d69bcd3c773438b8754b9ee4
branch: master
specs:
+ train (2.0.8)
+ azure_graph_rbac (~> 0.16)
+ azure_mgmt_key_vault (~> 0.17)
+ azure_mgmt_resources (~> 0.15)
+ bcrypt_pbkdf (~> 1.0)
+ docker-api (~> 1.26)
+ ed25519 (~> 1.2)
+ google-api-client (~> 0.23.9)
+ googleauth (~> 0.6.6)
+ inifile
+ json (>= 1.8, < 3.0)
+ mixlib-shellout (>= 2.0, < 4.0)
+ net-scp (>= 1.2, < 3.0)
+ net-ssh (>= 2.9, < 6.0)
+ winrm (~> 2.0)
+ winrm-fs (~> 1.0)
train-core (2.0.8)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
@@ -161,6 +177,12 @@ GEM
mixlib-cli (>= 1.4, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.0)
+ azure_graph_rbac (0.17.1)
+ ms_rest_azure (~> 0.11.0)
+ azure_mgmt_key_vault (0.17.3)
+ ms_rest_azure (~> 0.11.0)
+ azure_mgmt_resources (0.17.3)
+ ms_rest_azure (~> 0.11.0)
bcrypt_pbkdf (1.0.1)
bcrypt_pbkdf (1.0.1-x64-mingw32)
bcrypt_pbkdf (1.0.1-x86-mingw32)
@@ -179,16 +201,28 @@ GEM
chef-zero (~> 14.0)
net-ssh
coderay (1.1.2)
+ concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
+ declarative (0.0.10)
+ declarative-option (0.1.0)
diff-lcs (1.3)
docile (1.3.1)
+ docker-api (1.34.2)
+ excon (>= 0.47.0)
+ multi_json
+ domain_name (0.5.20180417)
+ unf (>= 0.0.5, < 1.0.0)
ed25519 (1.2.4)
equatable (0.5.0)
erubis (2.7.0)
+ excon (0.64.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
+ faraday-cookie_jar (0.0.6)
+ faraday (>= 0.7.4)
+ http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.10.0)
@@ -201,6 +235,21 @@ GEM
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
+ google-api-client (0.23.9)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (>= 0.5, < 0.7.0)
+ httpclient (>= 2.8.1, < 3.0)
+ mime-types (~> 3.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ signet (~> 0.9)
+ googleauth (0.6.7)
+ faraday (~> 0.12)
+ jwt (>= 1.4, < 3.0)
+ memoist (~> 0.16)
+ multi_json (~> 1.11)
+ os (>= 0.9, < 2.0)
+ signet (~> 0.7)
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
@@ -209,12 +258,16 @@ GEM
hashie (3.6.0)
highline (1.7.10)
htmlentities (4.3.4)
+ http-cookie (1.0.3)
+ domain_name (~> 0.5)
httpclient (2.8.3)
+ inifile (3.0.0)
iniparse (1.4.4)
ipaddress (0.8.3)
iso8601 (0.12.1)
jaro_winkler (1.5.2)
json (2.2.0)
+ jwt (2.1.0)
libyajl2 (1.2.0)
license-acceptance (0.2.10)
pastel (~> 0.7)
@@ -225,7 +278,11 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
+ memoist (0.16.0)
method_source (0.9.2)
+ mime-types (3.2.2)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2019.0331)
mixlib-archive (1.0.1)
mixlib-log
mixlib-archive (1.0.1-universal-mingw32)
@@ -239,6 +296,15 @@ GEM
mixlib-shellout (2.4.4-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
+ ms_rest (0.7.3)
+ concurrent-ruby (~> 1.0)
+ faraday (~> 0.9)
+ timeliness (~> 0.3)
+ ms_rest_azure (0.11.0)
+ concurrent-ruby (~> 1.0)
+ faraday (~> 0.9)
+ faraday-cookie_jar (~> 0.0.6)
+ ms_rest (~> 0.7.2)
multi_json (1.13.1)
multipart-post (2.0.0)
necromancer (0.4.0)
@@ -256,6 +322,7 @@ GEM
nori (2.6.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
+ os (1.0.0)
parallel (1.17.0)
parser (2.6.2.1)
ast (~> 2.4.0)
@@ -283,6 +350,11 @@ GEM
rainbow (3.0.0)
rake (12.3.2)
rb-readline (0.5.5)
+ representable (3.0.4)
+ declarative (< 0.1.0)
+ declarative-option (< 0.2.0)
+ uber (< 0.2.0)
+ retriable (3.1.2)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -320,6 +392,11 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (3.0.0)
+ signet (0.11.0)
+ addressable (~> 2.3)
+ faraday (~> 0.9)
+ jwt (>= 1.5, < 3.0)
+ multi_json (~> 1.10)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
@@ -338,6 +415,7 @@ GEM
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (0.20.3)
+ timeliness (0.4.0)
timers (4.3.0)
tins (1.20.2)
tomlrb (1.2.8)
@@ -364,6 +442,10 @@ GEM
pastel (~> 0.7.2)
strings (~> 0.1.0)
tty-screen (~> 0.6.4)
+ uber (0.1.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.6)
unicode-display_width (1.4.1)
unicode_utils (1.4.0)
uuidtools (2.1.5)
@@ -443,6 +525,7 @@ DEPENDENCIES
ruby-shadow
simplecov
tomlrb
+ train!
train-core!
webmock
yard