puppetfile-resolver 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1199057b00e6f612fd02343cc707cc1e6a4dba3ab20a6956b270c92387a66c7
-  data.tar.gz: d5e706548dc0a8a31fa8573ef96fd130c84307a9a3ca74e97a9966612c731baf
+  metadata.gz: 9c85fe530d4b414e940f20be1fd30bf83a367f28c1ddbf1247e63793402e6961
+  data.tar.gz: 3c3a48ab0edd969e05ca8af43a1d14e4766f4518503d1cc2a8f46562262bd02d
 SHA512:
-  metadata.gz: c1424077c5301bd3b7bdc95bee51576c469d27a29d0637b7bada2d7a04f22b744b560cd84c47652e0ca9ff780d1d07252bffd103a096c1b5e931ca20fda58bb3
-  data.tar.gz: 6492e8028bbb1e4c91ea2a3fe9825a3554cdf30826a3d5eff16a519589422b452cd0faebf1663ca8cd53bbe24ba70ee84ac14f16f067234166b73df3471801ff
+  metadata.gz: 759e11ef1ffd31080daa28c2ff4911324189a16c763e7298bd686957ae69d2f80ff39ffdb606fe6847719d0450e0463bbadc2649da5a5a1886308293fd05197e
+  data.tar.gz: 640d45b0cd4ca3540a2d7329c8bb90c1133905625a8b4690b6e56f13a0fe0b178494750c1bdacc023e0937ace3cad36def9d3b4089ff22e9d06646ae34c82f7f

data/lib/puppetfile-resolver/data/ruby_ca_certs.pem

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Jan  1 04:12:10 2020 GMT
+## Certificate data from Mozilla as of: Wed Jun 24 03:12:10 2020 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -13,8 +13,8 @@
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
-## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70
+## Conversion done with mk-ca-bundle.pl version 1.28.
+## SHA256: 5796295533cad5a648a20a115b0894dc9b318c41501796e7158e824c323f11c3
 ##
 
 

data/lib/puppetfile-resolver/models/module_specification.rb

@@ -90,7 +90,7 @@ module PuppetfileResolver
           @dependencies = meta[:dependencies].map do |dep|
             ModuleDependency.new(
               name: dep[:name],
-              version_requirement: dep[:version_requirement]
+              version_requirement: dep[:version_requirement] || dep[:version_range] || '>= 0.0.0'
             )
           end
         end

data/lib/puppetfile-resolver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetfileResolver
-  VERSION ||= '0.2.0'
+  VERSION ||= '0.3.0'
 end

data/spec/unit/puppetfile-resolver/resolver_spec.rb

@@ -282,6 +282,70 @@ describe PuppetfileResolver::Resolver do
       end
     end
 
+    context "Given a document with resolvable but legacy module definition" do
+      let(:puppetfile_module) { PuppetfileResolver::Puppetfile::LocalModule.new('module1') }
+      let(:puppetfile_document) do
+        doc = valid_document('foo')
+        doc.add_module(puppetfile_module)
+        doc
+      end
+
+      before(:each) do
+        # Module 1 depends on Module 2
+        cache.add_local_module_spec(
+          'module1',
+          [{ name: 'module2', version_range: '> 1.0.0 < 2.0.0' }]
+        )
+        cache.add_local_module_spec('module2', [], nil, '2.0.0')
+        cache.add_local_module_spec('module2', [], nil, '1.5.0')
+      end
+
+      [true, false].each do |testcase|
+        context "and Allow Missing Modules option is #{testcase}" do
+          let(:resolve_options) { default_resolve_options.merge(allow_missing_modules: testcase) }
+
+          it 'should resolve with the most appropriate specification' do
+            result = subject.resolve(resolve_options)
+
+            expect(result.specifications).to include('module2')
+            expect(result.specifications['module2'].version.to_s).to eq('1.5.0')
+          end
+        end
+      end
+    end
+
+    context "Given a document with resolvable but partial module definition" do
+      let(:puppetfile_module) { PuppetfileResolver::Puppetfile::LocalModule.new('module1') }
+      let(:puppetfile_document) do
+        doc = valid_document('foo')
+        doc.add_module(puppetfile_module)
+        doc
+      end
+
+      before(:each) do
+        # Module 1 depends on Module 2
+        cache.add_local_module_spec(
+          'module1',
+          [{ name: 'module2' }]
+        )
+        cache.add_local_module_spec('module2', [], nil, '2.0.0')
+        cache.add_local_module_spec('module2', [], nil, '1.5.0')
+      end
+
+      [true, false].each do |testcase|
+        context "and Allow Missing Modules option is #{testcase}" do
+          let(:resolve_options) { default_resolve_options.merge(allow_missing_modules: testcase) }
+
+          it 'should resolve with the most appropriate specification' do
+            result = subject.resolve(resolve_options)
+
+            expect(result.specifications).to include('module2')
+            expect(result.specifications['module2'].version.to_s).to eq('2.0.0')
+          end
+        end
+      end
+    end
+
     context "Given a document with a unresolvable Puppet requirement" do
       let(:puppet_version) { '99.99.99' }
       let(:puppetfile_module) { PuppetfileResolver::Puppetfile::LocalModule.new('module1') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile-resolver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Glenn Sarti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: molinillo
@@ -112,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Dependency resolver for Puppetfiles