mof 0.3.0 → 0.3.2

data/lib/mof/result.rb

@@ -18,7 +18,8 @@ class Result
     s = ""
     if array.size > 0
       s << "\n// #{title} [#{array.size}]\n"
-      s << array.join("\n")
+      s << array.join(";\n")
+      s << ";"
     end
     s
   end

data/lib/mof/scanner.rb

@@ -118,12 +118,12 @@ module Scanner
 
       when m = scanner.scan(%r{\w+})
 	case m.downcase
-	when "amended": @q.push [:AMENDED, CIM::QualifierFlavors.new(m)]
+	when "amended": @q.push [:AMENDED, m]
 	when "any": @q.push [:ANY, m]
 	when "as": @q.push [:AS, nil]
-	when "association": @q.push [:ASSOCIATION, CIM::QualifierDeclaration.new(m.downcase)]
+	when "association": @q.push [:ASSOCIATION, m]
 	when "class": @q.push( [:CLASS, m] )
-	when "disableoverride": @q.push [:DISABLEOVERRIDE, CIM::QualifierFlavors.new(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)]
@@ -139,12 +139,12 @@ module Scanner
 	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, CIM::QualifierFlavors.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, CIM::QualifierDeclaration.new(m.downcase)]
-	when "instance": @q.push [:INSTANCE, m.to_sym]
+	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]
@@ -154,12 +154,12 @@ module Scanner
 	when "qualifier": @q.push [:QUALIFIER, m]
 	when "ref": @q.push [:REF, nil]
 	when "reference": @q.push [:REFERENCE, m]
-	when "restricted": @q.push [:RESTRICTED, CIM::QualifierFlavors.new(m)]
+	when "restricted": @q.push [:RESTRICTED, m]
 	when "schema": @q.push [:SCHEMA, m]
 	when "scope": @q.push [:SCOPE, nil]
-	when "toinstance": @q.push [:TOINSTANCE, CIM::QualifierFlavors.new(m)]
-	when "tosubclass": @q.push [:TOSUBCLASS, CIM::QualifierFlavors.new(m)]
-	when "translatable": @q.push [:TRANSLATABLE, CIM::QualifierFlavors.new(m)]
+	when "toinstance": @q.push [:TOINSTANCE, m]
+	when "tosubclass": @q.push [:TOSUBCLASS, m]
+	when "translatable": @q.push [:TRANSLATABLE, m]
 	when "true": @q.push [:booleanValue, true]
 	else
 	  @q.push( [:IDENTIFIER, m] )
@@ -167,7 +167,7 @@ module Scanner
       
       else
 	require File.join(File.dirname(__FILE__), 'helper')
-	raise ParseHelper::ScannerError.new( @name, @lineno, @line, scanner.rest ) unless scanner.rest.empty?
+	raise MOF::Helper::ScannerError.new( @name, @lineno, @line, scanner.rest ) unless scanner.rest.empty?
       end # case
     end # until scanner.eos?
 #    $stderr.puts "scan done, @q #{@q.size} entries"
@@ -198,8 +198,8 @@ module Scanner
   # stack_size, last_token, value_stack
   # stack[0] == Result
   def on_error token, token_value, value_stack
-    require File.join(File.dirname(__FILE__), 'parse_helper')
-    raise ParseHelper::ParserError.new @name,@lineno, @line, token,token_value,value_stack
+    require File.join(File.dirname(__FILE__), 'helper')
+    raise MOF::Helper::ParserError.new @name,@lineno, @line, token,token_value,value_stack
   end
 
 end # module Scanner

data/mof.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "mof"
+
+Gem::Specification.new do |s|
+  s.name        = "mof"
+  s.version     = MOF::VERSION
+
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Klaus Kämpf"]
+  s.email       = ["kkaempf@suse.de"]
+  s.homepage    = "https://github.com/kkaempf/mof"
+  s.summary     = %q{A pure Ruby parser for MOF (Managed Object Format) files}
+  s.description = %q{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}
+
+  s.rubyforge_project = "mof"
+
+  # CIM metamodel
+  s.add_dependency("cim", ["~> 0.5"])
+
+  s.files         = `git ls-files`.split("\n") << "lib/mof/parser.rb"
+  s.files.reject! { |fn| fn == '.gitignore' }
+  s.extra_rdoc_files    = Dir['README*', 'TODO*', 'CHANGELOG*', 'LICENSE']
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/parser/doc/mof.bnf

@@ -0,0 +1,208 @@
+//
+// Managed Object Format
+// BNF syntax as of CIM 2.2
+//
+
+mofSpecification = *mofProduction
+
+mofProduction = compilerDirective |
+
+classDeclaration |
+
+assocDeclaration |
+
+indicDeclaration |
+
+qualifierDeclaration |
+
+instanceDeclaration
+
+compilerDirective = PRAGMA pragmaName "(" pragmaParameter ")"
+
+pragmaName = IDENTIFIER
+
+pragmaParameter = stringValue
+
+classDeclaration = [ qualifierList ] CLASS className [ alias ] [ superClass ] "{" *classFeature "}" ";"
+
+assocDeclaration = "[" ASSOCIATION *( "," qualifier ) "]" CLASS className [ alias ] [ superClass ] "{" *associationFeature "}" ";"
+
+
+// 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.
+
+indicDeclaration = "[" INDICATION *( "," qualifier ) "]" CLASS className [ alias ] [ superClass ] "{" *classFeature "}" ";"
+
+className = schemaName "_" IDENTIFIER // NO whitespace !
+
+// Context:
+
+// Schema name must not include "_" !
+
+alias = AS aliasIdentifer
+
+aliasIdentifer = "$" IDENTIFIER // NO whitespace !
+
+superClass = ":" className
+
+classFeature = propertyDeclaration | methodDeclaration
+
+associationFeature = classFeature | referenceDeclaration
+
+qualifierList = "[" qualifier *( "," qualifier ) "]"
+
+qualifier = qualifierName [ qualifierParameter ] [ ":" 1*flavor ]
+
+qualifierParameter = "(" constantValue ")" | arrayInitializer
+
+flavor = ENABLEOVERRIDE | DISABLEOVERRIDE | RESTRICTED | TOSUBCLASS | TRANSLATABLE
+
+propertyDeclaration = [ qualifierList ] dataType propertyName [ array ] [ defaultValue ] ";"
+
+referenceDeclaration = [ qualifierList ] objectRef referenceName [ defaultValue ] ";"
+
+methodDeclaration = [ qualifierList ] dataType methodName "(" [ parameterList ] ")" ";"
+
+propertyName = IDENTIFIER
+
+referenceName = IDENTIFIER
+
+methodName = IDENTIFIER
+
+dataType = 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
+
+objectRef = className REF
+
+parameterList = parameter *( "," parameter )
+
+parameter = [ qualifierList ] (dataType|objectRef) parameterName [ array ]
+parameterName = IDENTIFIER
+
+array = "[" [positiveDecimalValue] "]"
+
+positiveDecimalValue = positiveDecimalDigit *decimalDigit
+
+defaultValue = "=" initializer
+
+initializer = ConstantValue | arrayInitializer | referenceInitializer
+
+arrayInitializer = "{" constantValue*( "," constantValue)"}"
+
+constantValue = integerValue | realValue | charValue | stringValue | booleanValue | nullValue
+
+integerValue = binaryValue | octalValue | decimalValue | hexValue
+
+referenceInitializer = objectHandle | aliasIdentifier
+
+objectHandle = """ [ namespaceHandle ":" ] modelPath """
+
+namespaceHandle = *ucs2Character
+// Note: structure depends on type of namespace
+
+modelPath = className "." keyValuePairList
+
+keyValuePairList = keyValuePair *( "," keyValuePair )
+
+keyValuePair = ( propertyname | referenceName ) "=" initializer
+
+qualifierDeclaration = QUALIFIER qualifierName qualifierType scope [ defaultFlavor ] ";"
+
+qualifierName = IDENTIFIER
+
+qualifierType = ":" dataType [ array ] [ defaultValue ]
+
+scope = "," SCOPE "(" metaElement *( "," metaElement ) ")"
+
+metaElement = SCHEMA | CLASS | ASSOCIATION | INDICATION | QUALIFIER PROPERTY | REFERENCE | METHOD | PARAMETER | ANY
+
+defaultFlavor = "," FLAVOR "(" flavor *( "," flavor ) ")"
+
+instanceDeclaration = [ qualifierList ] INSTANCE OF className [ alias ] "{" 1*valueInitializer "}" ";"
+
+valueInitializer = [ qualifierList ]
+
+( propertyName | referenceName ) "=" initializer ";"
+These productions do not allow whitespace between the terms:
+schemaName = IDENTIFIER
+
+// Context:
+
+// Schema name must not include "_" !
+fileName = stringValue
+
+binaryValue = [ "+" | "-" ] 1*binaryDigit ( "b" | "B" )
+
+binaryDigit = "0" | "1"
+
+octalValue = [ "+" | "-" ] "0" 1*octalDigit
+
+octalDigit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7"
+
+decimalValue = [ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" )
+
+decimalDigit = "0" | positiveDecimalDigit
+
+positiveDecimalDigit = "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
+
+hexValue = [ "+" | "-" ] ( "0x" | "0X" ) 1*hexDigit
+
+hexDigit = decimalDigit | "a" | "A" | "b" | "B" | "c" | "C" | "d" | "D" | "e" | "E" | "f" | "F"
+
+realValue = [ "+" | "-" ] *decimalDigit "." 1*decimalDigit [ ( "e" | "E" ) [ "+" | "-" ] 1*decimalDigit ]
+
+charValue = // any single-quoted Unicode-character, except
+// single quotes
+
+stringValue = 1*( """ *ucs2Character """ )
+
+ucs2Character = // any valid UCS-2-character
+
+booleanValue = TRUE | FALSE
+
+nullValue = NULL
+The remaining productions are case-insensitive keywords:
+ANY = "any"
+AS = "as"
+ASSOCIATION = "association"
+CLASS = "class"
+DISABLEOVERRIDE = "disableOverride"
+DT_BOOL = "boolean"
+DT_CHAR16 = "char16"
+DT_DATETIME = "datetime"
+DT_REAL32 = "real32"
+DT_REAL64 = "real64"
+DT_SINT16 = "sint16"
+DT_SINT32 = "sint32"
+DT_SINT64 = "sint64"
+DT_SINT8 = "sint8"
+DT_STR = "string"
+DT_UINT16 = "uint16"
+DT_UINT32 = "uint32"
+DT_UINT64 = "uint64"
+DT_UINT8 = "uint8"
+ENABLEOVERRIDE = "enableoverride"
+FALSE = "false"
+FLAVOR = "flavor"
+INDICATION = "indication"
+INSTANCE = "instance"
+METHOD = "method"
+NULL = "null"
+OF = "of"
+PARAMETER = "parameter"
+PRAGMA = "#pragma"
+PROPERTY = "property"
+QUALIFIER = "qualifier"
+REF = "ref"
+REFERENCE = "reference"
+RESTRICTED = "restricted"
+SCHEMA = "schema"
+SCOPE = "scope"
+TOSUBCLASS = "tosubclass"
+TRANSLATABLE = "translatable"
+TRUE = "true"

data/tasks/clean.rake

@@ -0,0 +1,2 @@
+require 'rake/clean'
+CLEAN.include("**/*~", "Gemfile.lock", "doc", ".yardoc", "pkg", "lib/mof/parser.rb", "lib/mof/parser.output")

data/tasks/doc.rake

@@ -0,0 +1,14 @@
+begin
+ require 'yard'
+  YARD::Rake::YardocTask.new(:doc) do |t|
+    t.files   = ['lib/**/*.rb']
+    t.options = ['--no-private']
+  end
+rescue LoadError
+  STDERR.puts "Install yard if you want prettier docs"
+  require 'rdoc/task'
+  Rake::RDocTask.new(:doc) do |rdoc|
+    rdoc.rdoc_dir = "doc"
+    rdoc.title = "dm-keeper-adapter #{CIM::VERSION}"
+  end
+end

data/tasks/racc.rake

@@ -0,0 +1,7 @@
+rule '.rb' => '.y' do |t|
+   sh "racc -g -v -o #{t.name} #{t.source}"
+end
+
+task :test => [:racc]
+
+task :racc => ["lib/mof/parser.rb"]

data/tasks/test.rake

@@ -0,0 +1,6 @@
+Rake::TestTask.new do |t|
+  t.libs << File.expand_path('../test', __FILE__)
+  t.libs << File.expand_path('../', __FILE__)
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end

data/test/mof/array_initializer.mof

@@ -0,0 +1,8 @@
+qualifier Array : string[],
+  Scope(property);
+  
+class MOF_Test : Parent_Class
+{
+  [ Array { "One", "Two", "Three" } ]
+  string text;
+};

data/test/mof/association_qualifier.mof

@@ -0,0 +1,4 @@
+// association qualifier declaration
+Qualifier Association : boolean = false, 
+  Scope(association), 
+  Flavor(DisableOverride, ToSubclass);

data/test/mof/class_qualifier_fail.mof

@@ -0,0 +1,4 @@
+[ Description("This should fail with: 'Description' is not a valid qualifier") ]
+class MOF_Test : Parent_Class
+{
+};

data/test/mof/class_qualifiers.mof

@@ -0,0 +1,7 @@
+qualifier Description : string,
+  Scope(class);
+  
+[ Description("This is a class with a Description qualifier") ]
+class MOF_Test : Parent_Class
+{
+};

data/test/mof/derived.mof

@@ -0,0 +1,3 @@
+class MOF_Test : Parent_Class
+{
+};

data/test/mof/property_qualifier.mof

@@ -0,0 +1,8 @@
+qualifier Description : string,
+  Scope(property);
+  
+class MOF_Test : Parent_Class
+{
+  [ Description("This is a property with a Description qualifier") ]
+  string text;
+};

data/test/mof/qualifier.mof

@@ -0,0 +1,3 @@
+// simple qualifier declaration
+qualifier Description : string,
+  Scope(class, property);

data/test/mof/simple.mof

@@ -0,0 +1,2 @@
+class MOF_Test {
+};

data/test/test_array_initializer.rb

@@ -0,0 +1,39 @@
+D = File.expand_path(File.dirname(__FILE__))
+require "test/unit"
+require File.join(D,'..','lib','mof')
+
+class TestQualifiers < Test::Unit::TestCase
+
+  def setup
+    @moffiles, @options = MOF::Parser.argv_handler "test_qualifier", ["array_initializer.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
+    name,res = result.shift
+    # parsed one class
+    assert_equal 1, res.classes.size
+    c = res.classes.shift
+    assert c.is_a? CIM::Class
+    assert_equal "MOF_Test", c.name
+    assert_equal "Parent_Class", c.superclass
+    # one (property) feature
+    assert_equal 1, c.features.size
+    c.features.each do |f|
+      next unless f.is_a? CIM::Property
+      assert f.property?
+      assert !f.method?
+      assert_equal "text", f.name
+      assert f.type == :string
+      assert_equal 1, f.qualifiers.size
+      q = f.qualifiers.shift
+      assert_equal "Array", q.name
+      assert q.type == :array
+    end
+  end
+end