puppet-library 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292b403e591ad5a55e1de5fbc21d0f7d394caf56
-  data.tar.gz: 6883cd06bf2d986014cdc241037f776e6140d250
+  metadata.gz: 3dbf9bee6cd6735e0b70e07f1d99a6f2424100fe
+  data.tar.gz: 55bab3f751e5882efe31ee6e7b1470ae4478e1ed
 SHA512:
-  metadata.gz: 4f2a05f930e4366158173ca55695f8ac583d0209f21d4048ddf9222fb6f8b36c4882fbc5b6f2fdf6ec6e7367df76e3e096a9cf2dca238473c3590a70ad0e347c
-  data.tar.gz: c865ee5d0003e10df635629d45465629699dbf2715e5b9e149001181ef63238fc3fb56fea030231dd0d436c97b23815c40fbbc30f42ee23fdee903703e72f651
+  metadata.gz: 17ff1cb9f1b0eba72702b5e40b97d3c3384f6a33bd869d084615a5e6fbdf28a02e3c327e764d8221fbf7f893c6e9fbede7d62a1e02ddad70e0f045d8d4fffa5c
+  data.tar.gz: 5a63286451d1d0f39cf908725508610a0e26210ac437fc442eeeca1e840d164482b11ac83f59475b8fcc568f239ba1a5180797a97d811364f229234321f100ea

data/CHANGELOG.yml

@@ -97,3 +97,7 @@
       - Ignore corrupt module files on disk
       - Added logging for when module files can't be read from disk
       - Recurse into module directories when serving modules from disk
+- tag: v0.16.0
+  changes:
+      - Fix dependency problems across multiple forges (#8)
+

data/lib/puppet_library/forge/multi.rb

@@ -18,6 +18,7 @@
 require 'puppet_library/forge/forge'
 require 'puppet_library/forge/search_result'
 require 'puppet_library/util/patches'
+require 'ostruct'
 
 module PuppetLibrary::Forge
 
@@ -89,14 +90,35 @@ module PuppetLibrary::Forge
         end
 
         def get_module_metadata_with_dependencies(author, name, version)
+            modules_to_search = [ OpenStruct.new(:author => author, :name => name, :version => version) ]
+
+            already_searched_modules =  []
+
             metadata_list = []
-            @forges.each do |forge|
-                begin
-                    metadata_list << forge.get_module_metadata_with_dependencies(author, name, version)
-                rescue ModuleNotFound
-                    # Try the next one
+            while spec = modules_to_search.shift
+                if already_searched_modules.include? spec
+                    next
+                else
+                    already_searched_modules << spec
+                end
+
+                @forges.each do |forge|
+                    begin
+                        metadata = forge.get_module_metadata_with_dependencies(spec.author, spec.name, spec.version)
+
+                        # Search all subforges for all versions of the dependencies too
+                        modules_to_search += metadata.keys.map do |dep_full_name|
+                            dep_author, dep_name = dep_full_name.split("/")
+                            OpenStruct.new(:author => dep_author, :name => dep_name, :version => nil)
+                        end
+
+                        metadata_list << metadata
+                    rescue ModuleNotFound
+                        # Try the next one
+                    end
                 end
             end
+
             raise ModuleNotFound if metadata_list.empty?
             metadata_list.deep_merge.tap do |metadata|
                 metadata.each do |module_name, releases|

data/lib/puppet_library/version.rb

@@ -16,5 +16,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module PuppetLibrary
-    VERSION = "0.15.0"
+    VERSION = "0.16.0"
 end

data/spec/forge/multi_spec.rb

@@ -258,6 +258,10 @@ module PuppetLibrary::Forge
                     end
                     expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache", nil).and_return(apache_module_metadata_one)
                     expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache", nil).and_return(apache_module_metadata_two)
+                    expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "stdlib", nil).and_return({})
+                    expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "stdlib", nil).and_return({})
+                    expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "concat", nil).and_return({})
+                    expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "concat", nil).and_return({})
 
                     metadata = multi_forge.get_module_metadata_with_dependencies("puppetlabs", "apache", nil)
 
@@ -313,6 +317,10 @@ module PuppetLibrary::Forge
                     end
                     expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache", nil).and_return(apache_module_metadata_one)
                     expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "apache", nil).and_return(apache_module_metadata_two)
+                    expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "stdlib", nil).and_return({})
+                    expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "stdlib", nil).and_return({})
+                    expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "concat", nil).and_return({})
+                    expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "concat", nil).and_return({})
 
                     metadata = multi_forge.get_module_metadata_with_dependencies("puppetlabs", "apache", nil)
 
@@ -325,6 +333,38 @@ module PuppetLibrary::Forge
                     ]
                 end
             end
+
+            context "when a module's dependency is found in another forge" do
+                it "still includes the dependency" do
+                    concat_metadata_1 = {
+                        "puppetlabs/concat" => [ {
+                            "version" => "1",
+                            "dependencies" => [
+                                [ "puppetlabs/stdlib", "1" ]
+                            ]
+                        } ],
+                        "puppetlabs/stdlib" => []
+                    }
+                    stdlib_meta_2 = {
+                        "puppetlabs/stdlib" => [ {
+                            "version" => "1",
+                            "dependencies" => [ ]
+                        } ]
+                    }
+                    expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "concat", nil).and_return(concat_metadata_1)
+                    expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "concat", nil).and_return({})
+                    expect(subforge_one).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "stdlib", nil).and_return({})
+                    expect(subforge_two).to receive(:get_module_metadata_with_dependencies).with("puppetlabs", "stdlib", nil).and_return(stdlib_meta_2)
+
+                    metadata = multi_forge.get_module_metadata_with_dependencies("puppetlabs", "concat", nil)
+
+                    expect(metadata).to eq({
+                        "puppetlabs/concat" => [ { "version"=>"1", "dependencies"=> [["puppetlabs/stdlib", "1"]] } ],
+                        "puppetlabs/stdlib" => [ { "version"=>"1", "dependencies"=> [] } ]
+                    })
+                end
+            end
+
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-library
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra