knife-chop 0.3.6 → 0.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/VERSION +1 -1
- data/lib/chef/knife/chop_base.rb +3 -3
- data/lib/chef/knife/chop_upload.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
YTA0ZjA5NDc5ODU2NWRjNDY3MGY2NTdkNjZiM2QyNjZiYTBmZTg1NQ==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
N2NkMmY4NzU2ZDQ5ZDkxNjUxNGJkOThmMWU0Y2I0MDliYTM5OWI0Yw==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
MzhhNDRiZDMxOWY5ODZkMjliMDZmYWNhNTY2MTc5MjQ3NGJlNDc1NDlhMDNj
|
|
10
|
+
ODFhYTg3NzY1YThmNGRhMmQzNjVkN2E3YTE4ZTBhZWMyNDA3MDRlNTU4ZGRm
|
|
11
|
+
N2MxYzZkZGZiYTgyZjZmOWZlZDZlNDkwNzgwZjRjZDlmNTRhY2Q=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MTliOTI2ODIzZDgxNDFiYzQ0YTE5N2M5MDRjMTk0NTlhMTMwYmI4M2RjYzQ4
|
|
14
|
+
MDczMWJmNGY0YjQ4NzY4ZmQyOTJiYmM0Y2QwN2ExZDRhMjgxZTM5ZjQ3MWU5
|
|
15
|
+
MjFhM2E2ZDk5MDJjY2Q2NmMyN2YzOGVjOTU4YjU2NGYyZjlhMDM=
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.3.
|
|
1
|
+
0.3.7
|
data/lib/chef/knife/chop_base.rb
CHANGED
|
@@ -30,6 +30,7 @@ class Chef
|
|
|
30
30
|
attr_accessor :LOGLEVELS
|
|
31
31
|
attr_accessor :ALLPARTS
|
|
32
32
|
attr_accessor :ALLACTIONS
|
|
33
|
+
attr_accessor :prec_max
|
|
33
34
|
|
|
34
35
|
def self.loglevels=(levels)
|
|
35
36
|
@LOGLEVELS = levels || [:trace, :debug, :step, :info, :warn, :error, :fatal, :todo]
|
|
@@ -59,7 +60,6 @@ class Chef
|
|
|
59
60
|
self.allparts = nil
|
|
60
61
|
self.allactions = nil
|
|
61
62
|
|
|
62
|
-
|
|
63
63
|
module ChopBase
|
|
64
64
|
class ::TrueClass
|
|
65
65
|
def to_rb
|
|
@@ -150,8 +150,8 @@ class Chef
|
|
|
150
150
|
|
|
151
151
|
# --------------------------------------------------------------------------------
|
|
152
152
|
def parsePrecedence(v)
|
|
153
|
-
|
|
154
|
-
s = { v =>
|
|
153
|
+
@prec_max += 1
|
|
154
|
+
s = { v => @prec_max }
|
|
155
155
|
match = v.match(%r/^(\S+):(\d+)$/)
|
|
156
156
|
if match
|
|
157
157
|
begin
|
|
@@ -133,7 +133,7 @@ class Chef
|
|
|
133
133
|
@config[:databags].each{ |b|
|
|
134
134
|
match = b.match(%r/^(.*):(.*)$/)
|
|
135
135
|
if match
|
|
136
|
-
want[match[1]] = parseOptionString(match[2],'
|
|
136
|
+
want[match[1]] = parseOptionString(match[2],'[:;]')
|
|
137
137
|
end
|
|
138
138
|
}
|
|
139
139
|
@logger.debug want.ai
|
|
@@ -143,7 +143,7 @@ class Chef
|
|
|
143
143
|
name = File.basename(d)
|
|
144
144
|
regex = "^(#{want.keys.join('|')})"
|
|
145
145
|
match = matches(name,regex)
|
|
146
|
-
if match
|
|
146
|
+
if match and want.has_key?(name)
|
|
147
147
|
databags[name] = getPathSet(want[name], "data_bags/#{name}")
|
|
148
148
|
@logger.debug "Data bags: (#{name}) #{databags[name].ai}"
|
|
149
149
|
end
|