wbem 0.1.1 → 0.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.0
+
+* add 'class_names', supporting WINRM
+
 == 0.1.1
 
 * Unify 'identify'

data/lib/wbem/cimxml.rb

@@ -61,8 +61,8 @@ public
   #
   # Return list of classnames for given namespace
   #
-  def classnames namespace, deep_inheritance = false
-    STDERR.puts "#{@client}.classnames(#{namespace})"
+  def class_names namespace, deep_inheritance = false
+    STDERR.puts "#{@client}.class_names(#{namespace})"
     ret = []
     op = Sfcc::Cim::ObjectPath.new(namespace)
     flags = deep_inheritance ? Sfcc::Flags::DeepInheritance : 0

data/lib/wbem/version.rb

@@ -1,3 +1,3 @@
 module Wbem
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/wbem/wbem.rb

@@ -34,8 +34,10 @@ module Wbem
     end
 
 private
+    # assemble all namespaces
     def _namespaces ns, cn
       result = nil
+      # each_instance is the downcall to cimxml or wsman
       each_instance( ns, cn ) do |inst|
         result ||= [ns]
         name = "#{ns}/#{inst.Name}"
@@ -60,8 +62,8 @@ public
     end
 
     # return list of classnames for namespace ns
-    def classnames ns, deep_inheritance=false
-      raise "#{self.class}.classnames not implemented"
+    def class_names ns, deep_inheritance=false
+      raise "#{self.class}.class_names not implemented"
     end
   
     def instance_names classname

data/lib/wbem/wsman.rb

@@ -138,26 +138,59 @@ public
     end if items
   end
 
-  def classnames namespace, deep_inheritance
-    # enum_classnames is Openwsman-specific
-    unless @product_vendor =~ /Openwsman/ && @product_version >= "2.2"
-      STDERR.puts "ENUMERATE_CLASS_NAMES unsupported for #{@product_vendor} #{@product_version}"
-      return []
-    end
+  def class_names namespace, deep_inheritance = false
     @options.flags = Openwsman::FLAG_ENUMERATION_OPTIMIZATION
     @options.max_elements = 999
     @options.cim_namespace = namespace
-    method = Openwsman::CIM_ACTION_ENUMERATE_CLASS_NAMES
-    uri = Openwsman::XML_NS_CIM_INTRINSIC
-    result = @client.invoke( @options, uri, method )
+    case @product
+    when :openwsman
+      unless @product_version >= "2.2"
+        STDERR.puts "ENUMERATE_CLASS_NAMES unsupported for #{@product_vendor} #{@product_version}, please upgrade"
+        return []
+      end
+      method = Openwsman::CIM_ACTION_ENUMERATE_CLASS_NAMES
+      uri = Openwsman::XML_NS_CIM_INTRINSIC
+      @options.add_selector("DeepInheritance", "True") if deep_inheritance
+      result = @client.invoke( @options, uri, method )
+    when :winrm
+      # see https://github.com/kkaempf/openwsman/blob/master/bindings/ruby/tests/winenum.rb
+      filter = Openwsman::Filter.new
+      query = "select * from meta_class"
+      query << " where __SuperClass is null" unless deep_inheritance
+      filter.wql query
+      uri = "#{@prefix}#{namespace}/*"
+      result = @client.enumerate( @options, filter, uri )
+    else
+      raise "Unsupported for WSMAN product #{@product}"
+    end
+    
     if result.fault?
       puts "Enumerate class names (#{uri}) failed:\n\tResult code #{@client.response_code}, Fault: #{@client.fault_string}"
       return []
     end
-    output = result.body[method]
+    
     classes = []
-    output.each do |c|
-      classes << c.to_s
+    
+    case @product
+    when :openwsman
+      # extract invoke result
+      output = result.body[method]
+      output.each do |c|
+        classes << c.to_s
+      end
+    when :winrm
+      # extract enumerate/pull result
+      loop do
+        output = result.Items
+        output.each do |node|
+          classes << node.name.to_s
+        end if output
+        context = result.context
+        break unless context
+        # get the next chunk
+        result = @client.pull( @options, nil, uri, context)
+        break unless result
+      end
     end
     return classes
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wbem
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Klaus K\xC3\xA4mpf"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 +01:00
+date: 2012-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency