librarian-puppet 4.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4630e52bab2424fcbee097ec636d39c51787fceafbddaac759dbe4967265136e
-  data.tar.gz: c458a8baba3811240266cb9fa677adb6d907a2658984d0b135ae020f08f4eb7e
+  metadata.gz: ba4f67ad2636c73bc1518abdf5e8830f1825aeba7b901a6da47979bcaeb5a6a7
+  data.tar.gz: b43000021593835a648e2021762ee09b6f860162b22149f724faf697c6cdaadb
 SHA512:
-  metadata.gz: 238b72c61f10bd169aaa4526ee7b4bd1ae805a758e3d1e6c224bd721a421cb6b988f379c9187d54e197b5d0e52aaec6905ed8caae187bca0cd232d3226208313
-  data.tar.gz: 5ecb308dd61c40b861d3cbe71ff67173546f9e3ea59fcb8d89d48aaf311a4c0a1ef5a0794eed256bd305158763e237a38b58f56b388abb5f88b608a1f2befb73
+  metadata.gz: 1306cd3266b6587d4077a66b8f2282b400ffce1ee1eaa87844e261c9f9e9b39926776ea2c76d5d89d7c11958cc9c367fafbb4b9d7be0eb5375795cc2f05eab62
+  data.tar.gz: 805bb0d66ec1df38c5d9a268dbed29d04d0fbe597e5a6ccfc0502c048287c7bfe537687cc0adf44a1fac77e577069d0e7f9c2c58643300f99ea6b208838466fc

data/.gitignore

@@ -1,5 +1,12 @@
-pkg/
+/pkg/
 Gemfile.lock
-tmp/
-coverage/
+/tmp/
+/coverage/
 *.gem
+/.bundle/
+/.vendor/
+/.librarian/
+/.tmp/
+/Puppetfile
+/Puppetfile.lock
+/modules/

data/README.md

@@ -36,6 +36,8 @@ and isolate a project's dependencies.
 
 ## Versions
 
+Librarian-Puppet 5.0.0 and newer requires Ruby >= 2.7 and Puppet >= 6. Use version 4.0.1 if you need support for Puppet 6 or Ruby 2.6 or earlier.
+
 Librarian-Puppet 4.0.0 and newer requires Ruby >= 2.5 and Puppet >= 5. Use version 3.0.1 is you need support for Puppet 3 or Puppet 4, or Ruby 2.4 or earlier.
 
 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.
@@ -57,14 +59,14 @@ If no Puppetfile is present, `librarian-puppet` will download all the dependenci
 listed in your `metadata.json` or `Modulefile` from the Puppet Forge,
 as if the Puppetfile contained
 
-    forge "https://forgeapi.puppetlabs.com"
+    forge "https://forgeapi.puppet.com"
 
     metadata
 
 
 ### Example Puppetfile
 
-    forge "https://forgeapi.puppetlabs.com"
+    forge "https://forgeapi.puppet.com"
 
     mod 'puppetlabs-razor'
     mod 'puppetlabs-ntp', "0.0.3"
@@ -90,7 +92,7 @@ When fetching a module all dependencies specified in its
 
 ### Puppetfile Breakdown
 
-    forge "https://forgeapi.puppetlabs.com"
+    forge "https://forgeapi.puppet.com"
 
 This declares that we want to use the official Puppet Labs Forge as our default
 source when pulling down modules.  If you run your own local forge, you may
@@ -204,10 +206,8 @@ source specified.  This command writes the complete resolution into
 Librarian-puppet support both v1 and v3 of the Puppet Forge API.
 Specify a specific API version when installing modules:
 
-    $ librarian-puppet install --use-v1-api # this is default; ignored for official Puppet Forge
-    $ librarian-puppet install --no-use-v1-api # use the v3 API; default for official Puppet Forge
-
-Please note that this does not apply for the official Puppet Forge, where v3 is used by default.
+    $ librarian-puppet install --use-v1-api # use the v1 API
+    $ librarian-puppet install --no-use-v1-api # use the v3 API; this is the default
 
 Get an overview of your `Puppetfile.lock` with:
 

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

@@ -17,7 +17,7 @@ module Librarian
         end
 
         def check_specfile
-          # don't fail if Puppetfile doesn't exist as we'll use the Modulefile or metadata.json
+          # don't fail if Puppetfile doesn't exist as we'll use metadata.json
         end
 
       end

data/lib/librarian/puppet/cli.rb

@@ -46,7 +46,7 @@ module Librarian
       option "path", :type => :string
       option "destructive", :type => :boolean, :default => false
       option "local", :type => :boolean, :default => false
-      option "use-v1-api", :type => :boolean, :default => true
+      option "use-v1-api", :type => :boolean, :default => false
       def install
 
         ensure!
@@ -73,7 +73,7 @@ module Librarian
       desc "update", "Updates and installs the dependencies you specify."
       option "verbose", :type => :boolean, :default => false
       option "line-numbers", :type => :boolean, :default => false
-      option "use-v1-api", :type => :boolean, :default => true
+      option "use-v1-api", :type => :boolean, :default => false
       def update(*names)
 
         environment.config_db.local['use-v1-api'] = options['use-v1-api'] ? '1' : nil

data/lib/librarian/puppet/dsl.rb

@@ -7,7 +7,7 @@ module Librarian
   module Puppet
     class Dsl < Librarian::Dsl
 
-      FORGE_URL = "https://forgeapi.puppetlabs.com"
+      FORGE_URL = "https://forgeapi.puppet.com"
 
       dependency :mod
 
@@ -78,28 +78,11 @@ module Librarian
           super
         end
 
-        # implement the 'modulefile' syntax for Puppetfile
-        def modulefile
-          f = modulefile_path
-          raise Error, "Modulefile file does not exist: #{f}" unless File.exist?(f)
-          File.read(f).lines.each do |line|
-            regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
-            regexp =~ line && mod($2, $4)
-          end
-        end
-
         # implement the 'metadata' syntax for Puppetfile
         def metadata
           f = working_path.join('metadata.json')
           unless File.exist?(f)
-            msg = "Metadata file does not exist: #{f}"
-            # try modulefile, in case we don't have a Puppetfile and we are using the default template
-            if File.exist?(modulefile_path)
-              modulefile
-              return
-            else
-              raise Error, msg
-            end
+            raise Error, "Metadata file does not exist: #{f}"
           end
           begin
             json = JSON.parse(File.read(f))
@@ -111,12 +94,6 @@ module Librarian
             mod(d['name'], d['version_requirement'])
           end
         end
-
-        private
-
-        def modulefile_path
-          working_path.join('Modulefile')
-        end
       end
     end
   end

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

@@ -73,40 +73,12 @@ module Librarian
             path = version_unpacked_cache_path(version)
             return if path.directory?
 
-            # The puppet module command is only available from puppet versions >= 2.7.13
-            #
-            # Specifying the version in the gemspec would force people to upgrade puppet while it's still usable for git
-            # So we do some more clever checking
-            #
-            # Executing older versions or via puppet-module tool gives an exit status = 0 .
-            #
-            check_puppet_module_options
-
             path.mkpath
 
             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.puppet.com)
-            # nor the other way around
             module_repository = source.uri.to_s
 
