ohai 16.4.12 → 16.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/lib/ohai.rb +1 -1
  4. data/lib/ohai/config.rb +1 -1
  5. data/lib/ohai/dsl.rb +1 -1
  6. data/lib/ohai/dsl/plugin.rb +5 -5
  7. data/lib/ohai/dsl/plugin/versionvii.rb +1 -1
  8. data/lib/ohai/exception.rb +1 -1
  9. data/lib/ohai/hints.rb +1 -1
  10. data/lib/ohai/loader.rb +1 -1
  11. data/lib/ohai/log.rb +1 -1
  12. data/lib/ohai/mixin/azure_metadata.rb +1 -1
  13. data/lib/ohai/mixin/chef_utils_wiring.rb +39 -0
  14. data/lib/ohai/mixin/command.rb +3 -54
  15. data/lib/ohai/mixin/constant_helper.rb +1 -1
  16. data/lib/ohai/mixin/dmi_decode.rb +1 -1
  17. data/lib/ohai/mixin/do_metadata.rb +1 -1
  18. data/lib/ohai/mixin/ec2_metadata.rb +1 -1
  19. data/lib/ohai/mixin/http_helper.rb +1 -1
  20. data/lib/ohai/mixin/network_helper.rb +1 -1
  21. data/lib/ohai/mixin/os.rb +1 -1
  22. data/lib/ohai/mixin/scaleway_metadata.rb +1 -1
  23. data/lib/ohai/mixin/seconds_to_human.rb +1 -1
  24. data/lib/ohai/mixin/shell_out.rb +50 -0
  25. data/lib/ohai/mixin/string.rb +1 -1
  26. data/lib/ohai/mixin/which.rb +38 -0
  27. data/lib/ohai/plugin_config.rb +1 -1
  28. data/lib/ohai/plugins/aix/kernel.rb +1 -1
  29. data/lib/ohai/plugins/aix/memory.rb +3 -3
  30. data/lib/ohai/plugins/aix/network.rb +1 -1
  31. data/lib/ohai/plugins/aix/platform.rb +1 -1
  32. data/lib/ohai/plugins/aix/uptime.rb +1 -1
  33. data/lib/ohai/plugins/aix/virtualization.rb +1 -1
  34. data/lib/ohai/plugins/azure.rb +1 -1
  35. data/lib/ohai/plugins/bsd/virtualization.rb +2 -2
  36. data/lib/ohai/plugins/cloud.rb +1 -1
  37. data/lib/ohai/plugins/command.rb +1 -1
  38. data/lib/ohai/plugins/cpu.rb +2 -2
  39. data/lib/ohai/plugins/darwin/memory.rb +1 -1
  40. data/lib/ohai/plugins/darwin/network.rb +1 -1
  41. data/lib/ohai/plugins/darwin/platform.rb +2 -2
  42. data/lib/ohai/plugins/darwin/virtualization.rb +1 -1
  43. data/lib/ohai/plugins/docker.rb +1 -1
  44. data/lib/ohai/plugins/ec2.rb +2 -2
  45. data/lib/ohai/plugins/erlang.rb +1 -1
  46. data/lib/ohai/plugins/eucalyptus.rb +1 -1
  47. data/lib/ohai/plugins/filesystem.rb +1 -1
  48. data/lib/ohai/plugins/fips.rb +1 -1
  49. data/lib/ohai/plugins/hostname.rb +1 -1
  50. data/lib/ohai/plugins/init_package.rb +1 -1
  51. data/lib/ohai/plugins/java.rb +1 -1
  52. data/lib/ohai/plugins/kernel.rb +2 -2
  53. data/lib/ohai/plugins/keys.rb +1 -1
  54. data/lib/ohai/plugins/languages.rb +1 -1
  55. data/lib/ohai/plugins/libvirt.rb +1 -1
  56. data/lib/ohai/plugins/linode.rb +1 -1
  57. data/lib/ohai/plugins/linux/block_device.rb +1 -1
  58. data/lib/ohai/plugins/linux/lsb.rb +1 -1
  59. data/lib/ohai/plugins/linux/memory.rb +1 -1
  60. data/lib/ohai/plugins/linux/network.rb +9 -9
  61. data/lib/ohai/plugins/linux/platform.rb +1 -1
  62. data/lib/ohai/plugins/linux/virtualization.rb +1 -1
  63. data/lib/ohai/plugins/network.rb +1 -1
  64. data/lib/ohai/plugins/ohai_time.rb +1 -1
  65. data/lib/ohai/plugins/openstack.rb +1 -1
  66. data/lib/ohai/plugins/os.rb +1 -1
  67. data/lib/ohai/plugins/packages.rb +20 -0
  68. data/lib/ohai/plugins/perl.rb +1 -1
  69. data/lib/ohai/plugins/platform.rb +1 -1
  70. data/lib/ohai/plugins/powershell.rb +1 -1
  71. data/lib/ohai/plugins/ps.rb +1 -1
  72. data/lib/ohai/plugins/python.rb +1 -1
  73. data/lib/ohai/plugins/shard.rb +1 -1
  74. data/lib/ohai/plugins/shells.rb +1 -1
  75. data/lib/ohai/plugins/softlayer.rb +1 -1
  76. data/lib/ohai/plugins/solaris2/network.rb +6 -8
  77. data/lib/ohai/plugins/solaris2/platform.rb +1 -1
  78. data/lib/ohai/plugins/solaris2/virtualization.rb +1 -1
  79. data/lib/ohai/plugins/ssh_host_key.rb +1 -1
  80. data/lib/ohai/plugins/uptime.rb +1 -1
  81. data/lib/ohai/plugins/virtualbox.rb +1 -1
  82. data/lib/ohai/plugins/vmware.rb +1 -1
  83. data/lib/ohai/plugins/windows/drivers.rb +1 -1
  84. data/lib/ohai/plugins/windows/network.rb +1 -1
  85. data/lib/ohai/plugins/windows/platform.rb +1 -1
  86. data/lib/ohai/plugins/windows/system_enclosure.rb +1 -1
  87. data/lib/ohai/plugins/windows/virtualization.rb +1 -1
  88. data/lib/ohai/plugins/zpools.rb +1 -1
  89. data/lib/ohai/provides_map.rb +1 -1
  90. data/lib/ohai/runner.rb +1 -1
  91. data/lib/ohai/system.rb +2 -3
  92. data/lib/ohai/util/file_helper.rb +4 -37
  93. data/lib/ohai/util/win32.rb +1 -1
  94. data/lib/ohai/version.rb +2 -2
  95. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6a41b8cc8fc0d00fb8816f241f080d183be4b5b4019be40a6e6ab5603d4ab5c5
