lib/wbem.rb in wbem-0.3.0 vs lib/wbem.rb in wbem-0.5.0

@@ -7,22 +7,24 @@
 # Written by Klaus Kaempf <[e-mail]>
 #
 # Licensed under the MIT license
 #
 module Wbem
+  require 'wbem/class_factory'
+  require 'wbem/conversion'
+  require 'wbem/wbem'
+
   @@debug = nil
   def Wbem.debug
     @@debug
   end
   def Wbem.debug= level
     @@debug = (level == 0) ? nil : level
   end
 
   class Client
     require 'uri'
-    require 'wbem/wsman'
-    require 'wbem/cimxml'
 
     #
     # Wbem::Client.connect uri, protocol = nil
     #
     # Connect to remote client identified by uri and protocol
@@ -30,11 +32,11 @@
     # :cimxml - connect via CIM/XML
     # :wsman  - connect via WS-Management
     # else    - probe connection (cim/xml first)
     #
     def self.connect uri, protocol = nil, auth_scheme = nil
-      STDERR.puts "Wbem::Client.connect(#{uri},#{protocol},#{auth_scheme})"
+      STDERR.puts "Wbem::Client.connect(#{uri},#{protocol},#{auth_scheme})" if Wbem.debug
       unless uri.is_a?(URI)
         u = URI.parse(uri)
         # u.port will be set in any case, so check the uri for port specification
         protocol_given = uri.match(/:\d/)
       else
@@ -44,19 +46,21 @@
       case protocol.to_s
       when "wsman"
         unless protocol_given
           u.port = (u.scheme == "http") ? 5985 : 5986
         end
+        require 'wbem/wsman'
         return WsmanClient.new u, auth_scheme
       when "cimxml"
         unless protocol_given
           u.port = (u.scheme == "http") ? 5988 : 5989
         end
+        require 'wbem/cimxml'
         return CimxmlClient.new u
       end
       # no connect, check known ports
       case u.port
-      when 8888, 8889, 5985, 5986
+      when 8888, 8889, 5985, 5986, 16992
         return Wbem::Client.connect u, :wsman, auth_scheme
       when 5988, 5989
         return Wbem::Client.connect u, :cimxml, auth_scheme
       end
 #      STDERR.puts "no known ports"