icersplicer 1.0.0 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901e149dd77a8c15cc4af20745aa37551a79efd2
-  data.tar.gz: 20ae40614d6046d799bcedbf48b290590ec52816
+  metadata.gz: 828fde885629227694e9908fbc47fdf5c19fdb04
+  data.tar.gz: 7cddde3b73f6932e7b54a6f766ab3418bc2a6895
 SHA512:
-  metadata.gz: 2fc50ae99150351682ffc58541cea694719d482b9ed6b89375d96b49ccfec0b9d3abab4e5103295ad4501a38e4c3ad1acd77155d1d222c4ee274e0f8c636f1a9
-  data.tar.gz: 19f685820c5b6c8b64bb544dfb2fddb54abc0e5f1231d189221fffd7cf5cfc64d6e234c06e1a4c4456601776982361d0591d0faf19ccb4072f46a4156f819e14
+  metadata.gz: cd69d5421d3d4d20d1f77d7499339046192bc1ac8bb3f72b3bb773e0a0945d9da3973661693e1780b5e6328c0f556565bb65b4e5ff720b231565bc606a6622c5
+  data.tar.gz: 02808a1982b5022f9fdaf56c53e2cd8ce9147c8d4f49b37569f74e3a21bc70719052f7f92086babfa97bce6b9d807d984fda5527b5b51d5c2578d86a39d612fb

data/bin/icersplicer

@@ -17,6 +17,9 @@ require 'getoptlong'
 require 'walltime'
 require 'pp'
 
+require File.expand_path(File.join(
+          File.dirname(__FILE__),
+          "../lib/globutils.rb"))
 require File.expand_path(File.join(
           File.dirname(__FILE__),
           "../lib/icersplicer.rb"))
@@ -24,6 +27,7 @@ require File.expand_path(File.join(
           File.dirname(__FILE__),
           "../lib/version.rb"))
           
+include GlobUtils
 include Icersplicer
 
 trap("INT") {
@@ -199,9 +203,11 @@ if @countlines == true
 end
 
 inputfile.split(",").each {|f|
-  unless File.exist?("#{f}")
-    raise ArgumentError, "Input filename #{f} / location doesn't exist... ?"
-    exit
+  unless f =~ FILE_EXT_REGEXP
+    unless File.exist?("#{f}")
+      raise ArgumentError, "Input filename #{f} / location doesn't exist... ?"
+      exit
+    end
   end
 }
 
@@ -211,7 +217,13 @@ unless instance_variable_defined?("@nostats")
   timer.watch('start')
 end
 begin
-  inputfile.split(",").each {|f|
+  # Regular file / glob mask processor
+  filenames = joinfilenames(buildfilelist(inputfile))
+  # Iterator for file / file list
+  filenames.split(",").each {|f|
+    linecounter = 0
+    ice.reset_screen
+    puts "> Filename: #{f} <"
     File.open(f) {|n|
       n.each_line {|data|
         data_orig = data.clone

data/lib/globutils.rb

@@ -0,0 +1,69 @@
+require 'pp'
+
+module GlobUtils
+
+=begin
+
+Glob Example
+
+filenames = "/home/brian/Projects/icersplicer/bin/icersplicer,/home/brian/Projects/icersplicer/lib/version.rb,/home/brian/Projects/threatmonitor/*.rb,/home/brian/Projects/Walltime/*"
+files =  buildfilelist(filenames)
+
+=end
+
+  FILE_EXT_REGEXP = /\/*.([a-z]|[A-Z])+$/
+  FILE_WILDCARD_REGEXP = /\*.([a-z]|[A-Z])+$/
+  @@debug = 0
+
+  def glob(f)
+    puts "String end: #{f[f.size - 1]}" if @@debug == 1
+    unless f[f.size - 1] == "*"
+      files = Hash.new
+      globcounter = 0
+      fileext = f.split(".")[f.split(".").size - 1] # Extract Extension from string for example .rb
+      fileglob = f.gsub(FILE_EXT_REGEXP, "/**/*.#{fileext}").gsub("/*/", "/") # Match to find anything file extension / replace Glob using fileext
+      begin
+        # Send created glob into Dir.glob
+        Dir.glob(fileglob) {|n|
+          files.update({globcounter => n})
+          globcounter += 1
+        }
+      rescue 
+        raise ArgumentError, "Invalid Glob" 
+      end
+      return files
+    else
+      raise ArgumentError, "Please specify file extension for glob i.e *.html"
+    end
+  end
+
+  def joinfilenames(rollfiles)
+    filenames = String.new
+    rollfiles.each {|n|
+      filenames << "#{n[1]},"
+    }
+    filenames.gsub!(%r=,$=, "")
+  end
+  
+  def buildfilelist(inputfile)
+    rollfiles = Hash.new
+    rollcounter = 0
+    inputfile.split(",").each {|f|
+      puts "Filename: #{f}" if @@debug == 1
+      unless f =~ FILE_WILDCARD_REGEXP
+        rollfiles.update({rollcounter => f})
+        rollcounter += 1
+        puts "Regular File" if @@debug == 1
+      else
+        puts "Glob File Mask" if @@debug == 1
+        g = glob(f)
+        g.each {|n|
+          rollfiles.update({rollcounter => n[1]})
+          rollcounter += 1
+        }
+      end
+    }
+    return rollfiles
+  end
+
+end

data/lib/icersplicer.rb

@@ -10,6 +10,7 @@
 ########################################################################
 require 'file-tail'
 
+
 module Icersplicer
 
   class FileProcessor
@@ -79,9 +80,9 @@ module Icersplicer
     end
 
     def text_highlighter(text)
-      @keys ||= load_keywords("#{@keywordsfile}")
-      unless @keys.class == Hash
-        @keys = {0 => "Ln:", 
+      keys ||= load_keywords("#{@keywordsfile}")
+      unless keys.class == Hash
+        keys = {0 => "Ln:", 
                  1 => "SELECT", 
                  2 => "CREATE TABLE", 
                  3 => "UPDATE", 
@@ -89,7 +90,7 @@ module Icersplicer
                  5 => "INSERT"}
       end
       cpicker = [2,3,4,1,7,5,6] # Just a selection of colours
-      @keys.each {|n|
+      keys.each {|n|
         if n[1].split("##")[1] == nil
           text.gsub!("#{n[1]}", "\e[4;3#{cpicker[rand(cpicker.size)]}m#{n[1]}\e[0m\ \e[0;32m")
         else
@@ -122,20 +123,20 @@ module Icersplicer
       skip_lines = Hash.new
       skipcounter = 0
       filter.to_s.split(",").each {|n| 
-          skip_lines.update({skipcounter => n.to_i}) 
-          # Allow line ranges 
-          min = n.split("-")[0].to_i
-          max = n.split("-")[1].to_i
-          puts "Min: #{min} Max: #{max}" if @debug >= 2
-          unless n.split("-")[1] == nil
-            if min > max
-              raise RangeError, "Range Error: Minimun value can't be more than Maxiumun Range value"              
-            end
-            min.upto(max) {|s|
-              skip_lines.update({skipcounter => s}) unless skip_lines[skip_lines.size - 1] == s
-              skipcounter += 1
-            }
+        skip_lines.update({skipcounter => n.to_i}) 
+        # Allow line ranges 
+        min = n.split("-")[0].to_i
+        max = n.split("-")[1].to_i
+        puts "Min: #{min} Max: #{max}" if @debug >= 2
+        unless n.split("-")[1] == nil
+          if min > max
+            raise RangeError, "Range Error: Minimun value can't be more than Maxiumun Range value"              
           end
+          min.upto(max) {|s|
+            skip_lines.update({skipcounter => s}) unless skip_lines[skip_lines.size - 1] == s
+            skipcounter += 1
+          }
+        end
         skipcounter += 1
       }
       return skip_lines

data/lib/version.rb

@@ -4,8 +4,8 @@ module Icersplicer
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0 
-    TINY = 0
-    CODENAME = "Ice Fox!"
+    TINY = 6
+    CODENAME = "Icey Blizzard!"
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icersplicer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.6
 platform: ruby
 authors:
 - Brian Hood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: walltime
@@ -50,6 +50,7 @@ files:
 - examples/files/voc_dump.sql
 - examples/keywords-ruby.ice
 - examples/keywords.ice
+- lib/globutils.rb
 - lib/icersplicer.rb
 - lib/version.rb
 homepage: https://github.com/puppetpies/icersplicer