summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock65
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock32
-rw-r--r--omnibus_overrides.rb4
5 files changed, 71 insertions, 36 deletions
diff --git a/Gemfile b/Gemfile
index 7a5a26bbbc..534ef0ec19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ group(:development, :test) do
# for testing new chefstyle rules
# gem 'chefstyle', github: 'chef/chefstyle'
- gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+ gem "chefstyle"
end
group(:travis) do
diff --git a/Gemfile.lock b/Gemfile.lock
index 655d04592e..26b0b52af8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,4 @@
GIT
- remote: https://github.com/chef/chefstyle.git
- revision: 4eb575a63ce5679d9166211d684c9e3fff168d2a
- branch: master
- specs:
- chefstyle (0.6.0)
- rubocop (= 0.49.1)
-
-GIT
remote: https://github.com/chef/ohai.git
revision: 8f699a2404e135165a93f8bc171ea74c51fe9524
branch: master
@@ -121,9 +113,20 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
- appbundler (0.10.0)
+ appbundler (0.11.0)
mixlib-cli (~> 1.4)
+ mixlib-shellout (~> 2.0)
ast (2.4.0)
+ aws-sdk (2.11.6)
+ aws-sdk-resources (= 2.11.6)
+ aws-sdk-core (2.11.6)
+ aws-sigv4 (~> 1.0)
+ jmespath (~> 1.0)
+ aws-sdk-resources (2.11.6)
+ aws-sdk-core (= 2.11.6)
+ aws-sigv4 (1.0.2)
+ azure_mgmt_resources (0.16.0)
+ ms_rest_azure (~> 0.10.0)
backports (3.11.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
@@ -139,7 +142,10 @@ GEM
cheffish (13.1.0)
chef-zero (~> 13.0)
net-ssh
+ chefstyle (0.6.0)
+ rubocop (= 0.49.1)
coderay (1.1.2)
+ concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
@@ -148,12 +154,17 @@ GEM
docker-api (1.34.0)
excon (>= 0.47.0)
multi_json
+ domain_name (0.5.20170404)
+ unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
ethon (0.11.0)
ffi (>= 1.3.0)
excon (0.60.0)
faraday (0.14.0)
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.9.23)
@@ -179,9 +190,12 @@ GEM
hashie (3.5.7)
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)
- inspec (1.51.18)
+ inspec (2.0.17)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -199,9 +213,10 @@ GEM
sslshake (~> 1.2)
thor (~> 0.19)
tomlrb (~> 1.2)
- train (~> 0.32)
+ train (~> 1.1)
ipaddress (0.8.3)
iso8601 (0.9.1)
+ jmespath (1.3.1)
json (2.1.0)
launchy (2.4.3)
addressable (~> 2.3)
@@ -221,6 +236,15 @@ GEM
mixlib-shellout (2.3.2-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
+ ms_rest (0.7.2)
+ concurrent-ruby (~> 1.0)
+ faraday (~> 0.9)
+ timeliness (~> 0.3)
+ ms_rest_azure (0.10.3)
+ 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)
net-http-persistent (2.9.4)
@@ -241,9 +265,9 @@ GEM
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.12.1)
- parser (2.4.0.2)
- ast (~> 2.3)
- parslet (1.8.1)
+ parser (2.5.0.2)
+ ast (~> 2.4.0)
+ parslet (1.8.2)
plist (3.4.0)
powerpack (0.1.1)
proxifier (1.0.3)
@@ -324,9 +348,13 @@ GEM
syslog-logger (1.6.8)
systemu (2.6.5)
thor (0.20.0)
+ timeliness (0.3.8)
tomlrb (1.2.6)
- train (0.32.0)
+ train (1.1.1)
+ aws-sdk (~> 2)
+ azure_mgmt_resources (~> 0.15)
docker-api (~> 1.26)
+ inifile
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
net-scp (~> 1.2)
@@ -344,6 +372,11 @@ GEM
typhoeus (~> 0.6, >= 0.6.8)
typhoeus (0.8.0)
ethon (>= 0.8.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.5)
+ unf_ext (0.0.7.5-x64-mingw32)
+ unf_ext (0.0.7.5-x86-mingw32)
unicode-display_width (1.3.0)
uuidtools (2.1.5)
webmock (3.3.0)
@@ -400,7 +433,7 @@ DEPENDENCIES
chef-config!
chef-vault
cheffish (~> 13)
- chefstyle!
+ chefstyle
inspec
netrc
octokit
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index dbf7409032..9470a86266 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", git: "https://github.com/chef/omnibus"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/improve-appbundling"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/appbundle-0.11-without"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a36078d763..bc5e9cbbbf 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,8 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 63e908114e460d47609869ece898c45d7250247b
+ revision: bc76c699bc8b85959bb546933efa6b5cf0ff1823
+ branch: lcg/improve-appbundling
specs:
- omnibus (5.6.9)
+ omnibus (5.6.10)
aws-sdk (~> 2)
chef-sugar (~> 3.3)
cleanroom (~> 1.0)
@@ -10,14 +11,15 @@ GIT
license_scout (~> 1.0)
mixlib-shellout (~> 2.0)
mixlib-versioning
- ohai (~> 8.0)
+ ohai (>= 8.6.0.alpha.1, < 15)
pedump
ruby-progressbar (~> 1.7)
thor (~> 0.18)
GIT
remote: https://github.com/chef/omnibus-software
- revision: 4ef2d1a5b9162f4f5f52617d2a0122796b4f3c43
+ revision: 3f6f9836cb041ad6187b7b52a25cf759fc830bc6
+ branch: lcg/appbundle-0.11-without
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -29,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.10.129)
- aws-sdk-resources (= 2.10.129)
- aws-sdk-core (2.10.129)
+ aws-sdk (2.11.6)
+ aws-sdk-resources (= 2.11.6)
+ aws-sdk-core (2.11.6)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.10.129)
- aws-sdk-core (= 2.10.129)
+ aws-sdk-resources (2.11.6)
+ aws-sdk-core (= 2.11.6)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -76,7 +78,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (13.7.16)
+ chef-config (13.8.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -90,9 +92,9 @@ GEM
erubis (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
- ffi (1.9.21)
- ffi (1.9.21-x64-mingw32)
- ffi (1.9.21-x86-mingw32)
+ ffi (1.9.23)
+ ffi (1.9.23-x64-mingw32)
+ ffi (1.9.23-x86-mingw32)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
@@ -111,7 +113,7 @@ GEM
kitchen-vagrant (0.19.0)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
- license_scout (1.0.0)
+ license_scout (1.0.1)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
toml-rb (~> 1.0)
@@ -148,7 +150,7 @@ GEM
nori (2.6.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (8.26.1)
+ ohai (13.7.1)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index e40a322775..51c5df4a01 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,8 +1,8 @@
# THIS IS NOW HAND MANAGED, JUST EDIT THE THING
# .travis.yml and appveyor.yml consume this,
# try to keep it machine-parsable.
-override :rubygems, version: "2.6.14"
-override :bundler, version: "1.15.4"
+override :rubygems, version: "2.7.6"
+override :bundler, version: "1.16.1"
override "nokogiri", version: "1.8.1"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
View Lorry Controller Status