xlo 0.0.1.2 → 0.0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0006b3d5fb544c57f3a5e389cbbb0ddf9a1a233
-  data.tar.gz: 84d85fbb541be99e8d6a5622a829b2815b2ada07
+  metadata.gz: d00cebfb60d2fc43a0352b5459ece2ad2552ad8c
+  data.tar.gz: fc26cafa24e6c45efe222d45155e732f01e05ece
 SHA512:
-  metadata.gz: f538524342298e3ce361f35d99525b7e28025a57fd5e5e5a732342b62d3f7cfb7f8c52def397b13cb7062ac5e292dddf302725652249139f024122945380ea86
-  data.tar.gz: b753e93c2cbde0edcdd6fb3259c10bf3fcd81a8f03b79f5b19f983e63d86974e17ec4cee03498988593c7a2befa5f2cde2d38a726c610295998a31f53e730e7d
+  metadata.gz: 397058a1543886648f7db64835536e8a0698789c6236f5d04ac427b2c254958cc393ace3cee45be7c18827023378576884321c16ffc6dadab61a85b5a84d8cea
+  data.tar.gz: 9fb918377f7cb4680e56b30fa442a844da10ee9aabe160b50fffbcd268cee88d6e1121f2f2b377aedf130e16c617f1cf99e00d006027ac2a7961686aecd9d2e2

data/lib/xlo.rb

@@ -1,88 +1,100 @@
 require 'open3'
 
 class Xlo
+  attr_accessor :rnv, :xmllint, :csv
 
-  def self.rnv_wrapper (_rnc, _dir)
-    list = []
+  def initialize(_file)
+    @rnv = []
+    @xmllint = []
+    @csv = File.new(_file,"w+")
+    @csv << "type; error; freq; files \n"
+    @error = {}
+  end
+
+  def rnv_wrapper (_rnc, _dir)
     Dir[_dir + "/" + "*.xml"].each do |file|
       stdout = Open3.capture3("rnv #{_rnc} #{file}")
       stdout = stdout[1].split("\n")
       stdout.each do |line|
-          if (line.include?("error") && !line.include?("are invalid"))
-            list << line
-          end
+        @rnv << line
       end
     end
-    return list
   end
 
-  def self.rnv_error_dict (_list)
-    error = {}
-    _list.each do |el|
-      type = el.split("error")[1].split(" ")[1]
-      if (type == "attribute" || type == "element")
-        key =  type + "; " + el[/\^.*/][1..-1]
-        filename = File.basename(el.split("error")[0])
-        filename[filename.length - 2] = ""
-      else
-        type = "other"
-        key = type + "; " + el.split("error:")[1]
-        filename = File.basename(el.split("error")[0])
-        filename[filename.length - 2] = ""
-      end
-      if (error.has_key?(key))
-        error[key] <<  " || " + filename
-      else
-        error[key] = filename
+  def rnv_aggregate
+    @rnv.each do |el|
+      if (el.include?("error") && !el.include?("are invalid"))
+
+        type = el.split("error")[1].split(" ")[1]
+
+        if (type == "attribute" || type == "element")
+          key =  type + "; " + el[/\^.*/][1..-1]
+          filename = File.basename(el.split("error")[0])
+          filename[filename.length - 2] = ""
+        else
+          type = "other"
+          key = type + "; " + el.split("error:")[1]
+          filename = File.basename(el.split("error")[0])
+          filename[filename.length - 2] = ""
+        end
+
+        if (@error.has_key?(key))
+          @error[key] <<  " || " + filename
+        else
+          @error[key] = filename
+        end
+
       end
     end
-    return error
   end
 
-  def self.xmllint_wrapper (_dir)
-    list = []
+  def xmllint_wrapper (_dir)
     Dir[_dir + "/" + "*.xml"].each do |file|
       stdout = Open3.capture3("xmllint #{file}")
       stdout = stdout[1].split("\n")
       stdout.each do |line|
-        if (!line.include?("                 ^"))
-            list << line.chomp
-        end
+          @xmllint << line
       end
     end
+  end
 
-    error = {}
-    list = list.values_at(* list.each_index.select {|i| i.even?})
-    list.each do |el|
+  def xmllint_aggregate
+
+    @xmllint.delete_if {|el| el.include?("^")}
+    @xmllint.map { |e| e.chomp  }
+    @xmllint = @xmllint.values_at(* @xmllint.each_index.select {|i| i.even?})
+    @xmllint.each do |el|
       split_el = el.split(" ")
-      type = el[/element|attribute/]
+      type = el[/element|attribute|parser error/]
       key = type + ";" + el.split(":")[-1]
       filename =  File.basename(split_el[0])[0..-2]
-      if (error.has_key?(key))
-        error[key] <<  " || " + filename
+      if (@error.has_key?(key))
+        @error[key] <<  " || " + filename
       else
-        error[key] = filename
+        @error[key] = filename
       end
     end
-    return error
+  end
+
+  def csv_writer
+    @error.each do |entry|
+        line =  entry.dup
+        line[-1] = line[-1].split("||")[0..50].join
+        freq = entry[1].split("||").length
+        @csv.write(line.insert(1, freq.to_s).join(";")[0..-2] +  "\n" )
+      end
   end
 
   def self.main(_rnv_arg,_folder_arg)
 
-    error = []
-    f = File.new("error.csv",  "w+")
-    f.write("type; error; freq; files \n")
+    xlo = Xlo.new(File.new("error.csv",  "w+"))
 
-    list = self.rnv_wrapper(_rnv_arg, _folder_arg)
-    error << self.rnv_error_dict(list)
+    xlo.rnv_wrapper(_rnv_arg, _folder_arg)
+    xlo.rnv_aggregate
 
-    error << self.xmllint_wrapper(_folder_arg)
+    xlo.xmllint_wrapper(_folder_arg)
+    xlo.xmllint_aggregate
 
-    error.each do |dict|
-      dict.each do |entry|
-        freq = entry[1].split("||").length.to_s
-        f.write(entry.insert(1, freq).join("; ")[0..-2] +  "\n" )
-      end
-    end
+    xlo.csv_writer
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlo
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
 platform: ruby
 authors:
 - Simon Meoni