spiceweasel 1.1.0 → 1.1.1

data/bin/spiceweasel

@@ -75,6 +75,7 @@ else
     puts cli.opt_parser.to_s
     exit(-1)
   end
+  STDOUT.puts "DEBUG: file input: #{input}" if DEBUG
 end
 
 create = String.new()

data/lib/spiceweasel/cookbook_data.rb

@@ -40,7 +40,7 @@ class Spiceweasel::CookbookData
     else
       raise IOError, "Cannot open or read cookbooks/#{@_name}/metadata.rb!"
     end
-    {:name => @_name, :version => @_version, :dependencies => @_dependencies }
+    {'name' => @_name, 'version' => @_version, 'dependencies' => @_dependencies }
   end
 
   def name(*args) # Override metadata.rb DSL
@@ -56,7 +56,7 @@ class Spiceweasel::CookbookData
     if args.length > 0
       cookbook_version = args.shift
     end
-    @_dependencies << {:cookbook => cookbook, :version => cookbook_version}
+    @_dependencies << {'cookbook' => cookbook, 'version' => cookbook_version}
   end
 
   def method_missing(m, *args, &block)

data/lib/spiceweasel/directory_extractor.rb

@@ -24,20 +24,21 @@ class Spiceweasel::DirectoryExtractor
     # COOKBOOKS
     cookbooks = []
     Dir.glob("cookbooks/*").each do |cookbook_full_path|
-      cookbook = self.grab_filename_from_path cookbook_full_path
+      cookbook = cookbook_full_path.split('/').last
       STDOUT.puts "DEBUG: dir_ext: cookbook: '#{cookbook}'" if DEBUG
       cookbook_data = Spiceweasel::CookbookData.new(cookbook)
       if cookbook_data.is_readable?
         cookbooks << cookbook_data.read
       end
     end
-    cookbook_names = self.order_cookbooks_by_dependency cookbooks
-    objects["cookbooks"] = cookbook_names unless cookbook_names.empty?
+    STDOUT.puts "DEBUG: dir_ext: cookbooks: '#{cookbooks}'" if DEBUG
+    cookbooks = self.order_cookbooks_by_dependency(cookbooks)
+    objects["cookbooks"] = cookbooks unless cookbooks.empty?
 
     # ROLES
     roles = []
     Dir.glob("roles/*.{rb,json}").each do |role_full_path|
-      role = self.grab_name_from_path role_full_path
+      role = self.grab_name_from_path(role_full_path)
       STDOUT.puts "DEBUG: dir_ext: role: '#{role}'" if DEBUG
       roles << {role => nil}
     end
@@ -45,7 +46,7 @@ class Spiceweasel::DirectoryExtractor
     # ENVIRONMENTS
     environments = []
     Dir.glob("environments/*.{rb,json}").each do |environment_full_path|
-      environment = self.grab_name_from_path environment_full_path
+      environment = self.grab_name_from_path(environment_full_path)
       STDOUT.puts "DEBUG: dir_ext: environment: '#{environment}'" if DEBUG
       environments << {environment => nil}
     end
@@ -67,7 +68,7 @@ class Spiceweasel::DirectoryExtractor
     # TODO: Cant use this yet as node_list.rb doesnt support node from file syntax but expects the node info to be part of the objects passed in
     # nodes = []
     # Dir.glob("nodes/*.{rb,json}").each do |node_full_path|
-    #   node = self.grab_name_from_path node_full_path
+    #   node = self.grab_name_from_path(node_full_path)
     #   nodes  << {node => nil}
     # end
     # objects["nodes"] = nodes unless nodes.empty?
@@ -75,66 +76,42 @@ class Spiceweasel::DirectoryExtractor
     objects
   end
 
-  def self.grab_filename_from_path path
-    path.split('/').last
-  end
-
-  def self.grab_name_from_path path
-    name = self.grab_filename_from_path(path).split('.')
+  def self.grab_name_from_path(path)
+    name = path.split('/').last.split('.')
     if name.length>1
       name.pop
     end
     name.join('.')
   end
-  def self.order_cookbooks_by_dependency cookbooks
 
+  def self.order_cookbooks_by_dependency(cookbooks)
     # Weak algorithm, not particularly elegant, ignores version info as unlikely to have two versions of a cookbook anyway
-    ordered_cookbooks = []
-
-    left_to_sort = cookbooks
-    num_sorted_cookbooks_this_iteration = -1
-
-    while left_to_sort.size > 0 && num_sorted_cookbooks_this_iteration != 0
-
-      unsorted_cookbooks = left_to_sort
-      left_to_sort = []
-      num_sorted_cookbooks_this_iteration
-      unsorted_cookbooks.each do |cookbook|
-        name = cookbook[:name]
-        dependencies = cookbook[:dependencies]
-
-        next if ordered_cookbooks.include? name
-
-        if dependencies.nil?
-          ordered_cookbooks << name
-          num_sorted_cookbooks_this_iteration += 1
-          next
-        end
-
-        dependencies_satisfied_yet = true
-        dependencies.each {|dependency| dependencies_satisfied_yet = false unless ordered_cookbooks.include? dependency[:cookbook]}
-        if dependencies_satisfied_yet
-          ordered_cookbooks << name
-          num_sorted_cookbooks_this_iteration += 1
-          next
-        end
-
-        left_to_sort << cookbook
-
+    # We're going to find the cookbooks with their dependencies matched and keep going until all we have is unmatched deps
+
+    sorted_cookbooks = []
+    unsorted_cookbooks = cookbooks
+    scount = 0
+    #keep looping until no more cookbooks are left or can't remove remainders
+    while unsorted_cookbooks.any? and scount < cookbooks.length
+      cookbook = unsorted_cookbooks.shift
+      #if all the cookbook dependencies are in sorted_cookbooks
+      if sorted_cookbooks.eql?(sorted_cookbooks | cookbook['dependencies'].collect {|x| x['cookbook']})
+        sorted_cookbooks.push(cookbook['name'])
+        scount = 0
+      else #put it back in the list
+        unsorted_cookbooks.push(cookbook)
+        scount = scount + 1
       end
-
+      STDOUT.puts "DEBUG: dir_ext: sorted_cookbooks: '#{sorted_cookbooks}' #{scount}" if DEBUG
     end
-
-    if left_to_sort.size > 0
-      STDERR.puts "ERROR: Dependencies not satisfied or circular dependencies between cookbooks: #{left_to_sort}"
+    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} }
     end
-    output_cookbooks = []
-    ordered_cookbooks.each do |cookbook|
-      output_cookbooks << {cookbook => nil}
-    end
-    output_cookbooks
-
   end
-
 end

data/lib/spiceweasel/version.rb

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

metadata

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