puppetfile-cli.rb in puppetfile-resolver-0.4.0 vs puppetfile-cli.rb in puppetfile-resolver-0.5.0
- old
+ new
@@ -16,10 +16,11 @@
args = {
debug: false,
cache_dir: nil,
module_paths: [],
path: nil,
+ proxy: nil,
puppet_version: nil,
strict: false
}
opt_parser = OptionParser.new do |opts|
@@ -39,10 +40,14 @@
opts.on('--debug', 'Output debug information. Default is no debug output') do
args[:debug] = true
end
+ opts.on('--proxy=PROXY_URL', 'HTTP/S Proxy server to use. For example http://localhost:8888') do |proxy|
+ args[:proxy] = proxy
+ end
+
opts.on('-s', '--strict', 'Do not allow missing dependencies. Default false which marks dependencies as missing and does not raise an error.') do
args[:strict] = true
end
opts.on('-mTEXT', '--module_paths=TEXT', Array, 'Comma delimited list of modules paths to search') do |text|
@@ -86,10 +91,18 @@
require 'puppetfile-resolver/ui/debug_ui'
ui = PuppetfileResolver::UI::DebugUI.new
else
ui = nil
end
-opts = { cache: cache, ui: ui, module_paths: options[:module_paths], allow_missing_modules: !options[:strict] }
+
+config = PuppetfileResolver::SpecSearchers::Configuration.new
+config.local.puppet_module_paths = options[:module_paths]
+unless options[:proxy].nil?
+ config.git.proxy = options[:proxy]
+ config.forge.proxy = options[:proxy]
+end
+
+opts = { cache: cache, ui: ui, spec_searcher_configuration: config, allow_missing_modules: !options[:strict] }
# Resolve
result = resolver.resolve(opts)
# Output errors