summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock42
-rw-r--r--omnibus/Gemfile.lock52
3 files changed, 41 insertions, 56 deletions
diff --git a/Gemfile b/Gemfile
index 3b06e9a59a..921012c21e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,8 +71,7 @@ group(:development, :test) do
end
group(:chefstyle) do
- # for testing new chefstyle rules
- gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+ gem "chefstyle", "1.2.1" # pinned so we don't have to fixup 2 branches for new rules
end
instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index acebfb8946..c79ac2a2b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,4 @@
GIT
- remote: https://github.com/chef/chefstyle.git
- revision: 560b01fae7fea3e5ffc98deef9488838ea3780e2
- branch: master
- specs:
- chefstyle (1.2.1)
- rubocop (= 0.89.1)
-
-GIT
remote: https://github.com/chef/ohai.git
revision: 0b01c1b4cb15e9b60337e5a29e93af1ad502027b
branch: 15-stable
@@ -146,7 +138,7 @@ GEM
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- chef-vault (4.0.6)
+ chef-vault (4.0.11)
chef-zero (14.0.17)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
@@ -156,6 +148,8 @@ GEM
cheffish (14.0.13)
chef-zero (~> 14.0)
net-ssh
+ chefstyle (1.2.1)
+ rubocop (= 0.89.1)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crack (0.4.3)
@@ -190,15 +184,13 @@ GEM
hashdiff (1.0.1)
hashie (3.6.0)
highline (1.7.10)
- htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.22.8)
+ inspec-core (4.22.22)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
- htmlentities (~> 4.3)
json_schemer (>= 0.2.1, < 0.2.12)
license-acceptance (>= 0.2.13, < 2.0)
method_source (>= 0.8, < 2.0)
@@ -212,14 +204,13 @@ GEM
rubyzip (~> 1.2, >= 1.2.2)
semverse (~> 3.0)
sslshake (~> 1.2)
- term-ansicolor (~> 1.7)
thor (>= 0.20, < 2.0)
tomlrb (~> 1.2.0)
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (4.22.8)
- inspec-core (= 4.22.8)
+ inspec-core-bin (4.22.22)
+ inspec-core (= 4.22.22)
ipaddress (0.8.3)
iso8601 (0.13.0)
json (2.3.1)
@@ -239,15 +230,15 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.14)
method_source (1.0.0)
- mixlib-archive (1.0.6)
+ mixlib-archive (1.0.7)
mixlib-log
- mixlib-archive (1.0.6-universal-mingw32)
+ mixlib-archive (1.0.7-universal-mingw32)
mixlib-log
- mixlib-authentication (3.0.6)
- mixlib-cli (2.1.6)
+ mixlib-authentication (3.0.7)
+ mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
- mixlib-log (3.0.8)
+ mixlib-log (3.0.9)
mixlib-shellout (3.1.4)
chef-utils
mixlib-shellout (3.1.4-universal-mingw32)
@@ -289,7 +280,7 @@ GEM
pry-stack_explorer (0.4.12)
binding_of_caller (~> 0.7)
pry (~> 0.13)
- public_suffix (4.0.5)
+ public_suffix (4.0.6)
rack (2.2.3)
rainbow (3.0.0)
rake (12.3.3)
@@ -341,14 +332,9 @@ GEM
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
structured_warnings (0.4.0)
- sync (0.5.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- term-ansicolor (1.7.1)
- tins (~> 1.0)
thor (1.0.1)
- tins (1.25.0)
- sync
tomlrb (1.2.9)
train-core (3.3.16)
addressable (~> 2.5)
@@ -390,7 +376,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
win32-api (1.5.3-universal-mingw32)
- win32-certstore (0.4.0)
+ win32-certstore (0.4.1)
ffi
mixlib-shellout
win32-dir (0.5.1)
@@ -446,7 +432,7 @@ DEPENDENCIES
chef-utils!
chef-vault
cheffish (~> 14)
- chefstyle!
+ chefstyle (= 1.2.1)
ed25519
fauxhai-ng
inspec-core (~> 4.18)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 87836babb1..999a51e557 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 3eae1cd2e5b9bb62775485e1dfa59aec8c70f5da
+ revision: 22ce15145e83cefbe8ae8603bacf8a340e274715
branch: master
specs:
- omnibus (7.0.20)
+ omnibus (7.0.24)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 379f9c7fe65e867af2b69b28b2ced739526f9842
+ revision: e55d20a73bf8641c5fd009d90747ee9ad05192f1
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,16 +32,16 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.356.0)
- aws-sdk-core (3.104.3)
+ aws-partitions (1.363.0)
+ aws-sdk-core (3.105.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.36.0)
+ aws-sdk-kms (1.37.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.78.0)
+ aws-sdk-s3 (1.79.1)
aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.4.35)
+ chef (16.4.41)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.4.35)
- chef-utils (= 16.4.35)
+ chef-config (= 16.4.41)
+ chef-utils (= 16.4.41)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -99,12 +99,12 @@ GEM
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.4.35-universal-mingw32)
+ chef (16.4.41-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.4.35)
- chef-utils (= 16.4.35)
+ chef-config (= 16.4.41)
+ chef-utils (= 16.4.41)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -146,17 +146,17 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (16.4.35)
+ chef-config (16.4.41)
addressable
- chef-utils (= 16.4.35)
+ chef-utils (= 16.4.41)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.1.11)
- chef-utils (16.4.35)
- chef-vault (4.0.6)
- chef-zero (15.0.1)
+ chef-utils (16.4.41)
+ chef-vault (4.0.11)
+ chef-zero (15.0.2)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 5.0)
mixlib-log (>= 2.0, < 4.0)
@@ -211,19 +211,19 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.14)
minitar (0.9)
- mixlib-archive (1.0.6)
+ mixlib-archive (1.0.7)
mixlib-log
- mixlib-archive (1.0.6-universal-mingw32)
+ mixlib-archive (1.0.7-universal-mingw32)
mixlib-log
- mixlib-authentication (3.0.6)
- mixlib-cli (2.1.6)
+ mixlib-authentication (3.0.7)
+ mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
mixlib-install (3.12.3)
mixlib-shellout
mixlib-versioning
thor
- mixlib-log (3.0.8)
+ mixlib-log (3.0.9)
mixlib-shellout (3.1.4)
chef-utils
mixlib-shellout (3.1.4-universal-mingw32)
@@ -248,7 +248,7 @@ GEM
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (16.4.11)
+ ohai (16.4.12)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -270,7 +270,7 @@ GEM
zhexdump (>= 0.0.2)
plist (3.5.0)
proxifier (1.0.3)
- public_suffix (4.0.5)
+ public_suffix (4.0.6)
rack (2.2.3)
rainbow (3.0.0)
retryable (3.0.5)
@@ -336,7 +336,7 @@ GEM
unicode_utils (1.4.0)
uuidtools (2.1.5)
win32-api (1.5.3-universal-mingw32)
- win32-certstore (0.4.0)
+ win32-certstore (0.4.1)
ffi
mixlib-shellout
win32-event (0.6.3)
View Lorry Controller Status