berkshelf 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40b61641ae3c98575c4de9bf668625ff927b829075dab610fc4388439f16e7c
-  data.tar.gz: 0d2128e0cb9b388125cc388c08bf75ad43a6f4152626ed92f056d8001e924c85
+  metadata.gz: 2a9aad824018ff76341d429a3f3d1a56a3a20baa0a47353b71214103dd0b82db
+  data.tar.gz: e99375d510d02668eeb7734aad0dacc173aadd0b8751f0bcea2d6f23821da4b0
 SHA512:
-  metadata.gz: 9c8d3807ef828c33ae5eb2204af6f4936cea58399a641f2eef919a0beb88252ff4e55c0caf3c64928d4f0e67609d9794d6435ac9060dbfda23adf8a182c64edd
-  data.tar.gz: 681703640274ec3b8bb49ab87c574c40e423aac69c6c2af060468b76704252e62647e1f7268df1d76677c846a4a02fe5ed66d43dac85e981fef034bf256bf655
+  metadata.gz: 86965767066caf25df3b87b33d17968d7dde55bf34613d5748fecebba7f00ac36bd0b0c1217f02342435f6c3e6106f9bd019bf687823aac9107ffc6c8e420e85
+  data.tar.gz: 65f4eb23956d447c36eb2fb90b8d96bd89ab39352f1478bed5ff4969479a4b6781a1943009439e5b41c5ea5631dc81fbb44a5ad1c2b10c0fdcd8d18bbc92fb69

data/Gemfile.lock

@@ -44,7 +44,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (7.0.3)
+    berkshelf (7.0.4)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)

data/lib/berkshelf/uploader.rb

@@ -104,18 +104,22 @@ module Berkshelf
     #
     # @return [Array<CachedCookbook>]
     #
-    def lookup_dependencies(cookbook, dependencies = [], checked = {})
+    def lookup_dependencies(cookbook, checked = {})
       Berkshelf.log.debug "  Looking up dependencies for #{cookbook}"
+
+      dependencies = []
+
       lockfile.graph.find(cookbook).dependencies.each do |name, _|
         next if checked[name]
 
-        dependencies << name
-
+        # break cyclic graphs
         checked[name] = true
 
-        lookup_dependencies(name, dependencies, checked) unless lockfile.graph.find(name).dependencies.empty?
+        # this is your standard depth-first tree traversal with the deps first...
+        dependencies += lookup_dependencies(name, checked)
+        # ..then the node itself
+        dependencies << name
       end
-
       dependencies
     end
 
@@ -134,11 +138,13 @@ module Berkshelf
       # that would be a bad idea...
       dependencies = berksfile.dependencies.map(&:name)
 
-      cookbook_order = dependencies.each do |dependency|
-        lookup_dependencies(dependency, dependencies)
-      end
+      checked = {}
+      cookbook_order = dependencies.map do |dependency|
+        # for each dep add all its deps first, then the dep itself
+        lookup_dependencies(dependency, checked) + [ dependency ]
+      end.flatten
 
-      cookbook_order.reverse.map { |dependency| lockfile.retrieve(dependency) }.uniq
+      cookbook_order.uniq.map { |dependency| lockfile.retrieve(dependency) }
     end
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.3"
+  VERSION = "7.0.4"
 end

data/spec/unit/berkshelf/uploader_spec.rb

@@ -231,7 +231,18 @@ module Berkshelf
         subject { described_class.new(berksfile).send(:filtered_cookbooks) }
 
         it "returns filtered list in correct order" do
-          expect(subject.map(&:name)).to eq ["yum", "yum-epel", "build-essential", "runit", "apt", "jenkins", "jenkins-config"]
+          upload_order = subject.map(&:name)
+          # assert that dependent cookbooks are uploaded before the cookbooks that depend on them
+          expect(upload_order.index("apt")).to be < upload_order.index("jenkins")
+          expect(upload_order.index("runit")).to be < upload_order.index("jenkins")
+          expect(upload_order.index("yum")).to be < upload_order.index("jenkins")
+          expect(upload_order.index("jenkins")).to be < upload_order.index("jenkins-config")
+          expect(upload_order.index("yum")).to be < upload_order.index("jenkins-config")
+          expect(upload_order.index("build-essential")).to be < upload_order.index("runit")
+          expect(upload_order.index("yum")).to be < upload_order.index("runit")
+          expect(upload_order.index("yum-epel")).to be < upload_order.index("runit")
+          expect(upload_order.index("yum")).to be < upload_order.index("yum-epel")
+          expect(upload_order.uniq.length).to eql(upload_order.length)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout