spiceweasel 1.1.1 → 1.1.2

data/lib/spiceweasel/directory_extractor.rb

@@ -106,12 +106,16 @@ class Spiceweasel::DirectoryExtractor
     end
     if scount > 0
       remainders = unsorted_cookbooks.collect {|x| x['name']}
-      deps = unsorted_cookbooks.collect {|x| x['dependencies'].collect {|x| x['cookbook']}}
-      STDERR.puts "ERROR: Dependencies not satisfied or circular dependencies in cookbook(s): #{remainders} depend(s) on #{deps}"
-      exit(-1)
-    else
-      #hack to get the format same as yaml/json parse
-      return sorted_cookbooks.collect {|x| {x => nil} }
+      STDOUT.puts "DEBUG: dir_ext: remainders: '#{remainders}'" if DEBUG
+      if NOVALIDATION #stuff is missing, oh well
+        sorted_cookbooks.push(remainders).flatten!
+      else
+        deps = unsorted_cookbooks.collect {|x| x['dependencies'].collect {|x| x['cookbook']} - sorted_cookbooks}
+        STDERR.puts "ERROR: Dependencies not satisfied or circular dependencies in cookbook(s): #{remainders} depend(s) on #{deps}"
+        exit(-1)
+      end
     end
+    #hack to get the format same as yaml/json parse
+    return sorted_cookbooks.collect {|x| {x => nil} }
   end
 end

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70318502093180 !ruby/object:Gem::Requirement
+  requirement: &70201875475900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318502093180
+  version_requirements: *70201875475900
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70318502092760 !ruby/object:Gem::Requirement
+  requirement: &70201875475480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318502092760
+  version_requirements: *70201875475480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318502092340 !ruby/object:Gem::Requirement
+  requirement: &70201875475060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318502092340
+  version_requirements: *70201875475060
 description: Provides a CLI tool for generating knife commands to build Chef-managed
   infrastructure from a simple YAML or JSON file.
 email: