r10k-resolve 0.0.1 → 0.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -0
- data/bin/r10k-resolve +14 -1
- data/lib/r10k-resolve/version.rb +1 -1
- data/lib/r10k-resolve.rb +6 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f68fdae127dd97680cb4acafecf00148888e8b13ce6cfd367ccb60bba88478e6
|
4
|
+
data.tar.gz: 37f2bdd61e8591e6ed5cad4e873359b5a718552436a33fd7a4f31c393d29b256
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 72ffaa619746fac044722c75c99cdf9596af2e14022df99722433230d8ea5020827940b0712cd712e01e8944ce268f228ec121f1a2c3404e1460849318480266
|
7
|
+
data.tar.gz: 94b31c2b9b231ba373bdecf5f15860e347d7fb77869073960c1f3f8d2980bd84bb62c0f675180c687d1a859ecb9ddf6763eea82f785c2f50eb6ab8e5be9a9969
|
data/README.md
CHANGED
@@ -38,6 +38,7 @@ gem install r10k-resolve
|
|
38
38
|
1. Run `r10k-resolve` from the same directory to generate the `Puppetfile` with
|
39
39
|
all dependencies resolved.
|
40
40
|
- You can also pass `--source` and `--output` arguments if you'd rather.
|
41
|
+
- If you're not running the current version of Puppet, specify it with `--puppet-version`.
|
41
42
|
1. Review the generated `Puppetfile` for quality and security purposes. This is
|
42
43
|
optional, but highly recommended.
|
43
44
|
1. Commit the `Puppetfile` and deploy your control repository, as fitting your
|
data/bin/r10k-resolve
CHANGED
@@ -26,6 +26,9 @@ OptionParser.new do |opts|
|
|
26
26
|
opts.on("-o", "--output [FILE]", "Pass the name of an output file (Puppetfile)") do |v|
|
27
27
|
options[:output] = v
|
28
28
|
end
|
29
|
+
opts.on("-p", "--puppet-version [VERSION]", "Pass the version number of Puppet to constrain to. Default is latest.") do |v|
|
30
|
+
options[:puppetversion] = v
|
31
|
+
end
|
29
32
|
opts.on("-f", "--[no-]force", "Overwrite an existing output file") do |v|
|
30
33
|
options[:force] = v
|
31
34
|
end
|
@@ -52,4 +55,14 @@ else
|
|
52
55
|
end
|
53
56
|
end
|
54
57
|
|
55
|
-
|
58
|
+
begin
|
59
|
+
R10kResolve.new(options).resolve
|
60
|
+
rescue StandardError => e
|
61
|
+
case logger.level
|
62
|
+
when Logger::DEBUG
|
63
|
+
raise
|
64
|
+
else
|
65
|
+
puts "#{e.class}: #{e.message}"
|
66
|
+
exit 1
|
67
|
+
end
|
68
|
+
end
|
data/lib/r10k-resolve/version.rb
CHANGED
data/lib/r10k-resolve.rb
CHANGED
@@ -3,10 +3,10 @@ require "puppetfile-resolver"
|
|
3
3
|
require "puppetfile-resolver/puppetfile/parser/r10k_eval"
|
4
4
|
|
5
5
|
class R10kResolve
|
6
|
-
attr_accessor :source, :output, :force, :dryrun, :logger
|
6
|
+
attr_accessor :source, :output, :puppetversion, :force, :dryrun, :logger
|
7
7
|
|
8
8
|
def initialize(options = {})
|
9
|
-
[:source, :output, :force, :dryrun, :logger].each do |key|
|
9
|
+
[:source, :output, :puppetversion, :force, :dryrun, :logger].each do |key|
|
10
10
|
send("#{key}=", options[key])
|
11
11
|
end
|
12
12
|
|
@@ -24,7 +24,7 @@ class R10kResolve
|
|
24
24
|
return false
|
25
25
|
end
|
26
26
|
|
27
|
-
resolver = PuppetfileResolver::Resolver.new(puppetfile,
|
27
|
+
resolver = PuppetfileResolver::Resolver.new(puppetfile, puppetversion)
|
28
28
|
result = resolver.resolve(strict_mode: true)
|
29
29
|
|
30
30
|
# Output resolution validation information
|
@@ -46,7 +46,9 @@ class R10kResolve
|
|
46
46
|
@output.write("mod '#{dep.payload.owner}-#{dep.payload.name}', '#{dep.payload.version}'\n")
|
47
47
|
end
|
48
48
|
|
49
|
-
@output.write("\n# Generated with r10k-resolve
|
49
|
+
@output.write("\n# Generated with r10k-resolve v#{R10kResolve::VERSION}")
|
50
|
+
@output.write(" for Puppet v#{puppetversion}") if puppetversion
|
51
|
+
@output.write("\n\n")
|
50
52
|
|
51
53
|
logger.warn(
|
52
54
|
"Please inspect the output to ensure you know what you are deploying in your infrastructure."
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: r10k-resolve
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Ford
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-06-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: puppetfile-resolver
|