diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-08-25 16:01:58 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-08-25 16:01:58 -0700 |
commit | 5e4fc4ab25185696c7ad84aa34f17a3eed6ab13c (patch) | |
tree | 2781cce5a05edefef37a522108e5dce9f783ba70 | |
parent | b93bb1ec4abc31e7babc2b437e9ee6c0b03ccfbb (diff) | |
download | ohai-5e4fc4ab25185696c7ad84aa34f17a3eed6ab13c.tar.gz |
chefstyle
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r-- | lib/ohai/plugins/ec2.rb | 2 | ||||
-rw-r--r-- | lib/ohai/plugins/shard.rb | 2 | ||||
-rw-r--r-- | spec/unit/mixin/shell_out_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/plugins/ec2.rb b/lib/ohai/plugins/ec2.rb index b4fb735e..c526a37b 100644 --- a/lib/ohai/plugins/ec2.rb +++ b/lib/ohai/plugins/ec2.rb @@ -114,7 +114,7 @@ Ohai.plugin(:EC2) do end collect_data do - require "base64" + require "base64" unless defined?(Base64) if looks_like_ec2? logger.trace("Plugin EC2: looks_like_ec2? == true") diff --git a/lib/ohai/plugins/shard.rb b/lib/ohai/plugins/shard.rb index cf7641b0..bfd07212 100644 --- a/lib/ohai/plugins/shard.rb +++ b/lib/ohai/plugins/shard.rb @@ -52,7 +52,7 @@ Ohai.plugin(:ShardSeed) do def digest_algorithm case Ohai.config[:plugin][:shard_seed][:digest_algorithm] || default_digest_algorithm when "md5" - require "digest/md5" + require "digest/md5" unless defined?(Digest::MD5) Digest::MD5 when "sha256" require "openssl/digest" diff --git a/spec/unit/mixin/shell_out_spec.rb b/spec/unit/mixin/shell_out_spec.rb index f02c9c13..93ccb2c3 100644 --- a/spec/unit/mixin/shell_out_spec.rb +++ b/spec/unit/mixin/shell_out_spec.rb @@ -32,7 +32,7 @@ describe Ohai::Mixin::ShellOut, "shell_out" do { timeout: timeout } else # this just replicates the behavior of default_paths in chef-utils - default_paths = ( [ ENV['PATH'] ? ENV['PATH'].split(':').reverse : nil, RbConfig::CONFIG["bindir"] ].uniq.reverse + [ "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin" ] ).compact.uniq.join(":") + default_paths = ( [ ENV["PATH"] ? ENV["PATH"].split(":").reverse : nil, RbConfig::CONFIG["bindir"] ].uniq.reverse + [ "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin" ] ).compact.uniq.join(":") default_locale = ChefConfig::Config.guess_internal_locale { timeout: timeout, |