chef-config 16.1.16 → 16.2.44
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/chef-config/config.rb +3 -3
- data/lib/chef-config/path_helper.rb +2 -2
- data/lib/chef-config/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f95d6cbee8afbc2b5b6ceda9c6c18a75f542c545b9f01587f0f216c2d4cb735f
|
4
|
+
data.tar.gz: b373dd5fdf065d4b4cc9287d7d4254ba3b340b8b4ded5334c33939b596c6db8d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cd07d4b433d12ec1f9361c2d69ec07ecc3558aa5316ce07b546e8ee2b208247441621263045d0f5613c22e89f753eae817423d9036c8ca4b785322b4adeb665d
|
7
|
+
data.tar.gz: cbbb118a11769451ee5e40277e975465e43f49ca532deaea6521d2823982cf70a20468b5e348c7240514d312e4846d2fb77b295d95fb6d8fdd5270a53bee45fe
|
data/lib/chef-config/config.rb
CHANGED
@@ -450,7 +450,7 @@ module ChefConfig
|
|
450
450
|
default :repo_mode do
|
451
451
|
if local_mode && !chef_zero.osc_compat
|
452
452
|
"hosted_everything"
|
453
|
-
elsif
|
453
|
+
elsif %r{/+organizations/.+}.match?(chef_server_url)
|
454
454
|
"hosted_everything"
|
455
455
|
else
|
456
456
|
"everything"
|
@@ -506,7 +506,7 @@ module ChefConfig
|
|
506
506
|
default(:chef_server_root) do
|
507
507
|
# if the chef_server_url is a path to an organization, aka
|
508
508
|
# 'some_url.../organizations/*' then remove the '/organization/*' by default
|
509
|
-
if
|
509
|
+
if %r{/organizations/\S*$}.match?(configuration[:chef_server_url])
|
510
510
|
configuration[:chef_server_url].split("/")[0..-3].join("/")
|
511
511
|
elsif configuration[:chef_server_url] # default to whatever chef_server_url is
|
512
512
|
configuration[:chef_server_url]
|
@@ -1118,7 +1118,7 @@ module ChefConfig
|
|
1118
1118
|
# proxy before parsing. The regex /^.*:\/\// matches, for example, http://. Reusing proxy
|
1119
1119
|
# here since we are really just trying to get the string built correctly.
|
1120
1120
|
proxy = unless proxy_env_var.empty?
|
1121
|
-
if
|
1121
|
+
if %r{^.*://}.match?(proxy_env_var)
|
1122
1122
|
URI.parse(proxy_env_var)
|
1123
1123
|
else
|
1124
1124
|
URI.parse("#{scheme}://#{proxy_env_var}")
|
@@ -91,7 +91,7 @@ module ChefConfig
|
|
91
91
|
def self.windows_max_length_exceeded?(path)
|
92
92
|
# Check to see if paths without the \\?\ prefix are over the maximum allowed length for the Windows API
|
93
93
|
# http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
|
94
|
-
unless path
|
94
|
+
unless /^\\\\?\\/.match?(path)
|
95
95
|
if path.length > WIN_MAX_PATH
|
96
96
|
return true
|
97
97
|
end
|
@@ -103,7 +103,7 @@ module ChefConfig
|
|
103
103
|
def self.printable?(string)
|
104
104
|
# returns true if string is free of non-printable characters (escape sequences)
|
105
105
|
# this returns false for whitespace escape sequences as well, e.g. \n\t
|
106
|
-
if
|
106
|
+
if /[^[:print:]]/.match?(string)
|
107
107
|
false
|
108
108
|
else
|
109
109
|
true
|
data/lib/chef-config/version.rb
CHANGED
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.2.44
|
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-06-17 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.2.44
|
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.2.44
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: mixlib-shellout
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|