chef-config 16.6.14 → 16.7.61
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 103d62de0db045bef57e3cd80dc7f752888bd2625f7972eeef1a431b0ce9dd11
|
4
|
+
data.tar.gz: 8065ea3b4ffe2a0201d6e88176845bad18e510a7ecf88f2938f805893bac1e79
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 232f1d1106e5ed1510b119a1447aba0ab013efb2ae9f8ee819c13a7135d8e07f9edc70492c4755e2ab4cd06c0507476873b18bd3ddff23fa3a545bdd24afc110
|
7
|
+
data.tar.gz: d6760b1ec9cee88c42ec26e5aa827f382630d73e7251c5e19bdcaeb2849d2c46aa7ff26b3197fc9c61dc75ccd2e4e32a0cf10253bdb74930a958732a0e80db8c
|
data/chef-config.gemspec
CHANGED
@@ -8,10 +8,20 @@ Gem::Specification.new do |spec|
|
|
8
8
|
spec.authors = ["Adam Jacob"]
|
9
9
|
spec.email = ["adam@chef.io"]
|
10
10
|
|
11
|
-
spec.summary = %q{Chef's default configuration and config loading}
|
11
|
+
spec.summary = %q{Chef Infra's default configuration and config loading library}
|
12
12
|
spec.homepage = "https://github.com/chef/chef"
|
13
13
|
spec.license = "Apache-2.0"
|
14
14
|
|
15
|
+
spec.required_ruby_version = ">= 2.6.0"
|
16
|
+
|
17
|
+
spec.metadata = {
|
18
|
+
"bug_tracker_uri" => "https://github.com/chef/chef/issues",
|
19
|
+
"changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
|
20
|
+
"documentation_uri" => "https://github.com/chef/chef/tree/master/chef-config/README.md",
|
21
|
+
"homepage_uri" => "https://github.com/chef/chef/tree/master/chef-config",
|
22
|
+
"source_code_uri" => "https://github.com/chef/chef/tree/master/chef-config",
|
23
|
+
}
|
24
|
+
|
15
25
|
spec.require_paths = ["lib"]
|
16
26
|
|
17
27
|
spec.add_dependency "chef-utils", "= #{ChefConfig::VERSION}"
|
@@ -21,12 +31,6 @@ Gem::Specification.new do |spec|
|
|
21
31
|
spec.add_dependency "addressable"
|
22
32
|
spec.add_dependency "tomlrb", "~> 1.2"
|
23
33
|
|
24
|
-
spec.add_development_dependency "rake"
|
25
|
-
|
26
|
-
%w{rspec-core rspec-expectations rspec-mocks}.each do |rspec|
|
27
|
-
spec.add_development_dependency(rspec, "~> 3.2")
|
28
|
-
end
|
29
|
-
|
30
34
|
spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +
|
31
35
|
Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
|
32
36
|
|
@@ -20,6 +20,7 @@ module ChefConfig
|
|
20
20
|
module Mixin
|
21
21
|
module DotD
|
22
22
|
# Find available configuration files in a `.d/` style include directory.
|
23
|
+
# Make sure we exclude anything that's not a file so we avoid directories ending in .rb (just in case)
|
23
24
|
#
|
24
25
|
# @api internal
|
25
26
|
# @param path [String] Base .d/ path to load from.
|
@@ -20,8 +20,16 @@ module ChefConfig
|
|
20
20
|
module Mixin
|
21
21
|
module FuzzyHostnameMatcher
|
22
22
|
|
23
|
+
#
|
24
|
+
# Check to see if a hostname matches a match string. Used to see if hosts fall under our no_proxy config
|
25
|
+
#
|
26
|
+
# @param [String] hostname the hostname to check
|
27
|
+
# @param [String] matches the pattern to match
|
28
|
+
#
|
29
|
+
# @return [Boolean]
|
30
|
+
#
|
23
31
|
def fuzzy_hostname_match_any?(hostname, matches)
|
24
|
-
if
|
32
|
+
if hostname && matches
|
25
33
|
return matches.to_s.split(/\s*,\s*/).compact.any? do |m|
|
26
34
|
fuzzy_hostname_match?(hostname, m)
|
27
35
|
end
|
data/lib/chef-config/version.rb
CHANGED
@@ -195,8 +195,8 @@ module ChefConfig
|
|
195
195
|
message = ""
|
196
196
|
message << "You have invalid ruby syntax in your config file #{config_file_path}\n\n"
|
197
197
|
message << "#{e.class.name}: #{e.message}\n"
|
198
|
-
if file_line = e.message[/#{Regexp.escape(config_file_path)}
|
199
|
-
line = file_line[/:(
|
198
|
+
if file_line = e.message[/#{Regexp.escape(config_file_path)}:\d+/]
|
199
|
+
line = file_line[/:(\d+)$/, 1].to_i
|
200
200
|
message << highlight_config_error(config_file_path, line)
|
201
201
|
end
|
202
202
|
raise ChefConfig::ConfigurationError, message
|
@@ -206,7 +206,7 @@ module ChefConfig
|
|
206
206
|
filtered_trace = e.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
|
207
207
|
filtered_trace.each { |bt_line| message << " " << bt_line << "\n" }
|
208
208
|
unless filtered_trace.empty?
|
209
|
-
line_nr = filtered_trace.first[/#{Regexp.escape(config_file_path)}:(
|
209
|
+
line_nr = filtered_trace.first[/#{Regexp.escape(config_file_path)}:(\d+)/, 1]
|
210
210
|
message << highlight_config_error(config_file_path, line_nr.to_i)
|
211
211
|
end
|
212
212
|
raise ChefConfig::ConfigurationError, message
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chef-config
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 16.
|
4
|
+
version: 16.7.61
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adam Jacob
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-11-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chef-utils
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 16.
|
19
|
+
version: 16.7.61
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 16.
|
26
|
+
version: 16.7.61
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: mixlib-shellout
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -106,62 +106,6 @@ dependencies:
|
|
106
106
|
- - "~>"
|
107
107
|
- !ruby/object:Gem::Version
|
108
108
|
version: '1.2'
|
109
|
-
- !ruby/object:Gem::Dependency
|
110
|
-
name: rake
|
111
|
-
requirement: !ruby/object:Gem::Requirement
|
112
|
-
requirements:
|
113
|
-
- - ">="
|
114
|
-
- !ruby/object:Gem::Version
|
115
|
-
version: '0'
|
116
|
-
type: :development
|
117
|
-
prerelease: false
|
118
|
-
version_requirements: !ruby/object:Gem::Requirement
|
119
|
-
requirements:
|
120
|
-
- - ">="
|
121
|
-
- !ruby/object:Gem::Version
|
122
|
-
version: '0'
|
123
|
-
- !ruby/object:Gem::Dependency
|
124
|
-
name: rspec-core
|
125
|
-
requirement: !ruby/object:Gem::Requirement
|
126
|
-
requirements:
|
127
|
-
- - "~>"
|
128
|
-
- !ruby/object:Gem::Version
|
129
|
-
version: '3.2'
|
130
|
-
type: :development
|
131
|
-
prerelease: false
|
132
|
-
version_requirements: !ruby/object:Gem::Requirement
|
133
|
-
requirements:
|
134
|
-
- - "~>"
|
135
|
-
- !ruby/object:Gem::Version
|
136
|
-
version: '3.2'
|
137
|
-
- !ruby/object:Gem::Dependency
|
138
|
-
name: rspec-expectations
|
139
|
-
requirement: !ruby/object:Gem::Requirement
|
140
|
-
requirements:
|
141
|
-
- - "~>"
|
142
|
-
- !ruby/object:Gem::Version
|
143
|
-
version: '3.2'
|
144
|
-
type: :development
|
145
|
-
prerelease: false
|
146
|
-
version_requirements: !ruby/object:Gem::Requirement
|
147
|
-
requirements:
|
148
|
-
- - "~>"
|
149
|
-
- !ruby/object:Gem::Version
|
150
|
-
version: '3.2'
|
151
|
-
- !ruby/object:Gem::Dependency
|
152
|
-
name: rspec-mocks
|
153
|
-
requirement: !ruby/object:Gem::Requirement
|
154
|
-
requirements:
|
155
|
-
- - "~>"
|
156
|
-
- !ruby/object:Gem::Version
|
157
|
-
version: '3.2'
|
158
|
-
type: :development
|
159
|
-
prerelease: false
|
160
|
-
version_requirements: !ruby/object:Gem::Requirement
|
161
|
-
requirements:
|
162
|
-
- - "~>"
|
163
|
-
- !ruby/object:Gem::Version
|
164
|
-
version: '3.2'
|
165
109
|
description:
|
166
110
|
email:
|
167
111
|
- adam@chef.io
|
@@ -193,7 +137,12 @@ files:
|
|
193
137
|
homepage: https://github.com/chef/chef
|
194
138
|
licenses:
|
195
139
|
- Apache-2.0
|
196
|
-
metadata:
|
140
|
+
metadata:
|
141
|
+
bug_tracker_uri: https://github.com/chef/chef/issues
|
142
|
+
changelog_uri: https://github.com/chef/chef/blob/master/CHANGELOG.md
|
143
|
+
documentation_uri: https://github.com/chef/chef/tree/master/chef-config/README.md
|
144
|
+
homepage_uri: https://github.com/chef/chef/tree/master/chef-config
|
145
|
+
source_code_uri: https://github.com/chef/chef/tree/master/chef-config
|
197
146
|
post_install_message:
|
198
147
|
rdoc_options: []
|
199
148
|
require_paths:
|
@@ -202,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
202
151
|
requirements:
|
203
152
|
- - ">="
|
204
153
|
- !ruby/object:Gem::Version
|
205
|
-
version:
|
154
|
+
version: 2.6.0
|
206
155
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
207
156
|
requirements:
|
208
157
|
- - ">="
|
@@ -212,5 +161,5 @@ requirements: []
|
|
212
161
|
rubygems_version: 3.1.4
|
213
162
|
signing_key:
|
214
163
|
specification_version: 4
|
215
|
-
summary: Chef's default configuration and config loading
|
164
|
+
summary: Chef Infra's default configuration and config loading library
|
216
165
|
test_files: []
|