-            if Forge.client_api_version() > 1 and module_repository =~ %r{^http(s)?://forge\.puppetlabs\.com}
-              module_repository = "https://forgeapi.puppetlabs.com"
-              warn { "Replacing Puppet Forge API URL to use v3 #{module_repository} as required by your client version #{Librarian::Puppet.puppet_version}" }
-            end
-
-            m = module_repository.match(%r{^http(s)?://forge(api)?\.puppetlabs\.com})
-            if Forge.client_api_version() == 1 and m
-              ssl = m[1]
-              # Puppet 2.7 can't handle the 302 returned by the https url, so stick to http
-              if ssl and Librarian::Puppet::puppet_gem_version < Gem::Version.create('3.0.0')
-                warn { "Using plain http as your version of Puppet #{Librarian::Puppet::puppet_gem_version} can't download from forge.puppetlabs.com using https" }
-                ssl = nil
-              end
-              module_repository = "http#{ssl}://forge.puppetlabs.com"
-            end
-
             command = %W{puppet module install --version #{version} --target-dir}
             command.push(*[path.to_s, "--module_repository", module_repository, "--modulepath", path.to_s, "--module_working_dir", path.to_s, "--ignore-dependencies", target])
             debug { "Executing puppet module install for #{name} #{version}: #{command.join(" ").gsub(module_repository, source.to_s)}" }
@@ -131,14 +103,6 @@ module Librarian
 
           end
 
-          def check_puppet_module_options
-            min_version    = Gem::Version.create('2.7.13')
-
-            if Librarian::Puppet.puppet_gem_version < min_version
-              raise Error, "To get modules from the forge, we use the puppet faces module command. For this you need at least puppet version 2.7.13 and you have #{Librarian::Puppet.puppet_version}"
-            end
-          end
-
           def vendor_cache(name, version)
             url = url(name, version)
             path = vendored_path(name, version).to_s

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

@@ -40,7 +40,9 @@ module Librarian
           def get_module
             begin
               @module ||= PuppetForge::V3::Module.find(name)
-            rescue Faraday::ResourceNotFound => e
+              # https://github.com/puppetlabs/forge-ruby/pull/104/files starting with version 5, PuppetForge::ModuleNotFound is raised
+              # previous versions raise Faraday::ResourceNotFound
+            rescue Faraday::ResourceNotFound, PuppetForge::ModuleNotFound => e
               raise(Error, "Unable to find module '#{name}' on #{source}")
             end
             @module

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

@@ -37,21 +37,6 @@ module Librarian
 
             new(environment, uri, options)
           end
-
-          def client_api_version()
-            version = 1
-            pe_version = Librarian::Puppet.puppet_version.match(/\(Puppet Enterprise (.+)\)/)
-
-            # Puppet 3.6.0+ uses api v3
-            if Librarian::Puppet::puppet_gem_version >= Gem::Version.create('3.6.0.a')
-              version = 3
-            # Puppet enterprise 3.2.0+ uses api v3
-            elsif pe_version and Gem::Version.create(pe_version[1].strip) >= Gem::Version.create('3.2.0')
-              version = 3
-            end
-            return version
-          end
-
         end
 
         attr_accessor :environment
@@ -61,11 +46,6 @@ module Librarian
         def initialize(environment, uri, options = {})
           self.environment = environment
 
-          if uri =~ %r{^http(s)?://forge\.puppetlabs\.com}
-            uri = "https://forgeapi.puppetlabs.com"
-            warn { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
-          end
-
           @uri = URI::parse(uri)
           @cache_path = nil
         end
@@ -160,7 +140,7 @@ module Librarian
           unless @repo[name]
             # 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
+            if !environment.use_v1_api
               @repo[name] = RepoV3.new(self, name)
             else
               @repo[name] = RepoV1.new(self, name)

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

@@ -67,45 +67,6 @@ module Librarian
           end
         end
 
-        def require_puppet
-          begin
-            require 'puppet'
-            require 'puppet/module_tool'
-          rescue LoadError
-            $stderr.puts <<-EOF
-          Unable to load puppet, the puppet gem is required for :git and :path source.
-          Install it with: gem install puppet
-            EOF
-            exit 1
-          end
-          true
-        end
-
-        def evaluate_modulefile(modulefile)
-          @@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
-          rescue ArgumentError, SyntaxError => error
-            warn { "Unable to parse #{modulefile}, ignoring: #{error}" }
-            if metadata.respond_to? :version=
-              metadata.version = '0.0.1' # puppet < 3.6
-            else
-              metadata.update({'version' => '0.0.1'}) # puppet >= 3.6
-            end
-          end
-          metadata
-        end
-
         def parsed_metadata
           if @metadata.nil?
             @metadata = if metadata?
@@ -114,18 +75,6 @@ module Librarian
               rescue JSON::ParserError => e
                 raise Error, "Unable to parse json file #{metadata}: #{e}"
               end
-            elsif modulefile?
-              # translate Modulefile to metadata.json
-              evaluated = evaluate_modulefile(modulefile)
-              {
-                'version' => evaluated.version,
-                'dependencies' => evaluated.dependencies.map do |dependency|
-                  {
-                    'name' => dependency.instance_variable_get(:@full_module_name),
-                    'version_requirement' => dependency.instance_variable_get(:@version_requirement)
-                  }
-                end
-              }
             else
               {}
             end
@@ -134,14 +83,6 @@ module Librarian
           @metadata
         end
 
-        def modulefile
-          File.join(filesystem_path, 'Modulefile')
-        end
-
-        def modulefile?
-          File.exist?(modulefile)
-        end
-
         def metadata
           File.join(filesystem_path, 'metadata.json')
         end

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
-forge "https://forgeapi.puppetlabs.com"
+forge "https://forgeapi.puppet.com"
 
 # use dependencies defined in metadata.json
 metadata
 
-# use dependencies defined in Modulefile
-# modulefile
-
 # A module from the Puppet Forge
 # mod 'puppetlabs-stdlib'
 

data/lib/librarian/puppet/util.rb

@@ -70,9 +70,6 @@ module Librarian
         # module name can't have dashes, so let's assume it is everything after the last dash
         name.rpartition('-').last
       end
-
-      # deprecated
-      alias :organization_name :module_name
     end
   end
 end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "4.0.1"
+    VERSION = "5.1.0"
   end
 end

data/lib/librarian/puppet.rb

@@ -8,29 +8,5 @@ require 'librarian/action/install'
 
 module Librarian
   module Puppet
-    @@puppet_version = nil
-
-    # Output of puppet --version, typically x.y.z
-    # For Puppet Enterprise it contains the PE version too, ie. 3.4.3 (Puppet Enterprise 3.2.1)
-    def puppet_version
-      return @@puppet_version unless @@puppet_version.nil?
-
-      begin
-        @@puppet_version = Librarian::Posix.run!(%W{puppet --version}).strip
-      rescue Errno::ENOENT, Librarian::Posix::CommandFailure => error
-        msg = "Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc)."
-        msg += "\npuppet --version returned #{error.status}" if error.respond_to? :status
-        msg += "\n#{error.message}" unless error.message.nil?
-        $stderr.puts msg
-        exit 1
-      end
-      return @@puppet_version
-    end
-
-    # Puppet version x.y.z translated as a Gem version
-    def puppet_gem_version
-      Gem::Version.create(puppet_version.split(' ').first.strip.gsub('-', '.'))
-    end
-
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Tim Sharpe
 - Carlos Sanchez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarianp
@@ -45,20 +45,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -153,16 +153,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +236,7 @@ homepage: https://github.com/voxpupuli/librarian-puppet
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -244,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Bundler for your Puppet modules
 test_files: []