wbem 0.2.3 → 0.2.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.4
+
+* Make CimXml::ObjectPath and Wsman::EndPointReference behave similar
+
 == 0.2.3
 
 * Make #instance_names return generic result

data/README.rdoc

@@ -39,10 +39,6 @@ See the testsuite for more examples. Or run rake docs.
 
 * http://rdoc.info/projects/kkaempf/ruby-wbem
 
-=== Code Metrics
-
-* http://getcaliper.com/caliper/project?repo=git%3A%2F%2Fgithub.com%2Fkkaempf%2Fruby-wbem.git
-
 == Authors
 
 * Klaus Kämpf <kkaempf@suse.de>

data/lib/wbem.rb

@@ -35,6 +35,7 @@ module Wbem
       STDERR.puts "Wbem::Client.connect(#{uri},#{protocol},#{auth_scheme})"
       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
         u = uri
@@ -55,9 +56,9 @@ module Wbem
       # no connect, check known ports
       case u.port
       when 8888, 8889, 5985, 5986
-        return WsmanClient.new u, auth_scheme
+        return Wbem::Client.connect u, :wsman, auth_scheme
       when 5988, 5989
-        return CimxmlClient.new u
+        return Wbem::Client.connect u, :cimxml, auth_scheme
       end
 #      STDERR.puts "no known ports"
       port = u.port # keep orig port as we change u.port below
@@ -69,11 +70,7 @@ module Wbem
         if port == 443 && u.scheme == 'https' # https://hostname
           u.port = (protocol == :cimxml) ? 5989: 5986
         end
-        c = Wbem::Client.connect u, protocol, auth_scheme
-        if c
-#          STDERR.puts "Connect #{u} as #{c}"
-          return c
-        end
+        Wbem::Client.connect u, protocol, auth_scheme
       end
     end
 

data/lib/wbem/cimxml.rb

@@ -9,6 +9,18 @@
 #
 require "wbem/wbem"
 
+module Sfcc
+  module Cim
+    class ObjectPath
+      def keys
+        res = []
+        each_key { |key| res << each_key }
+        res
+      end
+    end
+  end
+end
+
 module Wbem
 class CimxmlClient < WbemClient
   require "sfcc"
@@ -34,14 +46,18 @@ private
   end
 public
 
+  #
+  # Initialize a CIMXML client connection
+  #
   def initialize url, auth_scheme = nil
     super url, auth_scheme
-    STDERR.puts "CIMXML.connect >#{url}<"
     @client = Sfcc::Cim::Client.connect( { :uri => url, :verify => false } )
-    STDERR.puts "CIMXML.connect #{url} -> #{@client}" if Wbem.debug
     _identify
   end
   
+  #
+  # Create ObjectPath from namespace and classname
+  #
   def objectpath namespace, classname = nil
     Sfcc::Cim::ObjectPath.new(namespace, classname)
   end

data/lib/wbem/version.rb

@@ -1,3 +1,3 @@
 module Wbem
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/wbem/wsman.rb

@@ -27,6 +27,15 @@ module Openwsman
       @classname = classname
     end
   end
+  # Provide Cim::ObjectPath like accessors
+  class EndPointReference
+    alias keys selector_names
+    alias key_count selector_count
+    alias add_key add_selector
+    def each_key
+      keys.each { |key| yield key }
+    end
+  end
 end
 
 module Wbem
@@ -219,6 +228,7 @@ public
   end
 
   def instance_names namespace, classname
+    @options.flags = Openwsman::FLAG_ENUMERATION_ENUM_EPR # get EPRs
     @options.flags = Openwsman::FLAG_ENUMERATION_OPTIMIZATION
     @options.max_elements = 999
     @options.cim_namespace = namespace
@@ -229,13 +239,12 @@ public
       return []
     end
 
-    instances = []
-    result.Items.each do |item|
-      item.add(nil, "namespace", namespace)
-      item.add(nil, "classname", classname)
-      instances << item
+    names = []
+    # expect <n:Item><a:EndpointReference>...
+    result.Items.each do |epr|
+      names << Openwsman::EndPointReference.new(epr)
     end
-    return instances
+    return names
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wbem
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3187880 !ruby/object:Gem::Requirement
+  requirement: &5664800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *3187880
+  version_requirements: *5664800
 - !ruby/object:Gem::Dependency
   name: sfcc
-  requirement: &3187220 !ruby/object:Gem::Requirement
+  requirement: &5664240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *3187220
+  version_requirements: *5664240
+- !ruby/object:Gem::Dependency
+  name: openwsman
+  requirement: &5663640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *5663640
 description: ruby-wbem allows to access a CIMOM transparently through CIM/XML or WS-Management
 email:
 - kkaempf@suse.de
@@ -73,3 +84,4 @@ signing_key:
 specification_version: 3
 summary: WBEM client for Ruby based on ruby-sfcc and openwsman
 test_files: []
+has_rdoc: