summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2019-04-08 14:18:46 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2019-04-24 13:27:57 -0400
commit5a7f0eeb799f6287918d50d3dd268eacd33e6cb5 (patch)
treeae11766a3c530785df02c76d071981715e4f1991
parent5aa8f462bbfc3667e501866a8319087d57741f4a (diff)
downloadchef-5a7f0eeb799f6287918d50d3dd268eacd33e6cb5.tar.gz
Repoint train/chef_core* to git sources w/ dev branches
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock109
2 files changed, 109 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 61cad77895..428a09ac08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,11 +14,8 @@ gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.ex
gem "cheffish", "~> 14"
# The chef_core gems are sourced from git.
-# gem "chef_core", git: "https://github.com/chef/chef_core", branch: "chef-core-split"
-# gem "chef_core-actions", git: "https://github.com/chef/chef_core-actions", branch: "chef-core-split"
-# gem "chef_core-cliux", git: "https://github.com/chef/chef_core-cliux", branch: "chef-core-split"
+gem "chef_core", git: "https://github.com/chef/chef_core", branch: "chef-core-split"
# Temporary for testing:
-#gem "train", path: "../train"
# gem "chef_core", path: "../chef_core"
# gem "chef_core-actions", path: "../chef_core-actions"
# gem "chef_core-cliux", path: "../chef_core-cliux"
diff --git a/Gemfile.lock b/Gemfile.lock
index 13be39ec98..2749c9b8b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,15 @@
GIT
+ remote: https://github.com/chef/chef_core
+ revision: b7cd7f480af87d1166217f099255803c55c83e96
+ branch: chef-core-split
+ specs:
+ chef_core (0.0.1)
+ chef-telemetry
+ mixlib-log
+ r18n-desktop
+ train (~> 2.0)
+
+GIT
remote: https://github.com/chef/chefstyle.git
revision: 0f3c0afe4e875c8c17627b8986f23bd4e4dc75cb
branch: master
@@ -111,10 +122,16 @@ GEM
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
- appbundler (0.12.3)
+ appbundler (0.12.4)
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)
@@ -122,6 +139,11 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
+ chef-telemetry (0.1.8)
+ chef-config
+ concurrent-ruby (~> 1.0)
+ ffi-yajl (~> 2.2)
+ http (~> 2.2)
chef-vault (3.4.3)
chef-zero (14.0.12)
ffi-yajl (~> 2.2)
@@ -133,16 +155,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)
@@ -155,6 +189,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)
@@ -163,7 +212,17 @@ GEM
hashie (3.6.0)
highline (1.7.10)
htmlentities (4.3.4)
+ http (2.2.2)
+ addressable (~> 2.3)
+ http-cookie (~> 1.0)
+ http-form_data (~> 1.0.1)
+ http_parser.rb (~> 0.6.0)
+ http-cookie (1.0.3)
+ domain_name (~> 0.5)
+ http-form_data (1.0.3)
+ http_parser.rb (0.6.0)
httpclient (2.8.3)
+ inifile (3.0.0)
iniparse (1.4.4)
inspec-core (4.1.4.preview)
addressable (~> 2.4)
@@ -194,6 +253,7 @@ GEM
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.13)
pastel (~> 0.7)
@@ -204,7 +264,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)
@@ -218,6 +282,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)
@@ -235,6 +308,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)
@@ -258,10 +332,18 @@ GEM
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (3.0.3)
+ r18n-core (3.2.0)
+ r18n-desktop (3.2.0)
+ r18n-core (= 3.2.0)
rack (2.0.7)
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)
@@ -299,6 +381,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)
@@ -317,9 +404,24 @@ 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)
+ train (2.0.12)
+ azure_graph_rbac (~> 0.16)
+ azure_mgmt_key_vault (~> 0.17)
+ azure_mgmt_resources (~> 0.15)
+ docker-api (~> 1.26)
+ 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.12)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -350,6 +452,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)
@@ -410,6 +516,7 @@ DEPENDENCIES
chef!
chef-config!
chef-vault
+ chef_core!
cheffish (~> 14)
chefstyle!
ed25519