librarian-puppet 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 178cdf6e6befe908c192269b7cbdb083634fb4614a041262ea1cf01a7159749b
-  data.tar.gz: 5d22740a5a509be15df114e1247d2ecc2b1864898e6daa0c29128d5d37677a8e
+  metadata.gz: c107d21c979b589b05492945c89c16c14c4dc2655b63e347ee8048d47e66a259
+  data.tar.gz: 60f587d482976725bd421e2617dad882a77e8d1d6fbb7c435be355b6e8d4a7d1
 SHA512:
-  metadata.gz: 4e20811276f5f1f2957531d71b3d98d542e7f01f8d4d6fea9dadd9cbf1b19ed42cc6bd2ecb12fbbdb2876ec76c5ccf8bd207fb61e59b6ef8ad943074a259e568
-  data.tar.gz: b17f917b603ea86faf24a898a31081ca32ced00f49e4fcfe8026d4bb3a6a83923af0cc5dcd81aa711ceb818980047117096da8e21ea07b00a70191419735d48d
+  metadata.gz: d1826a56a163a23e8b050662cea03f531158fdb682301017d5aef9aa9e0f89fc3f91d4d139dca74f35b959d9cb06663f1a0cc5ae7891857addc64255adf17073
+  data.tar.gz: b3dd541186ac0c1fa7de5cb175eaa146d1a8d391a2697bab3b0f09cbdb1cdb71157c16d13dc6052f149782ff7405877dd03f834ecffebdaebdd14dd3d70956e1

data/lib/librarian/puppet/action/resolve.rb

@@ -1,4 +1,5 @@
 require 'librarian/action/resolve'
+require 'librarian/puppet/resolver'
 
 module Librarian
   module Puppet
@@ -15,6 +16,10 @@ module Librarian
           end
         end
 
+        def resolver
+          Resolver.new(environment)
+        end
+
       end
     end
   end

data/lib/librarian/puppet/dependency.rb

@@ -5,13 +5,21 @@ module Librarian
 
       include Librarian::Puppet::Util
 
-      def initialize(name, requirement, source)
+      attr_accessor :parent
+      private :parent=
+
+      def initialize(name, requirement, source, parent = nil)
         # Issue #235 fail if forge source is not defined
         raise Error, "forge entry is not defined in Puppetfile" if source.instance_of?(Array) && source.empty?
 
+        self.parent = parent
         super(normalize_name(name), requirement, source)
       end
 
+      def to_s
+        "#{name} (#{requirement}) <#{source}> (from #{parent.nil? ? '<nil>' : parent})"
+      end
+
     end
 
   end

data/lib/librarian/puppet/dsl.rb

@@ -37,6 +37,37 @@ module Librarian
         Receiver.new(target)
       end
 
+      def run(specfile = nil, sources = [])
+        specfile, sources = nil, specfile if specfile.kind_of?(Array) && sources.empty?
+
+        Target.new(self).tap do |target|
+          target.precache_sources(sources)
+          debug_named_source_cache("Pre-Cached Sources", target)
+
+          specfile ||= Proc.new if block_given?
+
+          if specfile.kind_of?(Pathname) and !File.exists?(specfile)
+            debug { "Specfile #{specfile} not found, using defaults" } unless specfile.nil?
+            receiver(target).run(specfile, &default_specfile)
+          else
+            receiver(target).run(specfile)
+          end
+
+          post_process_target(target)
+
+          debug_named_source_cache("Post-Cached Sources", target)
+        end.to_spec
+      end
+
+      class Target < Librarian::Dsl::Target
+        def dependency(name, *args)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+          source = source_from_options(options) || @source
+          dep = dependency_type.new(name, args, source, 'Puppetfile')
+          @dependencies << dep
+        end
+      end
+
       class Receiver < Librarian::Dsl::Receiver
         attr_reader :specfile, :working_path
 

data/lib/librarian/puppet/lockfile.rb

@@ -25,7 +25,46 @@ module Librarian
             alias_method :old_lookup, :[]
             define_method(:[]) { |k| self.old_lookup(normalize_name(k)) }
           end
-          super(lines, manifests_index)
+          dependencies = []
+          while lines.first =~ /^ {2}([\w\-\/]+)(?: \((.*)\))?$/
+            lines.shift
+            name, requirement = $1, $2.split(/,\s*/)
+            dependencies << environment.dsl_class.dependency_type.new(name, requirement, manifests_index[name].source, 'lockfile')
+          end
+          dependencies
+        end
+
+        def compile_placeholder_manifests(sources_ast)
+          manifests = {}
+          sources_ast.each do |source_ast|
+            source_type = source_ast[:type]
+            source = source_type.from_lock_options(environment, source_ast[:options])
+            source_ast[:manifests].each do |manifest_name, manifest_ast|
+              manifests[manifest_name] = ManifestPlaceholder.new(
+                  source,
+                  manifest_name,
+                  manifest_ast[:version],
+                  manifest_ast[:dependencies].map do |k, v|
+                    environment.dsl_class.dependency_type.new(k, v, nil, manifest_name)
+                  end
+              )
+            end
+          end
+          manifests
+        end
+
+        def compile(sources_ast)
+          manifests = compile_placeholder_manifests(sources_ast)
+          manifests = manifests.map do |name, manifest|
+            dependencies = manifest.dependencies.map do |d|
+              environment.dsl_class.dependency_type.new(d.name, d.requirement, manifests[d.name].source, name)
+            end
+            real = Manifest.new(manifest.source, manifest.name)
+            real.version = manifest.version
+            real.dependencies = manifest.dependencies
+            real
+          end
+          ManifestSet.sort(manifests)
         end
 
       end

data/lib/librarian/puppet/resolver.rb

@@ -0,0 +1,21 @@
+require 'librarian/resolver'
+
+module Librarian
+  module Puppet
+    class Resolver < Librarian::Resolver
+
+      class Implementation < Librarian::Resolver::Implementation
+        def sourced_dependency_for(dependency)
+          return dependency if dependency.source
+
+          source = dependency_source_map[dependency.name] || default_source
+          dependency.class.new(dependency.name, dependency.requirement, source, dependency.parent)
+        end
+      end
+
+      def implementation(spec)
+        Implementation.new(self, spec, :cyclic => cyclic)
+      end
+    end
+  end
+end

data/lib/librarian/puppet/source/forge.rb

@@ -144,7 +144,7 @@ module Librarian
         def fetch_dependencies(name, version, version_uri)
           repo(name).dependencies(version).map do |k, v|
             v = Librarian::Dependency::Requirement.new(v).to_gem_requirement
-            Dependency.new(k, v, nil)
+            Dependency.new(k, v, nil, name)
           end
         end
 

data/lib/librarian/puppet/source/forge/repo.rb

@@ -145,7 +145,7 @@ module Librarian
             debug { "Downloading #{url} into #{path}"}
             environment.vendor!
             File.open(path, 'wb') do |f|
-              open(url, "rb") do |input|
+              URI.open(url, 'rb') do |input|
                 f.write(input.read)
               end
             end

data/lib/librarian/puppet/source/forge/repo_v1.rb

@@ -74,7 +74,7 @@ module Librarian
             debug { "Querying Forge API for module #{name}#{" and version #{version}" unless version.nil?}: #{url}" }
 
             begin
-              data = open(url) {|f| f.read}
+              data = URI.open(url) {|f| f.read}
               JSON.parse(data)
             rescue OpenURI::HTTPError => e
               case e.io.status[0].to_i

data/lib/librarian/puppet/source/githubtarball/repo.rb

@@ -77,7 +77,7 @@ module Librarian
             File.open(vendored_path(vendored_name(name), version).to_s, 'wb') do |f|
               begin
                 debug { "Downloading <#{url}> to <#{f.path}>" }
-                open(url,
+                URI.open(url,
                   "User-Agent" => "librarian-puppet v#{Librarian::Puppet::VERSION}") do |res|
                   while buffer = res.read(8192)
                     f.write(buffer)

data/lib/librarian/puppet/source/local.rb

@@ -44,7 +44,7 @@ module Librarian
 
           parsed_metadata['dependencies'].each do |d|
             gem_requirement = Librarian::Dependency::Requirement.new(d['version_requirement']).to_gem_requirement
-            new_dependency = Dependency.new(d['name'], gem_requirement, forge_source)
+            new_dependency = Dependency.new(d['name'], gem_requirement, forge_source, name)
             dependencies << new_dependency
           end
 

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarianp
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +191,7 @@ files:
 - lib/librarian/puppet/environment.rb
 - lib/librarian/puppet/extension.rb
 - lib/librarian/puppet/lockfile.rb
+- lib/librarian/puppet/resolver.rb
 - lib/librarian/puppet/source.rb
 - lib/librarian/puppet/source/forge.rb
 - lib/librarian/puppet/source/forge/repo.rb
@@ -224,8 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules