librarian-puppet 3.0.1 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c107d21c979b589b05492945c89c16c14c4dc2655b63e347ee8048d47e66a259
-  data.tar.gz: 60f587d482976725bd421e2617dad882a77e8d1d6fbb7c435be355b6e8d4a7d1
+  metadata.gz: 4630e52bab2424fcbee097ec636d39c51787fceafbddaac759dbe4967265136e
+  data.tar.gz: c458a8baba3811240266cb9fa677adb6d907a2658984d0b135ae020f08f4eb7e
 SHA512:
-  metadata.gz: d1826a56a163a23e8b050662cea03f531158fdb682301017d5aef9aa9e0f89fc3f91d4d139dca74f35b959d9cb06663f1a0cc5ae7891857addc64255adf17073
-  data.tar.gz: b3dd541186ac0c1fa7de5cb175eaa146d1a8d391a2697bab3b0f09cbdb1cdb71157c16d13dc6052f149782ff7405877dd03f834ecffebdaebdd14dd3d70956e1
+  metadata.gz: 238b72c61f10bd169aaa4526ee7b4bd1ae805a758e3d1e6c224bd721a421cb6b988f379c9187d54e197b5d0e52aaec6905ed8caae187bca0cd232d3226208313
+  data.tar.gz: 5ecb308dd61c40b861d3cbe71ff67173546f9e3ea59fcb8d89d48aaf311a4c0a1ef5a0794eed256bd305158763e237a38b58f56b388abb5f88b608a1f2befb73

data/README.md

@@ -1,6 +1,11 @@
 # Librarian-puppet
 
-[![Build Status](https://travis-ci.org/voxpupuli/librarian-puppet.png?branch=master)](https://travis-ci.org/voxpupuli/librarian-puppet)
+[![License](https://img.shields.io/github/license/voxpupuli/librarian-puppet.svg)](https://github.com/voxpupuli/librarian-puppet/blob/master/LICENSE)
+[![Test](https://github.com/voxpupuli/librarian-puppet/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/librarian-puppet/actions/workflows/test.yml)
+[![Release](https://github.com/voxpupuli/librarian-puppet/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/librarian-puppet/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/librarian-puppet.svg)](https://rubygems.org/gems/librarian-puppet)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/librarian-puppet.svg)](https://rubygems.org/gems/librarian-puppet)
+[![Donated by Tim Sharpe](https://img.shields.io/badge/donated%20by-Tim%20Sharpe-fb7047.svg)](#transfer-notice)
 
 ## Introduction
 
@@ -31,11 +36,13 @@ and isolate a project's dependencies.
 
 ## Versions
 
+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.
 
 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.
+See the [Changelog](CHANGELOG.md) for more details.
 
 ## The Puppetfile
 
@@ -326,6 +333,12 @@ Please include:
   `--verbose` flag, and include the verbose output in the bug report as well.
 
 
+## Transfer Notice
+
+This plugin was originally authored by [Tim Sharpe](https://github.com/rodjek).
+The maintainer preferred that [Vox Pupuli](https://voxpupuli.org/) take ownership of the module for future improvement and maintenance.
+Existing pull requests and issues were transferred, please fork and continue to contribute [here](https://github.com/voxpupuli/librarian-puppet).
+
 ## License
 Please see the [LICENSE](https://github.com/voxpupuli/librarian-puppet/blob/master/LICENSE)
 file.

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 = []
@@ -70,9 +70,16 @@ module Librarian
         install!
       end
 
-      # only used to replace / to - in the module names
+      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
       def update(*names)
+
+        environment.config_db.local['use-v1-api'] = options['use-v1-api'] ? '1' : nil
+
         warn("Usage of module/name is deprecated, use module-name") if names.any? {|n| n.include?("/")}
+        # replace / to - in the module names
         super(*names.map{|n| normalize_name(n)})
       end
 

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
@@ -81,7 +81,7 @@ module Librarian
         # implement the 'modulefile' syntax for Puppetfile
         def modulefile
           f = modulefile_path
-          raise Error, "Modulefile file does not exist: #{f}" unless File.exists?(f)
+          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)
@@ -91,10 +91,10 @@ module Librarian
         # implement the 'metadata' syntax for Puppetfile
         def metadata
           f = working_path.join('metadata.json')
-          unless File.exists?(f)
+          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.exists?(modulefile_path)
+            if File.exist?(modulefile_path)
               modulefile
               return
             else

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

@@ -89,7 +89,7 @@ module Librarian
             # 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.to_s
+            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"
@@ -109,7 +109,7 @@ module Librarian
 
             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(" ")}" }
+            debug { "Executing puppet module install for #{name} #{version}: #{command.join(" ").gsub(module_repository, source.to_s)}" }
 
             begin
               Librarian::Posix.run!(command)

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

@@ -91,7 +91,7 @@ module Librarian
         end
 
         def to_lock_options
-          {:remote => clean_uri(uri).to_s}
+          {:remote => uri.to_s}
         end
 
         def pinned?

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

@@ -139,7 +139,7 @@ module Librarian
         end
 
         def modulefile?
-          File.exists?(modulefile)
+          File.exist?(modulefile)
         end
 
         def metadata
@@ -147,7 +147,7 @@ module Librarian
         end
 
         def metadata?
-          File.exists?(metadata)
+          File.exist?(metadata)
         end
 
         def specfile
@@ -155,7 +155,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/util.rb

@@ -36,7 +36,7 @@ module Librarian
           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" }
+            debug { "Rsync from #{src_clean}/ to #{dest_clean}/ successful" }
           else
             msg = "Failed to rsync from #{src_clean}/ to #{dest_clean}/: " + result.error
             raise Error, msg

data/lib/librarian/puppet/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.1
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarianp
@@ -43,16 +43,22 @@ dependencies:
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,42 +93,48 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 9.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +153,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +177,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: |-
   Simplify deployment of your Puppet infrastructure by
     automatically pulling in modules from the forge and git repositories with
@@ -218,14 +244,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Bundler for your Puppet modules