mof 0.3.2 → 1.2.0

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-task :default => [:test]
 Dir['tasks/**/*.rake'].each { |t| load t }
+
+task :default => [:test]

data/bin/moflint

@@ -10,6 +10,9 @@
 
 require 'rubygems'
 require 'pathname'
+
+$:.push(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'mof'
 
 moffiles, options = MOF::Parser.argv_handler "moflint", ARGV

data/lib/mof.rb

@@ -1,7 +1,9 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+# keep version separate so mof.gemspec can source it without all the rest
+require "mof/version"
+
 module MOF
-  VERSION = '0.3.2'
   require "mof/parser"
 end

data/lib/mof/helper.rb

@@ -124,7 +124,8 @@ module Helper
 	s = stack[idx]
 	c = s.class
 	case s
-	when String, NilClass: s = s.inspect
+	when String, NilClass
+	  s = s.inspect
 	else
 	  s = s.to_s
 	end

data/lib/mof/parser.rb

@@ -22,14 +22,14 @@ module MOF
 
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/mof/parser.y modeval..ide18a0f9dc8', 'lib/mof/parser.y', 583
+module_eval <<'..end lib/mof/parser.y modeval..idbe2b713bdc', 'lib/mof/parser.y', 566
 
 #
 # Initialize MOF::Parser
 #  MOF::Parser.new options = {}
 #
 #  options -> Hash of options
-#    :debug -> bool
+#    :debug -> boolean
 #    :includes -> array of include dirs
 #    :style -> :cim or :wmi
 #
@@ -61,7 +61,7 @@ end
     options = { :namespace => "" }
     while argv.size > 0
       case opt = argv.shift
-      when "-h":
+      when "-h"
 	$stderr.puts "Ruby MOF compiler"
 	$stderr.puts "#{name} [-h] [-d] [-I <dir>] [<moffiles>]"
 	$stderr.puts "Compiles <moffile>"
@@ -75,10 +75,10 @@ end
 	$stderr.puts "\t-q  quiet"
 	$stderr.puts "\t<moffiles>  file(s) to read (else use $stdin)"
 	exit 0
-      when "-f": options[:force] = true
-      when "-s": options[:style] = argv.shift.to_sym
-      when "-d": options[:debug] = true
-      when "-q": options[:quiet] = true
+      when "-f" then options[:force] = true
+      when "-s" then options[:style] = argv.shift.to_sym
+      when "-d" then options[:debug] = true
+      when "-q" then options[:quiet] = true
       when "-I"
 	options[:includes] ||= []
 	dirname = argv.shift
@@ -87,9 +87,9 @@ end
 	  dirname = File.dirname(dirname)
 	end
 	options[:includes] << Pathname.new(dirname)
-      when "-n": options[:namespace] = argv.shift
-      when "-o": options[:output] = argv.shift
-      when /^-.+/:
+      when "-n" then options[:namespace] = argv.shift
+      when "-o" then options[:output] = argv.shift
+      when /^-.+/
 	$stderr.puts "Undefined option #{opt}"
       else
 	files << opt
@@ -101,7 +101,7 @@ end
 include Helper
 include Scanner
 
-..end lib/mof/parser.y modeval..ide18a0f9dc8
+..end lib/mof/parser.y modeval..idbe2b713bdc
 
 ##### racc 1.4.5 generates ###
 
@@ -503,7 +503,7 @@ racc_token_table = {
  :DT_REAL64 => 42,
  :DT_CHAR16 => 43,
  :DT_STR => 44,
- :DT_BOOL => 45,
+ :DT_BOOLEAN => 45,
  :DT_DATETIME => 46,
  :positiveDecimalValue => 47,
  :stringValue => 48,
@@ -595,7 +595,7 @@ Racc_token_to_s_table = [
 'DT_REAL64',
 'DT_CHAR16',
 'DT_STR',
-'DT_BOOL',
+'DT_BOOLEAN',
 'DT_DATETIME',
 'positiveDecimalValue',
 'stringValue',
@@ -797,41 +797,24 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 97
 
  # reduce 18 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 129
+module_eval <<'.,.,', 'lib/mof/parser.y', 112
   def _reduce_19( val, _values, result )
  qualifiers = val[0]
 	    features = val[6]
-	    if qualifiers and qualifiers.include?(:association, :bool)
-	      # FIXME: 'association' must be first
-              # Context:
-	      #
-	      # The remaining qualifier list must not include
-	      # the ASSOCIATION qualifier again. If the
-	      # association has no super association, then at
-	      # least two references must be specified! The
-	      # ASSOCIATION qualifier may be omitted in
-	      # sub associations.
-	      result = CIM::Association.new(val[2],qualifiers,val[3],val[4],features)
-	    elsif qualifiers and qualifiers.include?(:indication, :bool)
-	      # FIXME: 'indication' must be first
-	      # FIXME: features must not include references
-	      result = CIM::Indication.new(val[2],qualifiers,val[3],val[4],features)
-	    else
-	      # FIXME: features must not include references
-	      result = CIM::Class.new(val[2],qualifiers,val[3],val[4],features)
-	    end
+	    # FIXME: features must not include references
+	    result = CIM::Class.new(val[2],qualifiers,val[3],val[4],features)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 134
+module_eval <<'.,.,', 'lib/mof/parser.y', 117
   def _reduce_20( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 136
+module_eval <<'.,.,', 'lib/mof/parser.y', 119
   def _reduce_21( val, _values, result )
  result = val[0] << val[1]
    result
@@ -846,14 +829,14 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 136
 
  # reduce 25 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 149
+module_eval <<'.,.,', 'lib/mof/parser.y', 132
   def _reduce_26( val, _values, result )
  result = CIM::QualifierSet.new val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 155
+module_eval <<'.,.,', 'lib/mof/parser.y', 138
   def _reduce_27( val, _values, result )
  result = val[2]
 	    result.unshift val[1] if val[1]
@@ -861,14 +844,14 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 155
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 160
+module_eval <<'.,.,', 'lib/mof/parser.y', 143
   def _reduce_28( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 164
+module_eval <<'.,.,', 'lib/mof/parser.y', 147
   def _reduce_29( val, _values, result )
  result = val[0]
 	    result << val[2] if val[2]
@@ -876,13 +859,13 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 164
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 186
+module_eval <<'.,.,', 'lib/mof/parser.y', 169
   def _reduce_30( val, _values, result )
  # Get qualifier decl
 	    qualifier = case val[0]
-	      when CIM::Qualifier:            val[0].definition
-	      when CIM::QualifierDeclaration: val[0]
-	      when String:                    @qualifiers[val[0].downcase]
+	      when CIM::Qualifier then            val[0].definition
+	      when CIM::QualifierDeclaration then val[0]
+	      when String then                    @qualifiers[val[0].downcase]
 	    else
 	      nil
 	    end
@@ -890,7 +873,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 186
 	    value = val[1]
 	    raise MOF::Helper::Error.new(@name,@lineno,@line,"#{value.inspect} does not match qualifier type '#{qualifier.type}'") unless qualifier.type.matches?(value)||@style == :wmi
 	    # Don't propagate a boolean 'false'
-	    if qualifier.type == :bool && value == false
+	    if qualifier.type == :boolean && value == false
 	      result = nil
 	    else
 	      result = CIM::Qualifier.new(qualifier,value,val[2])
@@ -901,7 +884,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 186
 
  # reduce 31 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 192
+module_eval <<'.,.,', 'lib/mof/parser.y', 175
   def _reduce_32( val, _values, result )
  result = CIM::QualifierFlavors.new val[1]
    result
@@ -912,7 +895,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 192
 
  # reduce 34 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 202
+module_eval <<'.,.,', 'lib/mof/parser.y', 185
   def _reduce_35( val, _values, result )
  result = val[1]
    result
@@ -933,7 +916,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 202
 
  # reduce 42 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 213
+module_eval <<'.,.,', 'lib/mof/parser.y', 196
   def _reduce_43( val, _values, result )
  case val[0].to_sym
 	      when :amended, :toinstance
@@ -951,35 +934,35 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 213
 
  # reduce 47 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 228
+module_eval <<'.,.,', 'lib/mof/parser.y', 211
   def _reduce_48( val, _values, result )
  raise ParseError.new("Class name must be prefixed by '<schema>_'") unless val[0].include?("_") || @style == :wmi
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 233
+module_eval <<'.,.,', 'lib/mof/parser.y', 216
   def _reduce_49( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 238
+module_eval <<'.,.,', 'lib/mof/parser.y', 221
   def _reduce_50( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 243
+module_eval <<'.,.,', 'lib/mof/parser.y', 226
   def _reduce_51( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 255
+module_eval <<'.,.,', 'lib/mof/parser.y', 238
   def _reduce_52( val, _values, result )
  if val[3]
 	      type = CIM::Array.new val[3],val[1]
@@ -991,7 +974,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 255
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 263
+module_eval <<'.,.,', 'lib/mof/parser.y', 246
   def _reduce_53( val, _values, result )
  if val[4]
 	      raise StyleError.new(@name,@lineno,@line,"Array not allowed in reference declaration") unless @style == :wmi
@@ -1001,7 +984,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 263
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 268
+module_eval <<'.,.,', 'lib/mof/parser.y', 251
   def _reduce_54( val, _values, result )
  result = CIM::Method.new(val[1],val[2],val[0],val[4])
    result
@@ -1010,7 +993,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 268
 
  # reduce 55 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 276
+module_eval <<'.,.,', 'lib/mof/parser.y', 259
   def _reduce_56( val, _values, result )
  # tmplprov.mof has 'string Property;'
 	    raise StyleError.new(@name,@lineno,@line,"Invalid keyword '#{val[0]}' used for property name") unless @style == :wmi
@@ -1020,7 +1003,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 276
 
  # reduce 57 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 282
+module_eval <<'.,.,', 'lib/mof/parser.y', 265
   def _reduce_58( val, _values, result )
  result = "Indication"
    result
@@ -1057,14 +1040,14 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 282
 
  # reduce 73 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 305
+module_eval <<'.,.,', 'lib/mof/parser.y', 288
   def _reduce_74( val, _values, result )
  raise StyleError.new(@name,@lineno,@line,"'void' is not a valid datatype") unless @style == :wmi
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 313
+module_eval <<'.,.,', 'lib/mof/parser.y', 296
   def _reduce_75( val, _values, result )
  # WMI uses class names as data types (without REF ?!)
 	    raise StyleError.new(@name,@lineno,@line,"Expected 'ref' keyword after classname '#{val[0]}'") unless @style == :wmi
@@ -1073,7 +1056,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 313
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 316
+module_eval <<'.,.,', 'lib/mof/parser.y', 299
   def _reduce_76( val, _values, result )
  result = CIM::ReferenceType.new val[0]
    result
@@ -1084,28 +1067,28 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 316
 
  # reduce 78 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 326
+module_eval <<'.,.,', 'lib/mof/parser.y', 309
   def _reduce_79( val, _values, result )
  result = val[1].unshift val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 331
+module_eval <<'.,.,', 'lib/mof/parser.y', 314
   def _reduce_80( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 333
+module_eval <<'.,.,', 'lib/mof/parser.y', 316
   def _reduce_81( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 344
+module_eval <<'.,.,', 'lib/mof/parser.y', 327
   def _reduce_82( val, _values, result )
  if val[3]
 	      type = CIM::Array.new val[3], val[1]
@@ -1129,21 +1112,21 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 344
 
  # reduce 88 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 364
+module_eval <<'.,.,', 'lib/mof/parser.y', 347
   def _reduce_89( val, _values, result )
  raise "Default parameter value not allowed in syntax style '{@style}'" unless @style == :wmi
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 369
+module_eval <<'.,.,', 'lib/mof/parser.y', 352
   def _reduce_90( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 374
+module_eval <<'.,.,', 'lib/mof/parser.y', 357
   def _reduce_91( val, _values, result )
  result = -1
    result
@@ -1156,7 +1139,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 374
 
  # reduce 94 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 385
+module_eval <<'.,.,', 'lib/mof/parser.y', 368
   def _reduce_95( val, _values, result )
  result = val[1]
    result
@@ -1169,7 +1152,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 385
 
  # reduce 98 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 396
+module_eval <<'.,.,', 'lib/mof/parser.y', 379
   def _reduce_99( val, _values, result )
  result = val[1]
    result
@@ -1178,14 +1161,14 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 396
 
  # reduce 100 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 402
+module_eval <<'.,.,', 'lib/mof/parser.y', 385
   def _reduce_101( val, _values, result )
  result = [ val[0] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 404
+module_eval <<'.,.,', 'lib/mof/parser.y', 387
   def _reduce_102( val, _values, result )
  result = val[0] << val[2]
    result
@@ -1204,7 +1187,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 404
 
  # reduce 108 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 415
+module_eval <<'.,.,', 'lib/mof/parser.y', 398
   def _reduce_109( val, _values, result )
  raise "Instance as property value not allowed in syntax style '{@style}'" unless @style == :wmi
    result
@@ -1223,7 +1206,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 415
 
  # reduce 115 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 429
+module_eval <<'.,.,', 'lib/mof/parser.y', 412
   def _reduce_116( val, _values, result )
  result = val[0] + val[1]
    result
@@ -1256,7 +1239,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 429
 
  # reduce 129 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 484
+module_eval <<'.,.,', 'lib/mof/parser.y', 467
   def _reduce_130( val, _values, result )
  result = CIM::QualifierDeclaration.new( val[1], val[2][0], val[2][1], val[3], val[4])
    result
@@ -1275,7 +1258,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 484
 
  # reduce 136 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 504
+module_eval <<'.,.,', 'lib/mof/parser.y', 487
   def _reduce_137( val, _values, result )
  type = val[2].nil? ? val[1] : CIM::Array.new(val[2],val[1])
 	    result = [ type, val[3] ]
@@ -1283,21 +1266,21 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 504
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 509
+module_eval <<'.,.,', 'lib/mof/parser.y', 492
   def _reduce_138( val, _values, result )
  result = CIM::QualifierScopes.new(val[3])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 514
+module_eval <<'.,.,', 'lib/mof/parser.y', 497
   def _reduce_139( val, _values, result )
  result = [ val[0] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 516
+module_eval <<'.,.,', 'lib/mof/parser.y', 499
   def _reduce_140( val, _values, result )
  result = val[0] << val[2]
    result
@@ -1324,21 +1307,21 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 516
 
  # reduce 150 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 534
+module_eval <<'.,.,', 'lib/mof/parser.y', 517
   def _reduce_151( val, _values, result )
  result = CIM::QualifierFlavors.new val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 539
+module_eval <<'.,.,', 'lib/mof/parser.y', 522
   def _reduce_152( val, _values, result )
  result = [ val[0] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 541
+module_eval <<'.,.,', 'lib/mof/parser.y', 524
   def _reduce_153( val, _values, result )
  result = val[0] << val[2]
    result
@@ -1355,7 +1338,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 541
 
  # reduce 158 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 565
+module_eval <<'.,.,', 'lib/mof/parser.y', 548
   def _reduce_159( val, _values, result )
  raise "Instance property '#{val[1]} must have a value" unless @style == :wmi
    result

data/lib/mof/parser.y

@@ -18,7 +18,7 @@ class MOF::Parser
 	DT_VOID
 	DT_UINT8 DT_SINT8 DT_UINT16 DT_SINT16 DT_UINT32 DT_SINT32
 	DT_UINT64 DT_SINT64 DT_REAL32 DT_REAL64 DT_CHAR16 DT_STR
-	DT_BOOL DT_DATETIME
+	DT_BOOLEAN DT_DATETIME
 	positiveDecimalValue
 	stringValue
 	realValue
@@ -108,25 +108,8 @@ rule
 	: qualifierList_opt CLASS className alias_opt superClass_opt "{" classFeatures "}" ";"
 	  { qualifiers = val[0]
 	    features = val[6]
-	    if qualifiers and qualifiers.include?(:association, :bool)
-	      # FIXME: 'association' must be first
-              # Context:
-	      #
-	      # The remaining qualifier list must not include
-	      # the ASSOCIATION qualifier again. If the
-	      # association has no super association, then at
-	      # least two references must be specified! The
-	      # ASSOCIATION qualifier may be omitted in
-	      # sub associations.
-	      result = CIM::Association.new(val[2],qualifiers,val[3],val[4],features)
-	    elsif qualifiers and qualifiers.include?(:indication, :bool)
-	      # FIXME: 'indication' must be first
-	      # FIXME: features must not include references
-	      result = CIM::Indication.new(val[2],qualifiers,val[3],val[4],features)
-	    else
-	      # FIXME: features must not include references
-	      result = CIM::Class.new(val[2],qualifiers,val[3],val[4],features)
-	    end
+	    # FIXME: features must not include references
+	    result = CIM::Class.new(val[2],qualifiers,val[3],val[4],features)
 	  }
         ;
 
@@ -169,9 +152,9 @@ rule
 	: qualifierName qualifierParameter_opt flavor_opt
 	  { # Get qualifier decl
 	    qualifier = case val[0]
-	      when CIM::Qualifier:            val[0].definition
-	      when CIM::QualifierDeclaration: val[0]
-	      when String:                    @qualifiers[val[0].downcase]
+	      when CIM::Qualifier then            val[0].definition
+	      when CIM::QualifierDeclaration then val[0]
+	      when String then                    @qualifiers[val[0].downcase]
 	    else
 	      nil
 	    end
@@ -179,7 +162,7 @@ rule
 	    value = val[1]
 	    raise MOF::Helper::Error.new(@name,@lineno,@line,"#{value.inspect} does not match qualifier type '#{qualifier.type}'") unless qualifier.type.matches?(value)||@style == :wmi
 	    # Don't propagate a boolean 'false'
-	    if qualifier.type == :bool && value == false
+	    if qualifier.type == :boolean && value == false
 	      result = nil
 	    else
 	      result = CIM::Qualifier.new(qualifier,value,val[2])
@@ -300,7 +283,7 @@ rule
 	| DT_REAL64
 	| DT_CHAR16
 	| DT_STR
-	| DT_BOOL
+	| DT_BOOLEAN
 	| DT_DATETIME
 	| DT_VOID
 	  { raise StyleError.new(@name,@lineno,@line,"'void' is not a valid datatype") unless @style == :wmi }
@@ -586,7 +569,7 @@ require File.join(File.dirname(__FILE__), 'helper')
 #  MOF::Parser.new options = {}
 #
 #  options -> Hash of options
-#    :debug -> bool
+#    :debug -> boolean
 #    :includes -> array of include dirs
 #    :style -> :cim or :wmi
 #
@@ -618,7 +601,7 @@ end
     options = { :namespace => "" }
     while argv.size > 0
       case opt = argv.shift
-      when "-h":
+      when "-h"
 	$stderr.puts "Ruby MOF compiler"
 	$stderr.puts "#{name} [-h] [-d] [-I <dir>] [<moffiles>]"
 	$stderr.puts "Compiles <moffile>"
@@ -632,10 +615,10 @@ end
 	$stderr.puts "\t-q  quiet"
 	$stderr.puts "\t<moffiles>  file(s) to read (else use $stdin)"
 	exit 0
-      when "-f": options[:force] = true
-      when "-s": options[:style] = argv.shift.to_sym
-      when "-d": options[:debug] = true
-      when "-q": options[:quiet] = true
+      when "-f" then options[:force] = true
+      when "-s" then options[:style] = argv.shift.to_sym
+      when "-d" then options[:debug] = true
+      when "-q" then options[:quiet] = true
       when "-I"
 	options[:includes] ||= []
 	dirname = argv.shift
@@ -644,9 +627,9 @@ end
 	  dirname = File.dirname(dirname)
 	end
 	options[:includes] << Pathname.new(dirname)
-      when "-n": options[:namespace] = argv.shift
-      when "-o": options[:output] = argv.shift
-      when /^-.+/:
+      when "-n" then options[:namespace] = argv.shift
+      when "-o" then options[:output] = argv.shift
+      when /^-.+/
 	$stderr.puts "Undefined option #{opt}"
       else
 	files << opt

data/lib/mof/scanner.rb

@@ -118,49 +118,49 @@ module Scanner
 
       when m = scanner.scan(%r{\w+})
 	case m.downcase
-	when "amended": @q.push [:AMENDED, m]
-	when "any": @q.push [:ANY, m]
-	when "as": @q.push [:AS, nil]
-	when "association": @q.push [:ASSOCIATION, m]
-	when "class": @q.push( [:CLASS, m] )
-	when "disableoverride": @q.push [:DISABLEOVERRIDE, m]
-	when "void": @q.push [:DT_VOID, CIM::Type.new(:void)]
-	when "boolean": @q.push [:DT_BOOL, CIM::Type.new(:bool)]
-	when "char16": @q.push [:DT_CHAR16, CIM::Type.new(m)]
-	when "datetime": @q.push [:DT_DATETIME, CIM::Type.new(m)]
-	when "real32": @q.push [:DT_REAL32, CIM::Type.new(m)]
-	when "real64": @q.push [:DT_REAL64, CIM::Type.new(m)]
-	when "sint16": @q.push [:DT_SINT16, CIM::Type.new(m)]
-	when "sint32": @q.push [:DT_SINT32, CIM::Type.new(m)]
-	when "sint64": @q.push [:DT_SINT64, CIM::Type.new(m)]
-	when "sint8": @q.push [:DT_SINT8, CIM::Type.new(m)]
-	when "string": @q.push [:DT_STR, CIM::Type.new(m)]
-	when "uint16": @q.push [:DT_UINT16, CIM::Type.new(m)]
-	when "uint32": @q.push [:DT_UINT32, CIM::Type.new(m)]
-	when "uint64": @q.push [:DT_UINT64, CIM::Type.new(m)]
-	when "uint8": @q.push [:DT_UINT8, CIM::Type.new(m)]
-	when "enableoverride": @q.push [:ENABLEOVERRIDE, m]
-	when "false": @q.push [:booleanValue, false]
-	when "flavor": @q.push [:FLAVOR, nil]
-	when "include": @q.push [:INCLUDE, nil]
-	when "indication": @q.push [:INDICATION, m]
-	when "instance": @q.push [:INSTANCE, m]
-	when "method": @q.push [:METHOD, m]
-	when "null": @q.push [:nullValue, CIM::Variant.new(:null,nil)]
-	when "of": @q.push [:OF, nil]
-	when "parameter": @q.push [:PARAMETER, m]
-	when "pragma": @q.push [:PRAGMA, nil]
-	when "property": @q.push [:PROPERTY, m]
-	when "qualifier": @q.push [:QUALIFIER, m]
-	when "ref": @q.push [:REF, nil]
-	when "reference": @q.push [:REFERENCE, m]
-	when "restricted": @q.push [:RESTRICTED, m]
-	when "schema": @q.push [:SCHEMA, m]
-	when "scope": @q.push [:SCOPE, nil]
-	when "toinstance": @q.push [:TOINSTANCE, m]
-	when "tosubclass": @q.push [:TOSUBCLASS, m]
-	when "translatable": @q.push [:TRANSLATABLE, m]
-	when "true": @q.push [:booleanValue, true]
+	when "amended" then @q.push [:AMENDED, m]
+	when "any" then @q.push [:ANY, m]
+	when "as" then @q.push [:AS, nil]
+	when "association" then @q.push [:ASSOCIATION, m]
+	when "class" then @q.push( [:CLASS, m] )
+	when "disableoverride" then @q.push [:DISABLEOVERRIDE, m]
+	when "void" then @q.push [:DT_VOID, CIM::Type.new(:void)]
+	when "boolean" then @q.push [:DT_BOOLEAN, CIM::Type.new(:boolean)]
+	when "char16" then @q.push [:DT_CHAR16, CIM::Type.new(m)]
+	when "datetime" then @q.push [:DT_DATETIME, CIM::Type.new(m)]
+	when "real32" then @q.push [:DT_REAL32, CIM::Type.new(m)]
+	when "real64" then @q.push [:DT_REAL64, CIM::Type.new(m)]
+	when "sint16" then @q.push [:DT_SINT16, CIM::Type.new(m)]
+	when "sint32" then @q.push [:DT_SINT32, CIM::Type.new(m)]
+	when "sint64" then @q.push [:DT_SINT64, CIM::Type.new(m)]
+	when "sint8" then @q.push [:DT_SINT8, CIM::Type.new(m)]
+	when "string" then @q.push [:DT_STR, CIM::Type.new(m)]
+	when "uint16" then @q.push [:DT_UINT16, CIM::Type.new(m)]
+	when "uint32" then @q.push [:DT_UINT32, CIM::Type.new(m)]
+	when "uint64" then @q.push [:DT_UINT64, CIM::Type.new(m)]
+	when "uint8" then @q.push [:DT_UINT8, CIM::Type.new(m)]
+	when "enableoverride" then @q.push [:ENABLEOVERRIDE, m]
+	when "false" then @q.push [:booleanValue, false]
+	when "flavor" then @q.push [:FLAVOR, nil]
+	when "include" then @q.push [:INCLUDE, nil]
+	when "indication" then @q.push [:INDICATION, m]
+	when "instance" then @q.push [:INSTANCE, m]
+	when "method" then @q.push [:METHOD, m]
+	when "null" then @q.push [:nullValue, CIM::Variant.new(:null,nil)]
+	when "of" then @q.push [:OF, nil]
+	when "parameter" then @q.push [:PARAMETER, m]
+	when "pragma" then @q.push [:PRAGMA, nil]
+	when "property" then @q.push [:PROPERTY, m]
+	when "qualifier" then @q.push [:QUALIFIER, m]
+	when "ref" then @q.push [:REF, nil]
+	when "reference" then @q.push [:REFERENCE, m]
+	when "restricted" then @q.push [:RESTRICTED, m]
+	when "schema" then @q.push [:SCHEMA, m]
+	when "scope" then @q.push [:SCOPE, nil]
+	when "toinstance" then @q.push [:TOINSTANCE, m]
+	when "tosubclass" then @q.push [:TOSUBCLASS, m]
+	when "translatable" then @q.push [:TRANSLATABLE, m]
+	when "true" then @q.push [:booleanValue, true]
 	else
 	  @q.push( [:IDENTIFIER, m] )
 	end # case m.downcase

data/lib/mof/version.rb

@@ -0,0 +1,3 @@
+module MOF
+  VERSION = '1.2.0'
+end

data/mof.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "mof"
+require "mof/version"
 
 Gem::Specification.new do |s|
   s.name        = "mof"
@@ -18,7 +18,10 @@ See http://www.dmtf.org/education/mof}
   s.rubyforge_project = "mof"
 
   # CIM metamodel
-  s.add_dependency("cim", ["~> 0.5"])
+  s.add_dependency("cim", ["~> 1.2"])
+
+  s.add_development_dependency('rake')
+  s.add_development_dependency('bundler')
 
   s.files         = `git ls-files`.split("\n") << "lib/mof/parser.rb"
   s.files.reject! { |fn| fn == '.gitignore' }

data/tasks/racc.rake

@@ -3,5 +3,6 @@ rule '.rb' => '.y' do |t|
 end
 
 task :test => [:racc]
+task :build => [:racc]
 
 task :racc => ["lib/mof/parser.rb"]

data/test/mof/class_qualifiers.mof

@@ -1,7 +1,12 @@
 qualifier Description : string,
   Scope(class);
+qualifier Indication : boolean,
+  Scope(class);
+qualifier Association : boolean,
+  Scope(class);
   
-[ Description("This is a class with a Description qualifier") ]
+[ Association, Indication, Description("This is a class with a Description qualifier") ]
 class MOF_Test : Parent_Class
 {
+  CIM_OperatingSystem REF GroupComponent;
 };

data/test/test_association_qualifier.rb

@@ -2,10 +2,10 @@ $d = File.expand_path(File.dirname(__FILE__))
 require "test/unit"
 require File.join($d,'..','lib','mof')
 
-class TestQualifiers < Test::Unit::TestCase
+class TestAssociationQualifiers < Test::Unit::TestCase
 
   def setup
-    @moffiles, @options = MOF::Parser.argv_handler "test_qualifier", ["association_qualifier.mof"]
+    @moffiles, @options = MOF::Parser.argv_handler "test_association_qualifier", ["association_qualifier.mof"]
     @options[:style] ||= :cim
     @options[:includes] ||= [ $d, File.join($d,"mof")]
 
@@ -24,7 +24,7 @@ class TestQualifiers < Test::Unit::TestCase
     assert_equal 1, res.qualifiers.size
     q = res.qualifiers.shift
     assert q.is_a? CIM::QualifierDeclaration
-    assert q.type == :bool
+    assert q.type == :boolean
     assert q.default == false
     # has one qualifier scopes
     assert_equal 1, q.scopes.size

data/test/test_class_qualifiers.rb

@@ -0,0 +1,29 @@
+$d = File.expand_path(File.dirname(__FILE__))
+require "test/unit"
+require File.join($d,'..','lib','mof')
+
+class TestClassQualifiers < Test::Unit::TestCase
+
+  def setup
+    @moffiles, @options = MOF::Parser.argv_handler "test_class_qualifier", ["class_qualifiers.mof"]
+    @options[:style] ||= :cim
+    @options[:includes] ||= [ $d, File.join($d,"mof")]
+
+    @parser = MOF::Parser.new @options
+  end
+  
+  def test_parse
+    result = @parser.parse @moffiles
+    assert result
+    # parsed one file
+    assert_equal 1, result.size
+
+    name,res = result.shift
+    assert !res.qualifiers.empty?
+    # parsed three qualifier
+    assert_equal 3, res.qualifiers.size
+    assert res.qualifiers.include? :association
+    assert res.qualifiers.include? :indication
+    assert res.qualifiers.include? :description
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mof
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
-  - 0
-  - 3
+  - 1
   - 2
-  version: 0.3.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Klaus K\xC3\xA4mpf"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +02:00
+date: 2012-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,13 +26,41 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
-        - 0
-        - 5
-        version: "0.5"
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: |-
   The Managed Object Format (MOF) language used to
   describe classes and instances of the Common Information Model (CIM).
@@ -45,7 +73,6 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- README.rdoc~
 - LICENSE
 files: 
 - Gemfile
@@ -61,6 +88,7 @@ files:
 - lib/mof/parser.y
 - lib/mof/result.rb
 - lib/mof/scanner.rb
+- lib/mof/version.rb
 - mof.gemspec
 - parser/doc/mof.bnf
 - tasks/clean.rake
@@ -77,10 +105,10 @@ files:
 - test/mof/simple.mof
 - test/test_array_initializer.rb
 - test/test_association_qualifier.rb
+- test/test_class_qualifiers.rb
 - test/test_loading.rb
 - test/test_qualifier.rb
 - lib/mof/parser.rb
-- README.rdoc~
 has_rdoc: true
 homepage: https://github.com/kkaempf/mof
 licenses: []
@@ -111,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mof
-rubygems_version: 1.5.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A pure Ruby parser for MOF (Managed Object Format) files
@@ -126,5 +154,6 @@ test_files:
 - test/mof/simple.mof
 - test/test_array_initializer.rb
 - test/test_association_qualifier.rb
+- test/test_class_qualifiers.rb
 - test/test_loading.rb
 - test/test_qualifier.rb

data/README.rdoc~

@@ -1,57 +0,0 @@
-= mof
-
-A parser for the Managed Object Format (MOF) language used to describe
-classes and instances of the Common Information Model (CIM)
-
-See http://www.dmtf.org/education/mof
-
-== FEATURES/PROBLEMS:
-
-* Uses Racc (Ruby Yacc) as parser generator
-* Provides class information as Ruby objects (using the 'cim' gem)
-* Can switch between DMTFs standard format and the one used in
-  Microsofts WMI implementation (http://msdn.microsoft.com/en-us/library/aa823192(VS.85).aspx)
-
-== SYNOPSIS:
-
-* A simple mof reader for validation of MOF files
-
-  require 'mof'
-  moffiles, options = Mofparser.argv_handler "moflint", ARGV
-  options[:style] ||= :cim;
-  options[:includes] ||= []
-  options[:includes].unshift(Pathname.new ".")
-  options[:includes].unshift(Pathname.new "/usr/share/mof/cim-current")
-  
-  moffiles.unshift "qualifiers.mof" unless moffiles.include? "qualifiers.mof"
-
-  parser = Mofparser.new options
-
-  begin
-    result = parser.parse moffiles
-  rescue Exception => e
-    parser.error_handler e
-    exit 1
-  end
-      
-  result.each do |name,res|
-  puts "/*=============== #{name} ===================*/\n"
-    puts res
-  end
-	  
-
-== REQUIREMENTS:
-
-* cim (http://rubygems.org/gems/cim)
-  
-== INSTALL:
-
-  gem install cim
-
-== LICENSE:
-
-(The Ruby License)
-
-Copyright (c) 2010 Klaus Kämpf <kkaempf@suse.de>
-
-See http://www.ruby-lang.org/en/LICENSE.txt for the full text