librarian-puppet 2.1.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 004c9886df1b5f4d003a64f076c2e66bfa349fc4
-  data.tar.gz: a473d2c6cf25a3eb249e24bc6615ab270598fd50
+SHA256:
+  metadata.gz: c107d21c979b589b05492945c89c16c14c4dc2655b63e347ee8048d47e66a259
+  data.tar.gz: 60f587d482976725bd421e2617dad882a77e8d1d6fbb7c435be355b6e8d4a7d1
 SHA512:
-  metadata.gz: 3103eb328eeffd401c6cfe890b44f2a59b211b67d99f01c10371460f152e8e0149f362b909d136b918c664e52be950cf3c2147729739a759d5ed660f4a223a83
-  data.tar.gz: aa66afd24a2b72e50a8690ab20ec5828f95e3eba3b4866b6501b32eaf9c37909317482385607982bf9eb1c9f7547f82c769c67099315177c5c88034c2d08c840
+  metadata.gz: d1826a56a163a23e8b050662cea03f531158fdb682301017d5aef9aa9e0f89fc3f91d4d139dca74f35b959d9cb06663f1a0cc5ae7891857addc64255adf17073
+  data.tar.gz: b3dd541186ac0c1fa7de5cb175eaa146d1a8d391a2697bab3b0f09cbdb1cdb71157c16d13dc6052f149782ff7405877dd03f834ecffebdaebdd14dd3d70956e1

data/.gitignore

@@ -2,3 +2,4 @@ pkg/
 Gemfile.lock
 tmp/
 coverage/
+*.gem

data/README.md

@@ -1,16 +1,16 @@
 # Librarian-puppet
 
-[![Build Status](https://travis-ci.org/rodjek/librarian-puppet.png?branch=master)](https://travis-ci.org/rodjek/librarian-puppet)
+[![Build Status](https://travis-ci.org/voxpupuli/librarian-puppet.png?branch=master)](https://travis-ci.org/voxpupuli/librarian-puppet)
 
 ## Introduction
 
 Librarian-puppet is a bundler for your puppet infrastructure.  You can use
 librarian-puppet to manage the puppet modules your infrastructure depends on,
-whether the modules come from the [Puppet Forge](https://forge.puppetlabs.com/),
+whether the modules come from the [Puppet Forge](https://forge.puppet.com/),
 Git repositories or just a path.
 
 * Librarian-puppet can reuse the dependencies listed in your `Modulefile` or `metadata.json`
-* Forge modules can be installed from [Puppetlabs Forge](https://forge.puppetlabs.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/)
+* Forge modules can be installed from [Puppetlabs Forge](https://forge.puppet.com/) or an internal Forge such as [Pulp](http://www.pulpproject.org/)
 * Git modules can be installed from a branch, tag or specific commit, optionally using a path inside the repository
 * Modules can be installed from GitHub using tarballs, without needing Git installed
 * Modules can be installed from a filesystem path
@@ -31,8 +31,9 @@ and isolate a project's dependencies.
 
 ## Versions
 
-Librarian-puppet >= 2.0 (as well as 1.1, 1.2 and 1.3) requires Ruby 1.9 and uses the Puppet Forge API v3.
-Versions < 2.0 work on Ruby 1.8.
+Librarian-Puppet 3.0.0 and newer requires Ruby >= 2.0. Use version 2.2.4 if you need support for Puppet 3.7 or earlier, or Ruby 1.9 or earlier. Note that [Puppet 4.10 and newer require Ruby 2.1](https://puppet.com/docs/puppet/4.10/system_requirements.html#prerequisites) or newer.
+
+Librarian-Puppet 2.0.0 and newer requires Ruby >= 1.9 and uses Puppet Forge API v3. For Ruby 1.8 use 1.5.0.
 
 See the [Changelog](Changelog.md) for more details.
 
@@ -129,6 +130,11 @@ This includes any branch name, tag name, SHA, or SHA unique prefix. If we use a
 branch, we can later ask Librarian-puppet to update the module by fetching the
 most recent version of the module from that same branch.
 
+Note that Librarian-puppet recognizes the [r10k Puppetfile's](https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd) additional
+options, `:tag`, `:commit`, and `:branch`, but only as aliases for `:ref`.
+That is, there is no implementation of r10k's optimizations around fetching
+these different types of git objects.
+
 The Git source also supports a `:path =>` option. If we use the path option,
 Librarian-puppet will navigate down into the Git repository and only use the
 specified subdirectory. Some people have the habit of having a single repository
@@ -321,5 +327,5 @@ Please include:
 
 
 ## License
-Please see the [LICENSE](https://github.com/rodjek/librarian-puppet/blob/master/LICENSE)
+Please see the [LICENSE](https://github.com/voxpupuli/librarian-puppet/blob/master/LICENSE)
 file.

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
 
@@ -158,7 +158,8 @@ module Librarian
           @repo ||= {}
 
           unless @repo[name]
-            # if we are using the official Forge then use API v3, otherwise stick to v1 for now
+            # If we are using the official Forge then use API v3, otherwise use the preferred api 
+            # as defined by the CLI option use_v1_api
             if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
               @repo[name] = RepoV3.new(self, name)
             else

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

@@ -87,7 +87,7 @@ module Librarian
             target = vendored?(name, version) ? vendored_path(name, version).to_s : name
 
             # can't pass the default v3 forge url (http://forgeapi.puppetlabs.com)
-            # to clients that use the v1 API (https://forge.puppetlabs.com)
+            # to clients that use the v1 API (https://forge.puppet.com)
             # nor the other way around
             module_repository = source.to_s
 
@@ -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

@@ -11,10 +11,10 @@ module Librarian
           def initialize(source, name)
             super(source, name)
             # API returned data for this module including all versions and dependencies, indexed by module name
-            # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}
+            # from https://forge.puppetlabs.com/api/v1/releases.json?module=#{name}
             @api_data = nil
             # API returned data for this module and a specific version, indexed by version
-            # from http://forge.puppetlabs.com/api/v1/releases.json?module=#{name}&version=#{version}
+            # from https://forge.puppetlabs.com/api/v1/releases.json?module=#{name}&version=#{version}
             @api_version_data = {}
           end
 
@@ -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/forge/repo_v3.rb

@@ -16,11 +16,11 @@ module Librarian
           end
 
           def get_versions
-            get_module.releases.map{|r| r.version}
+            get_module.releases.select{|r| r.deleted_at.nil?}.map{|r| r.version}
           end
 
           def dependencies(version)
-            array = get_release(version).metadata[:dependencies].map{|d| [d['name'], d['version_requirement']]}
+            array = get_release(version).metadata[:dependencies].map{|d| [d[:name], d[:version_requirement]]}
             Hash[*array.flatten(1)]
           end
 
@@ -30,7 +30,7 @@ module Librarian
             else
               # should never get here as we use one repo object for each module (to be changed in the future)
               debug { "Looking up url for #{name}@#{version}" }
-              release = PuppetForge::Release.find("#{name}-#{version}")
+              release = PuppetForge::V3::Release.find("#{name}-#{version}")
             end
             "#{source}#{release.file_uri}"
           end
@@ -38,8 +38,11 @@ module Librarian
         private
 
           def get_module
-            @module ||= PuppetForge::Module.find(name)
-            raise(Error, "Unable to find module '#{name}' on #{source}") unless @module
+            begin
+              @module ||= PuppetForge::V3::Module.find(name)
+            rescue Faraday::ResourceNotFound => e
+              raise(Error, "Unable to find module '#{name}' on #{source}")
+            end
             @module
           end
 

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
 
@@ -85,6 +85,13 @@ module Librarian
           @@require_puppet ||= require_puppet
 
           metadata = ::Puppet::ModuleTool::Metadata.new
+
+          # Puppet 4 does not have the class
+          unless defined? ::Puppet::ModuleTool::ModulefileReader
+            warn { "Can't parse Modulefile in Puppet >= 4.0 and you are using #{Librarian::Puppet::puppet_version}. Ignoring dependencies in #{modulefile}" }
+            return metadata
+          end
+
           begin
             ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
             raise SyntaxError, "Missing version" unless metadata.version

data/lib/librarian/puppet/util.rb

@@ -26,7 +26,21 @@ module Librarian
       # If the rsync configuration parameter is set, use rsync instead of FileUtils
       def cp_r(src, dest)
         if rsync?
-          Rsync.run(File.join(src, "/"), dest, ['-avz', '--delete'])
+          if Gem.win_platform?
+            src_clean = "#{src}".gsub(/^([a-z])\:/i,'/cygdrive/\1')
+            dest_clean = "#{dest}".gsub(/^([a-z])\:/i,'/cygdrive/\1')
+          else
+            src_clean = src
+            dest_clean = dest
+          end
+          debug { "Copying #{src_clean}/ to #{dest_clean}/ with rsync -avz --delete" }
+          result = Rsync.run(File.join(src_clean, "/"), File.join(dest_clean, "/"), ['-avz', '--delete'])
+          if result.success?
+            debug { "Rsync from #{src_clean}/ to #{dest_clean}/ successfull" }
+          else
+            msg = "Failed to rsync from #{src_clean}/ to #{dest_clean}/: " + result.error
+            raise Error, msg
+          end
         else
           begin
             FileUtils.cp_r(src, dest, :preserve => true)

data/lib/librarian/puppet/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarianp
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,44 +85,44 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '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
@@ -205,7 +206,7 @@ files:
 - lib/librarian/puppet/templates/Puppetfile
 - lib/librarian/puppet/util.rb
 - lib/librarian/puppet/version.rb
-homepage: https://github.com/rodjek/librarian-puppet
+homepage: https://github.com/voxpupuli/librarian-puppet
 licenses:
 - MIT
 metadata: {}
@@ -217,15 +218,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules