summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Edwards <adamed@opscode.com>2014-05-02 09:22:40 -0700
committersersut <serdar@opscode.com>2014-05-30 13:05:48 -0700
commit17a7d93df559f24d687341331b2329a134b0b619 (patch)
tree17463b2529150a661681c4ec3e48ab703df11d1d
parent0e4232cb7cb08379ec572f5522e445c8f114ce0d (diff)
downloadchef-17a7d93df559f24d687341331b2329a134b0b619.tar.gz
Re-implement ruby-wmi functionality
-rw-r--r--lib/chef/platform/query_helpers.rb3
-rw-r--r--lib/chef/win32/wmi.rb80
-rw-r--r--spec/support/platform_helpers.rb2
3 files changed, 83 insertions, 2 deletions
diff --git a/lib/chef/platform/query_helpers.rb b/lib/chef/platform/query_helpers.rb
index 7be5697bf7..e8562233ab 100644
--- a/lib/chef/platform/query_helpers.rb
+++ b/lib/chef/platform/query_helpers.rb
@@ -16,6 +16,8 @@
# limitations under the License.
#
+require 'chef/win32/wmi'
+
class Chef
class Platform
@@ -30,7 +32,6 @@ class Chef
def windows_server_2003?
return false unless windows?
-
require 'wmi-lite/wmi'
# CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0
diff --git a/lib/chef/win32/wmi.rb b/lib/chef/win32/wmi.rb
new file mode 100644
index 0000000000..c3d6cf7d3b
--- /dev/null
+++ b/lib/chef/win32/wmi.rb
@@ -0,0 +1,80 @@
+#
+# Author:: Adam Edwards (<adamed@getchef.com>)
+# Copyright:: Copyright 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/reserved_names'
+
+class Chef
+ module ReservedNames::Win32
+
+ class WMI
+ def initialize(namespace = nil, results_as_mash = false)
+ @connection = new_connection(namespace.nil? ? 'root/cimv2' : namespace)
+ @results_as_mash = results_as_mash
+ end
+
+ def query(wql_query)
+ results = start_query(wql_query)
+
+ result_set = []
+
+ results.each do | result |
+ result_set.push(wmi_result_to_snapshot(result))
+ end
+
+ result_set
+ end
+
+ def instances_of(wmi_class)
+ query("select * from #{wmi_class}")
+ end
+
+ def first_of(wmi_class)
+ query_result = start_query("select * from #{wmi_class}")
+ wmi_result_to_snapshot(query_result.first)
+ end
+
+ private
+
+ def start_query(wql_query)
+ @connection.ExecQuery(wql_query)
+ end
+
+ def new_connection(namespace)
+ locator = WIN32OLE.new("WbemScripting.SWbemLocator")
+ locator.ConnectServer('.', namespace)
+ end
+
+ def wmi_result_to_hash(wmi_object)
+ property_map = {}
+ wmi_object.properties_.each do |property|
+ property_map[property.name.downcase] = wmi_object.send(property.name)
+ end
+
+ property_map[:wmi_object] = wmi_object
+
+ property_map
+ end
+
+ def wmi_result_to_snapshot(wmi_object)
+ snapshot = wmi_result_to_hash(wmi_object)
+ @results_as_mash ? Mash.new(snapshot) : snapshot
+ end
+ end
+
+ end
+end
diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb
index dc626a926f..55832f8e13 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -38,8 +38,8 @@ end
def windows_win2k3?
return false unless windows?
-
wmi = WmiLite::Wmi.new
+
host = wmi.first_of('Win32_OperatingSystem')
(host['version'] && host['version'].start_with?("5.2"))
end