Use wmi-lite gem dependency for wmi access

3 files changed, 1 insertions, 88 deletions

diff --git a/lib/chef/platform/query_helpers.rb b/lib/chef/platform/query_helpers.rb
index 1a1feeb91f..a8d8e4436e 100644
--- a/lib/chef/platform/query_helpers.rb
+++ b/lib/chef/platform/query_helpers.rb
@@ -32,7 +32,7 @@ class Chef
         return false unless windows?
         require 'wmi-lite/wmi'
 
-        require 'chef/win32/wmi'
+        require 'wmi-lite/wmi'
 
         # CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0
         # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db
diff --git a/lib/chef/win32/wmi.rb b/lib/chef/win32/wmi.rb
deleted file mode 100644
index 9ed02c6aea..0000000000
--- a/lib/chef/win32/wmi.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# 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 'win32ole'
-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}")
-        first_result = nil
-        query_result.each do | record |
-          first_result = record
-          break
-        end
-        first_result.nil? ? nil : wmi_result_to_snapshot(first_result)
-      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.invoke(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 55832f8e13..75ab0c9cde 100644
--- a/spec/support/platform_helpers.rb
+++ b/spec/support/platform_helpers.rb
@@ -39,7 +39,6 @@ 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