summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2019-04-17 14:40:55 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2019-04-24 13:29:00 -0400
commita6db21f6fe5d582f676ae86e6567269ab0dee5d6 (patch)
tree418c3936064dc72648646dbc0c00826546533380
parent210d729737814a0763fc089dd9815bf34b1be576 (diff)
downloadchef-a6db21f6fe5d582f676ae86e6567269ab0dee5d6.tar.gz
Update to the released chef-core gem
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock98
-rw-r--r--chef.gemspec1
3 files changed, 12 insertions, 89 deletions
diff --git a/Gemfile b/Gemfile
index 86c9e6707a..6abe88b86e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,8 +13,6 @@ gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
gem "cheffish", "~> 14"
-gem "chef-core", git: "https://github.com/chef/chef-core"
-
group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
diff --git a/Gemfile.lock b/Gemfile.lock
index c0db0b072c..9a3df635c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,4 @@
GIT
- remote: https://github.com/chef/chef-core
- revision: 777ab84fd0b6ad2c4fc0341a61f4ee68c1309eeb
- specs:
- chef-core (0.0.1)
- chef-telemetry
- mixlib-log
- pastel
- r18n-desktop
- train (~> 2)
- tty-color
- tty-cursor
- tty-spinner
-
-GIT
remote: https://github.com/chef/chefstyle.git
revision: 0f3c0afe4e875c8c17627b8986f23bd4e4dc75cb
branch: master
@@ -46,6 +32,7 @@ PATH
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.0.232)
+ chef-core (>= 0.0.1)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -74,6 +61,7 @@ PATH
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.0.232)
+ chef-core (>= 0.0.1)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -129,12 +117,6 @@ 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)
@@ -142,6 +124,15 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
+ chef-core (0.0.3)
+ chef-telemetry
+ mixlib-log
+ pastel
+ r18n-desktop
+ train-core (~> 2.0, >= 2.0.12)
+ tty-color
+ tty-cursor
+ tty-spinner
chef-telemetry (0.1.8)
chef-config
concurrent-ruby (~> 1.0)
@@ -162,24 +153,15 @@ GEM
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)
@@ -192,21 +174,6 @@ 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)
@@ -225,7 +192,6 @@ GEM
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)
@@ -256,7 +222,6 @@ 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)
@@ -267,11 +232,7 @@ 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)
@@ -285,15 +246,6 @@ 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)
@@ -311,7 +263,6 @@ 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)
@@ -342,11 +293,6 @@ 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)
@@ -384,11 +330,6 @@ 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)
@@ -407,24 +348,9 @@ 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)
@@ -457,7 +383,6 @@ 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)
@@ -520,7 +445,6 @@ DEPENDENCIES
bcrypt_pbkdf
chef!
chef-config!
- chef-core!
chef-vault
cheffish (~> 14)
chefstyle!
diff --git a/chef.gemspec b/chef.gemspec
index 63f9a8c331..59a7bcf677 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.5.0"
s.add_dependency "chef-config", "= #{Chef::VERSION}"
+ s.add_dependency "chef-core", ">= 0.0.1"
s.add_dependency "mixlib-cli", ">= 1.7", "< 3.0"
s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"