r10k-resolve 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e0de2b0e457b3bc3df046261cefbfe36b81ce71f4a93608b377a2274c050e3
-  data.tar.gz: 1074efe7927ce6d969eefca1c284e1dfc24cacebf91f2feb011c102fe38c0f90
+  metadata.gz: f68fdae127dd97680cb4acafecf00148888e8b13ce6cfd367ccb60bba88478e6
+  data.tar.gz: 37f2bdd61e8591e6ed5cad4e873359b5a718552436a33fd7a4f31c393d29b256
 SHA512:
-  metadata.gz: 92af417a965c4ab4a625c94d98db7b46c89a42ba19fa43db7dec812e20e2f26f20151e492e10be2bd6cf8c48478707025f2a093ff3b259934a33614b7f97af6c
-  data.tar.gz: 840bcf974aa79d500c1e5f757edca8d2d3f42c47e1641eeb7c3cc3a2d039a70c204df578beb022043179136751bff311de92bc91305ea1a7babde6f1c4c1cf42
+  metadata.gz: 72ffaa619746fac044722c75c99cdf9596af2e14022df99722433230d8ea5020827940b0712cd712e01e8944ce268f228ec121f1a2c3404e1460849318480266
+  data.tar.gz: 94b31c2b9b231ba373bdecf5f15860e347d7fb77869073960c1f3f8d2980bd84bb62c0f675180c687d1a859ecb9ddf6763eea82f785c2f50eb6ab8e5be9a9969

data/README.md

@@ -38,6 +38,7 @@ gem install r10k-resolve
 1. Run `r10k-resolve` from the same directory to generate the `Puppetfile` with
    all dependencies resolved.
      - You can also pass `--source` and `--output` arguments if you'd rather.
+     - If you're not running the current version of Puppet, specify it with `--puppet-version`.
 1. Review the generated `Puppetfile` for quality and security purposes. This is
    optional, but highly recommended.
 1. Commit the `Puppetfile` and deploy your control repository, as fitting your

data/bin/r10k-resolve

@@ -26,6 +26,9 @@ OptionParser.new do |opts|
   opts.on("-o", "--output [FILE]", "Pass the name of an output file (Puppetfile)") do |v|
     options[:output] = v
   end
+  opts.on("-p", "--puppet-version [VERSION]", "Pass the version number of Puppet to constrain to. Default is latest.") do |v|
+    options[:puppetversion] = v
+  end
   opts.on("-f", "--[no-]force", "Overwrite an existing output file") do |v|
     options[:force] = v
   end
@@ -52,4 +55,14 @@ else
   end
 end
 
-R10kResolve.new(options).resolve
+begin
+  R10kResolve.new(options).resolve
+rescue StandardError => e
+  case logger.level
+  when Logger::DEBUG
+    raise
+  else
+    puts "#{e.class}: #{e.message}"
+    exit 1
+  end
+end

data/lib/r10k-resolve/version.rb

@@ -1,3 +1,3 @@
 class R10kResolve
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/r10k-resolve.rb

@@ -3,10 +3,10 @@ require "puppetfile-resolver"
 require "puppetfile-resolver/puppetfile/parser/r10k_eval"
 
 class R10kResolve
-  attr_accessor :source, :output, :force, :dryrun, :logger
+  attr_accessor :source, :output, :puppetversion, :force, :dryrun, :logger
 
   def initialize(options = {})
-    [:source, :output, :force, :dryrun, :logger].each do |key|
+    [:source, :output, :puppetversion, :force, :dryrun, :logger].each do |key|
       send("#{key}=", options[key])
     end
 
@@ -24,7 +24,7 @@ class R10kResolve
       return false
     end
 
-    resolver = PuppetfileResolver::Resolver.new(puppetfile, nil)
+    resolver = PuppetfileResolver::Resolver.new(puppetfile, puppetversion)
     result = resolver.resolve(strict_mode: true)
 
     # Output resolution validation information
@@ -46,7 +46,9 @@ class R10kResolve
       @output.write("mod '#{dep.payload.owner}-#{dep.payload.name}', '#{dep.payload.version}'\n")
     end
 
-    @output.write("\n# Generated with r10k-resolve version #{R10kResolve::VERSION}\n\n")
+    @output.write("\n# Generated with r10k-resolve v#{R10kResolve::VERSION}")
+    @output.write(" for Puppet v#{puppetversion}") if puppetversion
+    @output.write("\n\n")
 
     logger.warn(
       "Please inspect the output to ensure you know what you are deploying in your infrastructure."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k-resolve
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Ford
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppetfile-resolver