diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2016-07-29 13:21:02 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2016-07-29 13:21:02 -0700 |
| commit | 32b527ea14246f2410f7941e899879d7f9c2ee0d (patch) | |
| tree | 0816752b7070be1b8f55133d0ece323a6993543a | |
| parent | d198617ee9fc2727ef7539bff0c9679a69220286 (diff) | |
| download | ohai-32b527ea14246f2410f7941e899879d7f9c2ee0d.tar.gz | |
FileHelper will just stay in the base Plugin class indefinitely. It's small, doesn't stomp on much, and is helpful in a large number of plugins.
| -rw-r--r-- | lib/ohai/dsl/plugin.rb | 3 | ||||
| -rw-r--r-- | lib/ohai/plugins/darwin/virtualization.rb | 4 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/sessions.rb | 4 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 2 |
4 files changed, 0 insertions, 13 deletions
diff --git a/lib/ohai/dsl/plugin.rb b/lib/ohai/dsl/plugin.rb index 176b4f07..1cbdbc2e 100644 --- a/lib/ohai/dsl/plugin.rb +++ b/lib/ohai/dsl/plugin.rb @@ -82,9 +82,6 @@ module Ohai include Ohai::Mixin::OS include Ohai::Mixin::Command include Ohai::Mixin::SecondsToHuman - - # Pending next major release of Ohai. - # See https://github.com/chef/ohai/issues/851 for details. include Ohai::Util::FileHelper attr_reader :data diff --git a/lib/ohai/plugins/darwin/virtualization.rb b/lib/ohai/plugins/darwin/virtualization.rb index 61abae7d..61102cf1 100644 --- a/lib/ohai/plugins/darwin/virtualization.rb +++ b/lib/ohai/plugins/darwin/virtualization.rb @@ -18,11 +18,7 @@ # limitations under the License. # -require "ohai/util/file_helper" - Ohai.plugin(:Virtualization) do - include Ohai::Util::FileHelper - provides "virtualization" def vboxmanage_exists? diff --git a/lib/ohai/plugins/linux/sessions.rb b/lib/ohai/plugins/linux/sessions.rb index f2f33bba..a2a3a09b 100644 --- a/lib/ohai/plugins/linux/sessions.rb +++ b/lib/ohai/plugins/linux/sessions.rb @@ -16,10 +16,6 @@ # limitations under the License. # -require "ohai/util/file_helper" - -include Ohai::Util::FileHelper - Ohai.plugin(:Sessions) do provides "sessions/by_session", "sessions/by_user" diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index 189bf444..32e28e0e 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -16,10 +16,8 @@ # limitations under the License. # -require "ohai/util/file_helper" require "ohai/mixin/dmi_decode" -include Ohai::Util::FileHelper include Ohai::Mixin::DmiDecode Ohai.plugin(:Virtualization) do |