4
- data.tar.gz: adc92d0dcb0c5a5490aa842cd513c761fe984dc6a4aeb5cafdbc7cc8f705d61f
3
+ metadata.gz: 8039a80535910fc0746573f29cbd7746fbe1ac34a46a2c98a93603ac7b4fb83e
4
+ data.tar.gz: cf27f4ca401a9c57674d2c10b72867ef1e423d85e3849fcf1cd9d318e87a8716
5
5
  SHA512:
6
- metadata.gz: dd143425b3e1bcd9ef730496e890f41107f9676185bede8b8a8ce2a26cb4f007326d9023121396526c85426f9d07de36a7a5d448e76ad3efe1dcbb0c6fffa186
7
- data.tar.gz: 2b93a5ed54f74514be768879bbac6b068c697b09d735258d7716800c2367bad16522b9124a202b9824eb627b45021ab8404ae803f43109a3e5531aec35518f58
6
+ metadata.gz: 54f972aa56f93adfa75ee164c2e505bc1a6b8dcdbc797e6cac6ccc8ea02e5fede2340f63b9529d7f4a3a6ab814543b46d65607c40b39d617602bfad009f183e6
7
+ data.tar.gz: 3453c0ef0e9c0e0dce7eebb258738c1fbcf0578a1894ab6eb7476385b5b0c9973d0dfc2c42be7c9ff544e33838aeeb8979daef1e0f6d331cffca7265643841ec
data/Gemfile CHANGED
@@ -5,7 +5,7 @@ gemspec
5
5
  # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
6
6
  group :development do
7
7
  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
8
- gem "rubocop-performance", "1.7.1"
8
+ gem "rubocop-performance", "1.8.0"
9
9
  gem "rake", ">= 10.1.0"
10
10
  gem "rspec-core", "~> 3.0"
11
11
  gem "rspec-expectations", "~> 3.0"
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
3
  # Author:: Claire McQuin (<claire@chef.io>)
4
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
4
+ # Copyright:: Copyright (c) Chef Software Inc.
5
5
  # License:: Apache License, Version 2.0
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
- # Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
3
  # Author:: Claire McQuin (<claire@chef.io>)
4
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
4
+ # Copyright:: Copyright (c) Chef Software Inc.
5
5
  # License:: Apache License, Version 2.0
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,10 +19,10 @@
19
19
  #
20
20
 
21
21
  require_relative "../mixin/os"
22
- require_relative "../mixin/command"
22
+ require_relative "../mixin/shell_out"
23
23
  require_relative "../mixin/seconds_to_human"
24
+ require_relative "../mixin/which"
24
25
  require_relative "../hints"
25
- require_relative "../util/file_helper"
26
26
 
27
27
  module Ohai
28
28
 
@@ -83,9 +83,9 @@ module Ohai
83
83
  class Plugin
84
84
 
85
85
  include Ohai::Mixin::OS
86
- include Ohai::Mixin::Command
86
+ include Ohai::Mixin::ShellOut
87
87
  include Ohai::Mixin::SecondsToHuman
88
- include Ohai::Util::FileHelper
88
+ include Ohai::Mixin::Which
89
89
 
90
90
  attr_reader :data
91
91
  attr_reader :failed
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
- # Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
- # Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Claire McQuin (<claire@chef.io>)
3
- # Copyright:: Copyright (c) 2013-2019, Chef Software Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
- # Copyright:: Copyright (c) 2008-2017, Chef Software Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Tim Smith (<tsmith@chef.io>)
3
- # Copyright:: 2017-2020 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -0,0 +1,39 @@
1
+ #
2
+ # Copyright:: Copyright (c) Chef Software Inc.
3
+ # License:: Apache License, Version 2.0
4
+ #
5
+ # Licensed under the Apache License, Version 2.0 (the "License");
6
+ # you may not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing, software
12
+ # distributed under the License is distributed on an "AS IS" BASIS,
13
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ # See the License for the specific language governing permissions and
15
+ # limitations under the License.
16
+ #
17
+
18
+ require_relative "../config"
19
+
20
+ module Ohai
21
+ module Mixin
22
+ # Common Dependency Injection wiring for ChefUtils-related modules
23
+ module ChefUtilsWiring
24
+ private
25
+
26
+ def __config
27
+ Ohai::Config
28
+ end
29
+
30
+ def __log
31
+ logger
32
+ end
33
+
34
+ def __transport_connection
35
+ # Chef.run_context&.transport_connection
36
+ end
37
+ end
38
+ end
39
+ end
@@ -1,54 +1,3 @@
1
- #
2
- # Author:: Adam Jacob (<adam@chef.io>)
3
- # Author:: Tim Smith (<tsmith@chef.io>)
4
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
5
- # License:: Apache License, Version 2.0
6
- #
7
- # Licensed under the Apache License, Version 2.0 (the "License");
8
- # you may not use this file except in compliance with the License.
9
- # You may obtain a copy of the License at
10
- #
11
- # http://www.apache.org/licenses/LICENSE-2.0
12
- #
13
- # Unless required by applicable law or agreed to in writing, software
14
- # distributed under the License is distributed on an "AS IS" BASIS,
15
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
- # See the License for the specific language governing permissions and
17
- # limitations under the License.
18
- #
19
-
20
- require_relative "../exception"
21
- require_relative "../log"
22
- require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
23
-
24
- module Ohai
25
- module Mixin
26
- module Command
27
- # DISCLAIMER: Logging only works in the context of a plugin!!
28
- # accept a command and any of the mixlib-shellout options
29
- def shell_out(cmd, **options)
30
- options = options.dup
31
- # unless specified by the caller timeout after configured timeout (default 30 seconds)
32
- options[:timeout] ||= Ohai::Config.ohai[:shellout_timeout]
33
- unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
34
- options[:env] = options.key?(:env) ? options[:env].dup : {}
35
- options[:env]["PATH"] ||= ((ENV["PATH"] || "").split(":") + %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}).join(":")
36
- end
37
- so = Mixlib::ShellOut.new(cmd, options)
38
- begin
39
- so.run_command
40
- logger.trace("Plugin #{name}: ran '#{cmd}' and returned #{so.exitstatus}")
41
- so
42
- rescue Errno::ENOENT => e
43
- logger.trace("Plugin #{name}: ran '#{cmd}' and failed #{e.inspect}")
44
- raise Ohai::Exceptions::Exec, e
45
- rescue Mixlib::ShellOut::CommandTimeout => e
46
- logger.trace("Plugin #{name}: ran '#{cmd}' and timed out after #{options[:timeout]} seconds")
47
- raise Ohai::Exceptions::Exec, e
48
- end
49
- end
50
-
51
- module_function :shell_out
52
- end
53
- end
54
- end
1
+ $stderr.puts "WARN: Ohai::Mixin::Command is deprecated, please use Ohai::Mixin::ShellOut or remove if the reference is unnecessary"
2
+ require_relative "shell_out"
3
+ Ohai::Mixin::Command = Ohai::Mixin::ShellOut unless defined?(Ohai::Mixin::Command)
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
- # Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Tim Smith <tsmith@chef.io>
3
- # Copyright:: Copyright (c) 2015-2018 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,7 @@ module Ohai
28
28
  end
