Merge pull request #111 from voxpupuli/forgee

puppet_forge: Allow 4.x
voxpupuli · Jun 8, 2023 · 2947bb9 · 2947bb9
2 parents 549c745 + 4bf2503
commit 2947bb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/librarian/puppet/source/forge/repo_v3.rb b/lib/librarian/puppet/source/forge/repo_v3.rb
@@ -40,7 +40,9 @@ def url(name, version)
           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

diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "librarianp", ">=0.6.3"
   s.add_dependency "rsync"
-  s.add_dependency "puppet_forge", ">= 2.1", '< 5'
+  s.add_dependency "puppet_forge", ">= 2", '< 6'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"