librarian-puppet 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd62873701dbb9d42836c476dcc96f8d8bba4ba1b81c87bc096804a52948210
-  data.tar.gz: c75556d2b10a0c5a725f4ac269909eb8b8389910d17185f77156b76767317fd9
+  metadata.gz: 713a6dde7be0283a093bb67bfe50a58bd2c44b079d1246a7ab10c16101ab7b98
+  data.tar.gz: f4f7b30eeb1f2cd4be07c60d36caa935e62e3ea14df89649d58f59732a73c4bf
 SHA512:
-  metadata.gz: 6ac0f2ce5b17881246a1aff1df1264e945bea3e0bdc6f0ccdad635161729ab931a96d2ce54b9e3cc4aefdb65deeae26aab959e411df30c536a340fc7c25beac7
-  data.tar.gz: 54c91e8b55a460e3772ad893aa30cf255728b7a421c63ab51c2b9074ac0316d09dafd2f1e2fc7f9efa4fc322c9aa62dd16f2273f46447eaecfcd9f35d08df2d7
+  metadata.gz: f9b87dfc7a3f1fe67e808d14fc05f6945af63e74558dc75230063e87f82ee050747c2cb3f5d5d7938be56e0c9d21216f7436cd6315b1d8b64d72e411f213e4da
+  data.tar.gz: b2c87bc6e9bfd0e8d9f20467552e7c98b8da6d17bf5abf70ee78ab8019883d6c55a6343ac7c2ab498283cacae3d8113dddbc816db583b23484d1427e855b64b5

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.
@@ -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

@@ -23,7 +23,7 @@ module Librarian
       def init
         copy_file environment.specfile_name
 
-        if File.exists? ".gitignore"
+        if File.exist? ".gitignore"
           gitignore = File.read('.gitignore').split("\n")
         else
           gitignore = []
@@ -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

@@ -46,7 +46,7 @@ module Librarian
 
           specfile ||= Proc.new if block_given?
 
-          if specfile.kind_of?(Pathname) and !File.exists?(specfile)
+          if specfile.kind_of?(Pathname) and !File.exist?(specfile)
             debug { "Specfile #{specfile} not found, using defaults" } unless specfile.nil?
             receiver(target).run(specfile, &default_specfile)
           else
@@ -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.exists?(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.exists?(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.exists?(modulefile_path)
-              modulefile
-              return
-            else
-              raise Error, msg
-            end
+          unless File.exist?(f)
+            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.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,20 +83,12 @@ module Librarian
           @metadata
         end
 
-        def modulefile
-          File.join(filesystem_path, 'Modulefile')
-        end
-
-        def modulefile?
-          File.exists?(modulefile)
-        end
-
         def metadata
           File.join(filesystem_path, 'metadata.json')
         end
 
         def metadata?
-          File.exists?(metadata)
+          File.exist?(metadata)
         end
 
         def specfile
@@ -155,7 +96,7 @@ module Librarian
         end
 
         def specfile?
-          File.exists?(specfile)
+          File.exist?(specfile)
         end
 
         def install_perform_step_copy!(found_path, install_path)

data/lib/librarian/puppet/templates/Puppetfile

@@ -6,9 +6,6 @@ forge "https://forgeapi.puppetlabs.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.0"
+    VERSION = "5.0.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarianp
@@ -48,7 +48,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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'