29
29
 
30
30
  def fetch_metadata
31
- uri = (DO_METADATA_URL).to_s
31
+ uri = DO_METADATA_URL.to_s
32
32
  response = http_client.get(uri)
33
33
  case response.code
34
34
  when "200"
@@ -2,7 +2,7 @@
2
2
  # Author:: Tim Dysinger (<tim@dysinger.net>)
3
3
  # Author:: Benjamin Black (<bb@chef.io>)
4
4
  # Author:: Christopher Brown (<cb@chef.io>)
5
- # Copyright:: 2009-2017 Chef Software, Inc.
5
+ # Copyright:: Copyright (c) Chef Software Inc.
6
6
  # License:: Apache License, Version 2.0
7
7
  #
8
8
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright:: 2017, Chef Software, Inc.
2
+ # Copyright:: Copyright (c) Chef Software Inc.
3
3
  # License:: Apache License, Version 2.0
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Serdar Sutay (<serdar@chef.io>)
3
- # Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@ module Ohai
32
32
  #
33
33
  # @return [Hash]
34
34
  def fetch_metadata
35
- uri = (SCALEWAY_METADATA_URL).to_s
35
+ uri = SCALEWAY_METADATA_URL.to_s
36
36
  response = http_client.get(uri)
37
37
  case response.code
38
38
  when "200"
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: Adam Jacob (<adam@chef.io>)
3
- # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -0,0 +1,50 @@
1
+ #
2
+ # Author:: Adam Jacob (<adam@chef.io>)
3
+ # Author:: Tim Smith (<tsmith@chef.io>)
4
+ # Copyright:: Copyright (c) Chef Software Inc.
5
+ # License:: Apache License, Version 2.0
6
+ #
7
+ # Licensed under the Apache License, Version 2.0 (the "License");
8
+ # you may not use this file except in compliance with the License.
9
+ # You may obtain a copy of the License at
10
+ #
11
+ # http://www.apache.org/licenses/LICENSE-2.0
12
+ #
13
+ # Unless required by applicable law or agreed to in writing, software
14
+ # distributed under the License is distributed on an "AS IS" BASIS,
15
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ # See the License for the specific language governing permissions and
17
+ # limitations under the License.
18
+ #
19
+
20
+ require_relative "../exception"
21
+ require_relative "../log"
22
+
23
+ require "mixlib/shellout/helper" unless defined?(Mixlib::ShellOut::Helper)
24
+ require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
25
+
26
+ module Ohai
27
+ module Mixin
28
+ module ShellOut
29
+ include Mixlib::ShellOut::Helper
30
+ include Ohai::Mixin::ChefUtilsWiring
31
+
32
+ def shell_out(cmd, **options)
33
+ options = options.dup
34
+ # unless specified by the caller timeout after configured timeout (default 30 seconds)
35
+ options[:timeout] ||= Ohai::Config.ohai[:shellout_timeout]
36
+ begin
37
+ so = super(cmd, **options)
38
+ logger.trace("Plugin #{name}: ran '#{cmd}' and returned #{so.exitstatus}")
39
+ so
40
+ rescue Errno::ENOENT => e
41
+ logger.trace("Plugin #{name}: ran '#{cmd}' and failed #{e.inspect}")
42
+ raise Ohai::Exceptions::Exec, e
43
+ rescue Mixlib::ShellOut::CommandTimeout => e
44
+ logger.trace("Plugin #{name}: ran '#{cmd}' and timed out after #{options[:timeout]} seconds")
45
+ raise Ohai::Exceptions::Exec, e
46
+ end
47
+ end
48
+ end
49
+ end
50
+ end
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # Author:: James Gartrell (<jgartrel@gmail.com>)
3
- # Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
4
  # License:: Apache License, Version 2.0
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -0,0 +1,38 @@
1
+ #
2
+ # Copyright:: Copyright (c) Chef Software Inc.
3
+ # License:: Apache License, Version 2.0
4
+ #
5
+ # Licensed under the Apache License, Version 2.0 (the "License");
6
+ # you may not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing, software
12
+ # distributed under the License is distributed on an "AS IS" BASIS,
13
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ # See the License for the specific language governing permissions and
15
+ # limitations under the License.
16
+
17
+ require "chef-utils/dsl/which" unless defined?(ChefUtils::DSL::Which)
18
+ require "chef-utils/dsl/default_paths" unless defined?(ChefUtils::DSL::DefaultPaths)
19
+ require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
20
+
21
+ module Ohai
22
+ module Mixin
23
+ module Which
24
+ include ChefUtils::DSL::Which
25
+ include ChefUtils::DSL::DefaultPaths
26
+ include ChefUtilsWiring
27
+
28
+ private
29
+
30
+ # we dep-inject default paths into this API for historical reasons
31
+ #
32
+ # @api private
33
+ def __extra_path
34
+ __default_paths
35
+ end
36
+ end
37
+ end
38
+ end
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
2
+ # Copyright:: Copyright (c) Chef Software Inc.
3
3
  # License:: Apache License, Version 2.0
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Author:: Joshua Timberman <joshua@chef.io>
3
3
  # Author:: Isa Farnik (<isa@chef.io>)
4
- # Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
4
+ # Copyright:: Copyright (c) Chef Software Inc.
5
5
  # License:: Apache License, Version 2.0
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # Author:: Joshua Timberman <joshua@chef.io>
3
3
  # Author:: Isa Farnik (<isa@chef.io>)
4
- # Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
4
+ # Copyright:: Copyright (c) Chef Software Inc.
5
5
  # License:: Apache License, Version 2.0
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ Ohai.plugin(:Memory) do
30
30
  memory[:free] = "#{free_in_mb.to_i * 1024}kB"
31
31
 
32
32
  swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
33
- memory[:swap]["total"] = "#{(swap_info[2].to_i) * 4}kB"
34
- memory[:swap]["free"] = "#{(swap_info[10].to_i) * 4}kB"
33
+ memory[:swap]["total"] = "#{swap_info[2].to_i * 4}kB"
34
+ memory[:swap]["free"] = "#{swap_info[10].to_i * 4}kB"
35
35
  end
36
36
  end