Skip to content

Commit 8855074

Browse files
author
Kevin Paulisse
committed
Simplify logger code here
1 parent 64c7e40 commit 8855074

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

lib/octocatalog-diff/util/puppetversion.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
# Helper to determine the version of Puppet
44

5-
require 'logger'
6-
require 'stringio'
75
require_relative 'scriptrunner'
86

97
module OctocatalogDiff
@@ -18,17 +16,15 @@ def self.puppet_version(puppet, options = {})
1816
raise ArgumentError, 'Puppet binary was not supplied' if puppet.nil?
1917
raise Errno::ENOENT, "Puppet binary #{puppet} doesn't exist" unless File.file?(puppet)
2018

21-
logger = options[:logger] || Logger.new(StringIO.new)
22-
2319
sr_opts = {
24-
logger: logger,
2520
default_script: 'puppet/puppet.sh',
2621
override_script_path: options[:override_script_path]
2722
}
2823

2924
script = OctocatalogDiff::Util::ScriptRunner.new(sr_opts)
3025

3126
sr_run_opts = {
27+
:logger => options[:logger],
3228
:working_dir => File.dirname(puppet),
3329
:pass_env_vars => options[:pass_env_vars],
3430
:argv => '--version',

0 commit comments

Comments
 (0)