cim 1.4.1 → 1.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fc7b0bda547a22d0f754c96dae011b9f2591cad8
+  data.tar.gz: e567befe6c52d503590b06a5ec186930f280e3cc
+SHA512:
+  metadata.gz: ddff66a1228b09f5c1b7df502d3261375e711458ccb2db664b15813999751d3e2308a55337097d70cd9e16936ddfec04bfd0179b5d8a1d212a0a4c7dd438d41f
+  data.tar.gz: 4010529e49f4d2f0676b1d9de7b92ed95b52d43c0f92db7c6a7c404fecd09d5cf84104031a725dca38994edff5fc739628461b23c8b24b9e0c09be9630aed56f

data/lib/cim.rb

@@ -10,6 +10,9 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+CIMPATH = "/usr/share/mof/ruby"
+$:.unshift(CIMPATH) unless $:.include?(CIMPATH)
+
 #
 # The CIM Ruby gem is an implementation of the Common Information Model (CIM) meta schema[1]
 #
@@ -41,7 +44,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 #
 
 module CIM
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
   require 'cim/type'
   require 'cim/variant'
   require 'cim/qualifier_flavors'

data/lib/cim/type.rb

@@ -152,12 +152,16 @@ module CIM
     # check if another Type or Variant matches
     #
     def matches? x
-      #	puts ">#{self}<{#{self.class}}.matches?>#{x.inspect}<{#{x.class}}"
+#      	puts "Type#matches? : >#{self}<{#{self.class}}.matches?>#{x.inspect}<{#{x.class}}"
       case x
       when CIM::Type, CIM::Variant
 	return true if x.type == @type
 	return true if MATCHES[@type].include? x.type
 	false
+      when ::Symbol
+        return true if @type == x
+        return true if MATCHES[@type].include? x
+        false
       when ::Array
 	return false unless self.is_a? CIM::Array
 	x.each do |v|

data/lib/cim/variant.rb

@@ -30,19 +30,48 @@ module CIM
     #
     def == v
 #      $stderr.puts "<#{@type}>#{self} == #{v.class}"
+      return false unless self.is_a?(v)
       case v
-      when NilClass then     @type == :null && @value.nil?
-      when FalseClass then   @type == :boolean && !@value
-      when TrueClass then    @type == :boolean && @value
-      when String then       @type == :string && @value == v
-      when Integer then      @type == :int && @value == v
-      when Float then        @type == :real && @value == v
-      when CIM::Variant then @type == v.type && @value == v.value
+      when NilClass then     @value.nil?
+      when FalseClass then   !@value
+      when TrueClass then    @value
+      when String then       @value == v
+      when Integer then      @value == v
+      when Float then        @value == v
+      when CIM::Variant then @value == v.value
       else
 	false
       end			
     end
     #
+    # Check type against Ruby class
+    #
+    def is_a? klass
+#      puts "Variant#is_a? : #{self.inspect} is_a #{klass.class}:#{klass.inspect}"
+      case klass
+      when NilClass      then @type.matches? :null
+      when FalseClass    then @type.matches? :boolean
+      when TrueClass     then @type.matches? :boolean
+      when Integer       then @type.matches?(:uint64) || @type.matches?(:sint64) 
+      when Float         then @type.matches? :real32
+      when Symbol        then @type.matches? klass
+      when String        then
+        @type.matches? :string
+      when CIM::Variant  then @type.matches? klass.type
+      else
+        if klass == Integer
+          @type.matches?(:uint64) || @type.matches?(:sint64) 
+        elsif klass == Float
+          @type.matches? :real32
+        elsif klass == String
+          @type.matches? :string
+        else
+#          puts "Nothing matches #{klass}:#{klass.inspect}"
+          false
+        end
+      end
+    end
+    #
     # returns a string representation in MOF syntax format
     #
     def to_s

metadata

@@ -1,55 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: cim
 version: !ruby/object:Gem::Version
-  version: 1.4.1
-  prerelease: 
+  version: 1.4.2
 platform: ruby
 authors:
 - Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Instances of Cim classes are used to define a CIM
-
+description: |-
+  Instances of Cim classes are used to define a CIM
   schema, often represented as a .mof file. See
-
   http://www.dmtf.org/standards/cim and
-
-  http://www.dmtf.org/education/mof for details'
+  http://www.dmtf.org/education/mof for details
 email:
 - kkaempf@suse.de
 executables: []
@@ -58,46 +51,44 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files:
+- LICENSE
+- README.rdoc
 - lib/cim.rb
-- lib/cim/property.rb
-- lib/cim/type.rb
+- lib/cim/class.rb
+- lib/cim/class_feature.rb
+- lib/cim/instance.rb
 - lib/cim/method.rb
+- lib/cim/named_element.rb
+- lib/cim/property.rb
+- lib/cim/qualifier.rb
+- lib/cim/qualifier_declaration.rb
+- lib/cim/qualifier_flavors.rb
 - lib/cim/qualifier_scopes.rb
-- lib/cim/instance.rb
 - lib/cim/qualifier_set.rb
 - lib/cim/reference.rb
-- lib/cim/qualifier_flavors.rb
+- lib/cim/type.rb
 - lib/cim/variant.rb
-- lib/cim/class_feature.rb
-- lib/cim/class.rb
-- lib/cim/named_element.rb
-- lib/cim/qualifier_declaration.rb
-- lib/cim/qualifier.rb
-- README.rdoc
-- LICENSE
 homepage: https://github.com/kkaempf/cim
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cim
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pure-Ruby implementation of the CIM meta model
 test_files: []
-has_rdoc: