xlo 0.0.1.5 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cefed55ed2f5d48a08f379675b3e4d30effbe7d
-  data.tar.gz: 452cff1d495238cc4b7167048f9224b5bd9e7607
+  metadata.gz: 6093051b78a35019ac0deee5d6449e904ed31492
+  data.tar.gz: afbc066cc514e55264cf96cc94bed301f32ea750
 SHA512:
-  metadata.gz: 33c726287743a4304b4814382bea6b7f1d72b896a5a1d7a9c32ef9f8ef9d1e0a781345a7e67b1d287ca6b0c16f215ab6eec8dbf8c6b30e37d7f84ae780cd360e
-  data.tar.gz: 70fefa849e1a7ba9e1111d7c78eb579b043f9438124178a4c947997aeeb3e6dfc6579ce660de4443df931f8d924c9aaed00a4b3666e138a6eea25abb517ba514
+  metadata.gz: 61a42f4edc4bffab04157da99caed215ea573dda51d450d2ecfeec2f5b753ac3dd41f4a5d42ed1cbcdfd2e614d29e05bce6b06066b1314743dcda07d55c597b9
+  data.tar.gz: a392d6dfdcd481cbac3c6261c0b2947b8b4fe8803f69f55cd9214562b828a4dac440ba7069e581c687a3c5588bc0ea33a0f3a5cd24cd4f84ff46726aad634d3c

data/README.md

@@ -10,7 +10,7 @@ XLO is a rnv/xmllint wrapper who captures the error generate by this validators
 1. `gem install xlo`
 2. `apt-get install rnv`
 3. `apt-get install xmllint`
-4. `xlo rnc-schema xml-folder`
+4. `xlo start rnc-schema xml-folder`
 
 ## Note
  the code contains several functions who could be use to like a ruby api

data/lib/xlo.rb

@@ -1,28 +1,38 @@
+require 'os'
 require 'open3'
 
 class Xlo
   attr_accessor :rnv, :xmllint, :csv
 
-  def initialize(_file)
+  def initialize(*args)
     @rnv = []
     @xmllint = []
-    @csv = File.new(_file,"w+")
-    @csv << "type; error; freq; files \n"
+
+    if args.size == 1
+      @csv = File.new(args[0],"w+")
+      @csv << "type; error; freq; files \n"
+    end
+
     @error = {}
+    @mutex = Mutex.new
   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|
-        @rnv << line
-      end
+  def get_error
+    return @error
+  end
+
+  def rnv_wrapper (_rnc, _file)
+    rnv = []
+    stdout = Open3.capture3("rnv #{_rnc} #{_file}")
+    stdout = stdout[1].split("\n")
+    stdout.each do |line|
+      rnv << line
     end
+    return rnv
   end
 
-  def rnv_aggregate
-    @rnv.each do |el|
+  def rnv_aggregate(_rnv)
+    _rnv.each do |el|
       if (el.include?("error") && !el.include?("are invalid"))
 
         type = el.split("error")[1].split(" ")[1]
@@ -37,64 +47,74 @@ class Xlo
           filename = File.basename(el.split("error")[0])
           filename[filename.length - 2] = ""
         end
-
-        if (@error.has_key?(key))
-          @error[key] <<  " || " + filename
-        else
-          @error[key] = filename
+        @mutex.synchronize do
+          if (@error.has_key?(key))
+            @error[key] <<  " || " + filename
+          else
+            @error[key] = filename
+          end
         end
-
       end
     end
   end
 
-  def xmllint_wrapper (_dir)
-    Dir[_dir + "/" + "*.xml"].each do |file|
-      stdout = Open3.capture3("xmllint #{file}")
-      stdout = stdout[1].split("\n")
-      stdout.each do |line|
-          @xmllint << line
-      end
+  def xmllint_wrapper (_file)
+    xmllint = []
+    stdout = Open3.capture3("xmllint #{_file}")
+    stdout = stdout[1].split("\n")
+    stdout.each do |line|
+      xmllint << line
     end
+    return xmllint
   end
 
-  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|
+  def xmllint_aggregate(_xmllint)
+    _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|parser error/]
       key = type + ";" + el.split(":")[-1]
       filename =  File.basename(split_el[0])[0..-2]
-      if (@error.has_key?(key))
-        @error[key] <<  " || " + filename
-      else
-        @error[key] = filename
+      @mutex.synchronize do
+        if (@error.has_key?(key))
+          @error[key] <<  " || " + filename
+        else
+          @error[key] = filename
+        end
       end
     end
   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
+      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)
-
-    xlo = Xlo.new(File.new("error.csv",  "w+"))
-
-    xlo.rnv_wrapper(_rnv_arg, _folder_arg)
-    xlo.rnv_aggregate
+  def run(_rnv_arg, _folder_arg, _pool_size = 1)
+    jobs = Queue.new
+    Dir[_folder_arg + "/" + "*.xml"].each {|f| jobs.push f}
 
-    xlo.xmllint_wrapper(_folder_arg)
-    xlo.xmllint_aggregate
+    workers = (_pool_size).times.map do
+      Thread.new do
+        while jobs.size != 0
+          file = jobs.pop
+          rnv_aggregate(rnv_wrapper(_rnv_arg,file))
+          xmllint_aggregate(xmllint_wrapper(file))
+        end
+      end
+    end
+    workers.map(&:join)
+  end
 
+  def self.main(_rnv_arg,_folder_arg)
+    xlo = Xlo.new("error.csv")
+    xlo.run(_rnv_arg, _folder_arg, OS.cpu_count)
     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.5
+  version: 0.0.2
 platform: ruby
 authors:
 - Simon Meoni
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.6
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement