mof 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe1284fb2d2885dd0f87153123d47cff1c8b265
-  data.tar.gz: dd360dfb8e6cd215a3cc2767a6f82b22e6c9f383
+  metadata.gz: 77676d72b9224fef64132ec8719756c5dc06d3f5
+  data.tar.gz: 04c859dfa4695654f2b0d7b02da2bde43eab8226
 SHA512:
-  metadata.gz: c29ac3254428dd367ff9a86cd79715efd003030f845791725531bbbde0a282dba64f3f30f75f35ad4b1e82294f8759b3b8199f8a9ebd5e802ed68e265d810056
-  data.tar.gz: b994b00fca19bd9ad0eb41da1184a14a976b67db3e3f8348c752b72037d33cdac9a88f9dfe8aeb755e34217237c68410e12d69f88b8ee91480759e1039a503c4
+  metadata.gz: 19bdf1e78f80808b701352e7d1fa2f76c68ef0a531ef6712161223a5b3835ad5e5a526f76529266d3808efc797e7966e355656fb00a2d052225e5d1c233024b2
+  data.tar.gz: f812a418f9bbcb1407303c5dad055f9cb3c567c1be69756290bb82cac6c7bf1968987861f0a7310c2336a08f8c80142d734f6a51ed68766c0dfa1f3474706ac3

data/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    mof (1.2.4)
+      cim (~> 1.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    cim (1.4.2)
+    racc (1.4.12)
+    rake (10.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  mof!
+  racc
+  rake

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.5 2015-08-12
+
+* Assume ISO-8859-1 encoding if UTF-8 fails (Ethan J. Brown)
+* Add rake task to re-build parser.rb from parser.y (Ethan J. Brown)
+
 === 1.2.4 2015-04-14
 
 * Allow to re-use scanner (after old stream close)

data/Rakefile

@@ -4,3 +4,4 @@ require 'rake/testtask'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 task :default => [:test]
+task :build => [:racc]

data/lib/mof/helper.rb

@@ -80,6 +80,11 @@ module Helper
     elsif bom == "\377\376"
       @iconv = "UTF-16LE"
       $/ = "\r\0\n\0"
+    elsif ! has_valid_utf8(@name)
+      $stderr.puts "#{name} contains invalid UTF-8, treating as ISO-8859-1"
+      @iconv = "ISO-8859-1"
+      @file.rewind
+      $/ = "\n"
     else
       @file.rewind
       @iconv = nil
@@ -87,7 +92,23 @@ module Helper
     end
     @style = :wmi if @iconv
     #  $stderr.puts "$/(#{$/.split('').inspect})"
-    
+
+  end
+
+  def has_valid_utf8 name
+    valid = true
+
+    begin
+      # throws on invalid byte sequences such as 0x91 / 0x92 (smartquotes)
+      # and 0xAE (copyright) that may be present in Microsoft ISO-8859-1 MOFs
+      File.open(name, 'r:UTF-8', &:read).split('') << ''
+    rescue => e
+      if e.class == ArgumentError && e.message == 'invalid byte sequence in UTF-8'
+        valid = false
+      end
+    end
+
+    valid
   end
   
   #----------------------------------------------------------

data/lib/mof/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
+# This file is automatically generated by Racc 1.4.12
 # from Racc grammer file "".
 #
 
@@ -102,92 +102,92 @@ include Scanner
 ##### State transition tables begin ###
 
 racc_action_table = [
-    13,   197,   163,   172,   191,   192,   174,    17,   145,   146,
-   147,   180,   181,   172,    11,   173,   174,   173,   148,    11,
-   144,   149,   150,   151,   152,    18,   163,   173,   209,   153,
-   106,   107,   108,   109,   110,   112,   111,   199,    29,    31,
-   174,    55,    57,    68,    69,    71,    72,    52,    53,    54,
-    56,   163,     7,    40,   124,    42,    42,     7,    10,    10,
-   164,   102,    10,    35,    10,    55,    57,    68,    69,    71,
-    72,    52,    53,    54,    56,    51,    63,   126,   -77,    42,
-   127,    62,    10,    10,   190,   102,    51,    15,    16,   189,
+    13,   172,   163,   197,   174,    27,    63,    17,   145,   146,
+   147,    62,    28,   172,    11,   173,   174,   173,   148,    11,
+   144,   149,   150,   151,   152,    18,   163,   173,    33,   153,
+   106,   107,   108,   109,   110,   112,   111,    40,    15,    16,
+    42,    55,    57,    68,    69,    71,    72,    52,    53,    54,
+    56,   163,     7,   199,    35,    42,   174,     7,    10,    10,
+   115,   102,   114,    36,    10,    55,    57,    68,    69,    71,
+    72,    52,    53,    54,    56,    51,   190,    44,   -77,    42,
+    33,   189,    10,    10,    33,   102,    51,   164,    60,    10,
     55,    57,    68,    69,    71,    72,    52,    53,    54,    56,
-   115,   121,   114,    21,    42,    22,    23,    10,    95,    96,
-   102,    35,   129,   130,    55,    57,    25,   170,    24,    10,
-    52,    53,    54,    56,   131,    55,    57,    35,   133,   135,
-    10,    52,    53,    54,    56,    93,    79,    80,    81,    82,
+   170,    35,    10,    21,    42,    22,    23,    10,    29,    31,
+   102,    35,    95,    96,    55,    57,    25,    65,    24,    78,
+    52,    53,    54,    56,    97,    55,    57,    35,   180,   181,
+   100,    52,    53,    54,    56,    93,    79,    80,    81,    82,
     83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
    -25,    93,    79,    80,    81,    82,    83,    84,    85,    86,
-    87,    88,    89,    90,    91,    92,   141,    35,   154,    60,
+    87,    88,    89,    90,    91,    92,   191,   192,   102,    60,
     55,    57,    68,    69,    71,    72,    52,    53,    54,    56,
-   145,   146,   147,   172,   119,   118,   174,    10,    33,    33,
-   148,    18,   144,   149,   150,   151,   152,   173,    35,   184,
-   185,   153,    55,    57,    68,    69,    71,    72,    52,    53,
+   145,   146,   147,   172,   113,    97,   174,    10,    18,   118,
+   148,   119,   144,   149,   150,   151,   152,   173,   121,   124,
+    35,   153,    55,    57,    68,    69,    71,    72,    52,    53,
     54,    56,   106,   107,   108,   109,   110,   112,   111,    10,
     55,    57,    68,    69,    71,    72,    52,    53,    54,    56,
-    21,    44,    22,    23,    97,   113,    21,    10,    22,    23,
-    78,   194,    36,    25,    97,    24,   200,    35,    33,    25,
-    60,    24,    93,    79,    80,    81,    82,    83,    84,    85,
+    21,   126,    22,    23,   127,   129,    21,    10,    22,    23,
+   130,   131,   133,    25,   135,    24,    10,   141,   154,    25,
+    35,    24,    93,    79,    80,    81,    82,    83,    84,    85,
     86,    87,    88,    89,    90,    91,    92,   106,   107,   108,
-   109,   110,   112,   111,   121,   207,   -59,   121,    65,   211,
-   135,   102,   135,   218,    28,   220,   221,    27,   226,   100,
+   109,   110,   112,   111,   184,   185,   194,   200,   121,   207,
+   -59,   121,   209,   211,   135,   135,   218,   220,   221,   226,
    228,   229,   231,    10,   121,   135 ]
 
 racc_action_check = [
-     1,   186,   189,   194,   178,   178,   194,     8,   131,   131,
-   131,   142,   142,   140,     0,   186,   140,   194,   131,     1,
-   131,   131,   131,   131,   131,     8,   211,   140,   201,   131,
-    65,    65,    65,    65,    65,    65,    65,   187,    15,    15,
-   187,   189,   189,   189,   189,   189,   189,   189,   189,   189,
-   189,   135,     0,    20,    98,   189,    20,     1,   189,     0,
-   137,   189,   137,   100,     1,   211,   211,   211,   211,   211,
-   211,   211,   211,   211,   211,    33,    37,   102,   207,   211,
-   103,    37,   211,   207,   177,   211,    96,     7,     7,   177,
-   135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-    75,    94,    75,    10,   135,    10,    10,   135,    47,    47,
-   135,   169,   116,   118,    33,    33,    10,   138,    10,   138,
-    33,    33,    33,    33,   119,    96,    96,   216,   121,   122,
-   127,    96,    96,    96,    96,   169,   169,   169,   169,   169,
+     1,   140,   135,   186,   140,    12,    37,     8,   131,   131,
+   131,    37,    13,   194,     0,   140,   194,   186,   131,     1,
+   131,   131,   131,   131,   131,     8,   189,   194,    16,   131,
+    65,    65,    65,    65,    65,    65,    65,    20,     7,     7,
+    20,   135,   135,   135,   135,   135,   135,   135,   135,   135,
+   135,   211,     0,   187,    17,   135,   187,     1,   135,     0,
+    75,   135,    75,    18,     1,   189,   189,   189,   189,   189,
+   189,   189,   189,   189,   189,    33,   177,    26,   207,   189,
+    29,   177,   189,   207,    30,   189,    96,   137,    34,   137,
+   211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
+   138,    36,   138,    10,   211,    10,    10,   211,    15,    15,
+   211,   169,    47,    47,    33,    33,    10,    38,    10,    43,
+    33,    33,    33,    33,    49,    96,    96,   216,   142,   142,
+    58,    96,    96,    96,    96,   169,   169,   169,   169,   169,
    169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
     42,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-   216,   216,   216,   216,   216,   216,   130,    36,   132,    34,
+   216,   216,   216,   216,   216,   216,   178,   178,    60,    61,
     42,    42,    42,    42,    42,    42,    42,    42,    42,    42,
-   181,   181,   181,   218,    78,    77,   218,    42,    30,    29,
-   181,    74,   181,   181,   181,   181,   181,   218,   161,   162,
-   164,   181,   115,   115,   115,   115,   115,   115,   115,   115,
-   115,   115,   141,   141,   141,   141,   141,   141,   141,   115,
-    40,    40,    40,    40,    40,    40,    40,    40,    40,    40,
-    63,    26,    63,    63,    70,    66,    11,    40,    11,    11,
-    43,   183,    18,    63,    49,    63,   188,    17,    16,    11,
-    61,    11,    44,    44,    44,    44,    44,    44,    44,    44,
+   181,   181,   181,   218,    66,    70,   218,    42,    74,    77,
+   181,    78,   181,   181,   181,   181,   181,   218,    94,    98,
+   100,   181,    40,    40,    40,    40,    40,    40,    40,    40,
+    40,    40,   141,   141,   141,   141,   141,   141,   141,    40,
+   115,   115,   115,   115,   115,   115,   115,   115,   115,   115,
+    11,   102,    11,    11,   103,   116,    63,   115,    63,    63,
+   118,   119,   121,    11,   122,    11,   127,   130,   132,    63,
+   161,    63,    44,    44,    44,    44,    44,    44,    44,    44,
     44,    44,    44,    44,    44,    44,    44,   192,   192,   192,
-   192,   192,   192,   192,   195,   196,   197,   198,    38,   205,
-   206,    60,   208,   210,    13,   212,   213,    12,   217,    58,
+   192,   192,   192,   192,   162,   164,   183,   188,   195,   196,
+   197,   198,   201,   205,   206,   208,   210,   212,   213,   217,
    221,   222,   223,   229,   230,   233 ]
 
 racc_action_pointer = [
-    -5,     0,   nil,   nil,   nil,   nil,   nil,    81,    -2,   nil,
-    95,   228,   224,   284,   nil,    31,   190,   239,   211,   nil,
-    -5,   nil,   nil,   nil,   nil,   nil,   165,   nil,   nil,   131,
-   130,   nil,   nil,    67,   141,   nil,   159,    16,   212,   nil,
-   173,   nil,   123,   180,   220,   nil,   nil,    49,   nil,   196,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   223,   nil,
-   214,   222,   nil,   222,   nil,    18,   176,   nil,   nil,   nil,
-   186,   nil,   nil,   nil,   164,    40,   nil,   125,   164,   nil,
+    -5,     0,   nil,   nil,   nil,   nil,   nil,    32,    -2,   nil,
+    95,   222,   -58,    12,   nil,   101,   -30,    46,    32,   nil,
+   -21,   nil,   nil,   nil,   nil,   nil,    11,   nil,   nil,    22,
+    26,   nil,   nil,    67,    60,   nil,    93,   -54,    51,   nil,
+   155,   nil,   123,    59,   220,   nil,   nil,    53,   nil,    76,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    64,   nil,
+   101,   141,   nil,   228,   nil,    18,   125,   nil,   nil,   nil,
+   137,   nil,   nil,   nil,   161,     0,   nil,   129,   171,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    37,   nil,    78,   nil,    -7,   nil,
-    55,   nil,    69,    19,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   155,    49,   nil,    87,    66,
-   nil,    81,    61,   nil,   nil,   nil,   nil,    66,   nil,   nil,
-   108,    -1,   103,   nil,   nil,    43,   nil,    -2,    55,   nil,
-     5,   200,   -48,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   134,   nil,    78,   nil,   138,   nil,
+   192,   nil,   223,   173,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   173,   172,   nil,   214,   183,
+   nil,   195,   176,   nil,   nil,   nil,   nil,   182,   nil,   nil,
+   189,    -1,   183,   nil,   nil,    -6,   nil,    25,    38,   nil,
+    -7,   200,    69,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   190,   133,   nil,   137,   nil,   nil,   nil,   nil,   103,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,   -55,   nil,
-   nil,   171,   nil,   172,   nil,   nil,    -7,    29,   217,    -6,
-   nil,   nil,   255,   nil,    -5,   210,   217,   218,   213,   nil,
-   nil,   -35,   nil,   nil,   nil,   211,   212,    19,   214,   nil,
-   223,    18,   222,   227,   nil,   nil,   119,   225,   175,   nil,
+   nil,   242,   208,   nil,   212,   nil,   nil,   nil,   nil,   103,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,   107,   nil,
+   nil,   171,   nil,   207,   nil,   nil,    -5,    45,   248,    18,
+   nil,   nil,   255,   nil,     5,   214,   221,   222,   217,   nil,
+   nil,   219,   nil,   nil,   nil,   215,   216,    19,   217,   nil,
+   226,    43,   224,   229,   nil,   nil,   119,   226,   175,   nil,
    nil,   227,   231,   284,   nil,   nil,   nil,   nil,   nil,   229,
    230,   nil,   nil,   227,   nil,   nil ]
 
@@ -220,12 +220,12 @@ racc_action_default = [
 racc_goto_table = [
      8,     8,    34,    94,   122,   105,   136,   155,    48,    66,
     49,    76,    50,    19,   143,   187,    58,   204,   215,    32,
-   139,    61,     2,    14,    12,    12,    75,    38,    39,    26,
-    41,   171,    45,    46,    99,   101,    37,   195,   168,   167,
-   232,   227,   166,   103,   198,   196,   213,   214,   165,   222,
-   223,   230,   234,   235,   132,   137,    64,    98,   182,   203,
-    47,   201,   225,   210,   193,   177,   104,    43,    77,   116,
-   117,   123,   142,    49,    30,    50,   178,   138,     1,   nil,
+   139,    61,     2,    14,    12,    12,     1,    30,    47,    98,
+   137,   171,    45,    46,   165,   166,   167,   168,    37,    26,
+   232,   227,    38,   103,    64,    39,    41,    99,   101,   195,
+   198,   196,   213,   214,   222,   223,   230,   234,   235,   132,
+    75,   201,   225,   182,   193,   203,   104,   210,   177,    43,
+    77,   123,   116,    49,   117,    50,   142,   178,   138,   nil,
    nil,   179,   nil,   219,   128,   125,   nil,   nil,   nil,   nil,
    212,   nil,   217,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   206,   nil,   nil,   208,   nil,
@@ -245,12 +245,12 @@ racc_goto_table = [
 racc_goto_check = [
     13,    13,    14,    35,    37,    28,    38,    52,    10,    30,
     11,    30,    12,    23,    69,    39,    15,    61,    44,     7,
-    72,    14,     2,     2,    55,    55,    54,    26,    29,    25,
-    31,    72,     7,     7,    33,    34,    24,    36,    21,    20,
-    44,    61,    19,    15,    40,    41,    42,    43,    18,    45,
-    46,    47,    48,    50,    51,    17,    27,    16,    58,    60,
-     9,    52,    39,    62,    69,    63,    23,    64,    65,    66,
-    67,    10,    68,    11,     8,    12,    70,    71,     1,   nil,
+    72,    14,     2,     2,    55,    55,     1,     8,     9,    16,
+    17,    72,     7,     7,    18,    19,    20,    21,    24,    25,
+    44,    61,    26,    15,    27,    29,    31,    33,    34,    36,
+    40,    41,    42,    43,    45,    46,    47,    48,    50,    51,
+    54,    52,    39,    58,    69,    60,    23,    62,    63,    64,
+    65,    10,    66,    11,    67,    12,    68,    70,    71,   nil,
    nil,    28,   nil,    52,    30,    14,   nil,   nil,   nil,   nil,
     38,   nil,    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,    37,   nil,   nil,    37,   nil,
@@ -268,14 +268,14 @@ racc_goto_check = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13 ]
 
 racc_goto_pointer = [
-   nil,    78,    22,   nil,   nil,   nil,   nil,     3,    59,    27,
-   -25,   -23,   -21,     0,   -15,   -18,    -1,   -69,   -89,   -95,
-   -98,   -99,   nil,     3,    17,    18,     7,    18,   -60,     8,
-   -31,    10,   nil,   -24,   -25,   -41,  -149,   -90,  -116,  -154,
-  -143,  -141,  -161,  -160,  -189,  -166,  -166,  -172,  -181,   nil,
-  -180,   -67,  -128,   nil,   -16,    24,   nil,   nil,  -103,   nil,
-  -135,  -177,  -141,   -75,    41,    25,    -8,    -7,   -59,  -117,
-   -65,   -50,  -107 ]
+   nil,    26,    22,   nil,   nil,   nil,   nil,     3,    12,    -5,
+   -25,   -23,   -21,     0,   -15,   -18,   -29,   -94,  -103,  -102,
+  -101,  -100,   nil,     3,    19,    28,    22,     6,   -60,    25,
+   -31,    26,   nil,   -11,   -12,   -41,  -137,   -90,  -116,  -154,
+  -137,  -135,  -155,  -154,  -189,  -161,  -161,  -167,  -176,   nil,
+  -175,   -62,  -128,   nil,    18,    24,   nil,   nil,   -98,   nil,
+  -129,  -177,  -137,   -72,    43,    27,    -5,    -3,   -55,  -117,
+   -64,   -49,  -107 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     3,     4,     5,     6,   nil,   nil,   nil,

data/lib/mof/scanner.rb

@@ -45,7 +45,7 @@ module Scanner
 #    $stderr.puts "fill_queue(#{@line.split('').inspect})"
     @line.chomp!  # remove $/
     if @iconv
-      if String.method_defined? encode
+      if String.method_defined? 'encode'
         @line = @line.encode( "ISO-8859-1", @iconv )
       else
         @line = Iconv.conv( "ISO-8859-1", @iconv, @line )

data/lib/mof/version.rb

@@ -1,3 +1,3 @@
 module MOF
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

data/mof.gemspec

@@ -22,6 +22,7 @@ See http://www.dmtf.org/education/mof}
 
   s.add_development_dependency('rake')
   s.add_development_dependency('bundler')
+  s.add_development_dependency('racc')
 
   s.files         = `git ls-files`.split("\n") << "lib/mof/parser.rb"
   s.files.reject! { |fn| fn == '.gitignore' }

data/tasks/racc.rake

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

data/tasks/test.rake

@@ -4,3 +4,5 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/test*.rb']
   t.verbose = true
 end
+
+task :test => [:racc]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mof
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cim
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   The Managed Object Format (MOF) language used to
   describe classes and instances of the Common Information Model (CIM).
@@ -66,6 +80,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - README.rdoc