spiceweasel 1.1.1 → 1.1.2
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.
- data/lib/spiceweasel/directory_extractor.rb +10 -6
- data/lib/spiceweasel/version.rb +1 -1
- metadata +7 -7
|
@@ -106,12 +106,16 @@ class Spiceweasel::DirectoryExtractor
|
|
|
106
106
|
end
|
|
107
107
|
if scount > 0
|
|
108
108
|
remainders = unsorted_cookbooks.collect {|x| x['name']}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
109
|
+
STDOUT.puts "DEBUG: dir_ext: remainders: '#{remainders}'" if DEBUG
|
|
110
|
+
if NOVALIDATION #stuff is missing, oh well
|
|
111
|
+
sorted_cookbooks.push(remainders).flatten!
|
|
112
|
+
else
|
|
113
|
+
deps = unsorted_cookbooks.collect {|x| x['dependencies'].collect {|x| x['cookbook']} - sorted_cookbooks}
|
|
114
|
+
STDERR.puts "ERROR: Dependencies not satisfied or circular dependencies in cookbook(s): #{remainders} depend(s) on #{deps}"
|
|
115
|
+
exit(-1)
|
|
116
|
+
end
|
|
115
117
|
end
|
|
118
|
+
#hack to get the format same as yaml/json parse
|
|
119
|
+
return sorted_cookbooks.collect {|x| {x => nil} }
|
|
116
120
|
end
|
|
117
121
|
end
|
data/lib/spiceweasel/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spiceweasel
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -14,7 +14,7 @@ date: 2012-05-23 00:00:00.000000000Z
|
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: json
|
|
17
|
-
requirement: &
|
|
17
|
+
requirement: &70201875475900 !ruby/object:Gem::Requirement
|
|
18
18
|
none: false
|
|
19
19
|
requirements:
|
|
20
20
|
- - ! '>='
|
|
@@ -22,10 +22,10 @@ dependencies:
|
|
|
22
22
|
version: '0'
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
|
-
version_requirements: *
|
|
25
|
+
version_requirements: *70201875475900
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: mixlib-cli
|
|
28
|
-
requirement: &
|
|
28
|
+
requirement: &70201875475480 !ruby/object:Gem::Requirement
|
|
29
29
|
none: false
|
|
30
30
|
requirements:
|
|
31
31
|
- - ! '>='
|
|
@@ -33,10 +33,10 @@ dependencies:
|
|
|
33
33
|
version: '0'
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
|
-
version_requirements: *
|
|
36
|
+
version_requirements: *70201875475480
|
|
37
37
|
- !ruby/object:Gem::Dependency
|
|
38
38
|
name: rspec
|
|
39
|
-
requirement: &
|
|
39
|
+
requirement: &70201875475060 !ruby/object:Gem::Requirement
|
|
40
40
|
none: false
|
|
41
41
|
requirements:
|
|
42
42
|
- - ! '>='
|
|
@@ -44,7 +44,7 @@ dependencies:
|
|
|
44
44
|
version: '0'
|
|
45
45
|
type: :development
|
|
46
46
|
prerelease: false
|
|
47
|
-
version_requirements: *
|
|
47
|
+
version_requirements: *70201875475060
|
|
48
48
|
description: Provides a CLI tool for generating knife commands to build Chef-managed
|
|
49
49
|
infrastructure from a simple YAML or JSON file.
|
|
50
50
|
email:
|