icersplicer 0.2.8 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2beec4f35e822f4c6c37e651aa607cb1f5f8538
-  data.tar.gz: 90fa44bb5f71d6cb8f7fad991c000e740fa77131
+  metadata.gz: 79a6b544dd7773a013878c6e2ba86254a45dd389
+  data.tar.gz: 7acbff17920844192fb8a3f5d8e97be1a156d569
 SHA512:
-  metadata.gz: 75c499006d2fc912975ab8b6efb94e26070f61de04507838e671c5d4681d54b66f87c94a7238ce7c495906680266f3f8e2c031e0cbad6db18952389846e3e74d
-  data.tar.gz: 1cf7aa189a385d69717417f02d152d07392676f2b8260e8e41285c37ada82f14c39ada3af76780bb0400bceadadcdba07cdbc6ff3eeddf182b632ef43f4fc038
+  metadata.gz: 78d1cfaf9f36116a67727f820e49277f69590d40763df5cd2951f281e0c01ca51ea3a2007851a620877be6cab5250ced548f77f714ff5acfb717858a861be627
+  data.tar.gz: 2262de63b30956f95f8dc41bcfdc216d50cb6120c8fcf9fbd9f45358a2bd4a4e50e371df9f6c671fb378592b18e07061b8983be988b5d165740f82bd737d62c2

data/bin/icersplicer

@@ -34,7 +34,9 @@ opts = GetoptLong.new(
   [ '--skipblank', '-b', GetoptLong::NO_ARGUMENT ],
   [ '--quiet', '-q', GetoptLong::OPTIONAL_ARGUMENT],
   [ '--outputfile', '-o', GetoptLong::OPTIONAL_ARGUMENT],
-  [ '--countlines', '-c', GetoptLong::OPTIONAL_ARGUMENT]
+  [ '--countlines', '-c', GetoptLong::OPTIONAL_ARGUMENT],
+  [ '--grep', '-g', GetoptLong::REQUIRED_ARGUMENT],
+  [ '--nohighlighter', '-t', GetoptLong::NO_ARGUMENT ]
 )
 
 opts.each do |opt, arg|
@@ -42,21 +44,26 @@ opts.each do |opt, arg|
     when '--help'
       helper = "\e[1;34mWelcome to Icersplicer #{VERSION}\e[0m\ \n"
       helper << "\e[1;34m============================\e[0m\ \n"
-      helper << %q[
+      helper << %Q[
 -h, --help '-h':
    show help
 --lineoffset '-l' INTEGER
 --linelimit '-n' INTEGER
 --inputfile '-f' filename
 --skiplines '-s' LINE NUMBERS 3,5,6
---skipblank '-b' NO ARGUMENTS
+--skipblank '-b' NO ARGUMENTS ( Ommit blank lines )
 --quiet '-q' NO ARGUMENTS
 --outputfile '-o' filename
 --countlines '-c' Counts the lines of a file
+--grep '-g' Filter data
+--nohighlighter '-t' NO ARGUMENTS ( Turns off syntax hightlighting )
   
 Example:
       
-      icersplicer -f inputfile --lineoffset 0 --linelimit 10 -s 3,6,9 -o outputfile 
+      icersplicer -f inputfile --lineoffset 0 --linelimit 10 -s 3,6,9,10-15 -o outputfile
+      
+      TIPS: Create a custom keywords list in your #{Dir.home}/.icersplicer/keywords.ice
+      
 
 Written by Brian Hood
       ]
@@ -75,10 +82,27 @@ Written by Brian Hood
       puts "Outputfile: #{@outputfile}"
     when '--skiplines'
       @skip_lines = Array.new
-      arg.to_s.split(",").each {|n| @skip_lines << n.to_i }
+      arg.to_s.split(",").each {|n| 
+          @skip_lines << n.to_i
+          # Allow line ranges 
+          min = n.split("-")[0].to_i
+          max = n.split("-")[1].to_i
+          unless n.split("-")[1] == nil 
+            begin
+              if min > max and max != 0
+                return false
+              end
+            rescue
+              puts "Range Error: Minimun value can't be more than Maxiumun Range value"
+              exit
+            end
+            min.upto(max) {|s|
+              @skip_lines << s unless @skip_lines[@skip_lines.size - 1] == s
+            }
+          end
+      }
     when '--skipblank'
       @skipblank = "SKIP"
-      puts @skipblank
     when '--quiet'
       if arg == "true"
         @quiet_mode = true
@@ -87,6 +111,10 @@ Written by Brian Hood
       end
     when '--countlines'
       @countlines = true
+    when '--grep'
+      @grep = arg.to_s
+    when '--nohighlighter'
+      @nohighlighter = "OFF"
   end
 end
 
@@ -124,33 +152,49 @@ unless File.exist?("#{inputfile}")
   exit
 end
 
-File.open(inputfile) {|n|
-  n.each_line {|data|
-    data_orig = data.clone
-    unless lineoffset > increment_offset
-      unless linelimit == 0
-        unless increment_limit > linelimit
-          unless instance_variable_defined?("@skipblank") and data.strip  == ""
-            print_to_screen(linecounter, text_highlighter(data), quietmode) unless skip(linecounter)
-            if instance_variable_defined?("@outputfile")
-              processdata(data_orig, outputfile, quietmode) unless skip(linecounter)
+def text_processor(data)
+  unless instance_variable_defined?("@nohighlighter")
+    data = text_highlighter(data)
+    return data
+  else
+    return data
+  end
+end
+
+begin
+  File.open(inputfile) {|n|
+    n.each_line {|data|
+      data_orig = data.clone
+      unless lineoffset > increment_offset
+        unless linelimit == 0
+          unless increment_limit > linelimit
+            unless instance_variable_defined?("@skipblank") and data.strip  == ""
+              unless instance_variable_defined?("@grep") and data =~ %r=#{@grep}=
+                print_to_screen(linecounter, text_processor(data), quietmode) unless skip(linecounter)
+                if instance_variable_defined?("@outputfile")
+                  processdata(data_orig, outputfile, quietmode) unless skip(linecounter)
+                end
+              end
             end
           end
-        end
-      else
-        unless instance_variable_defined?("@skipblank") and data.strip == ""
-          print_to_screen(linecounter, text_highlighter(data), quietmode) unless skip(linecounter)
-          if instance_variable_defined?("@outputfile")
-            processdata(data_orig, outputfile, quietmode) unless skip(linecounter)
+        else
+          unless instance_variable_defined?("@skipblank") and data.strip == ""
+            unless instance_variable_defined?("@grep") and data =~ %r=#{@grep}=
+              print_to_screen(linecounter, text_processor(data), quietmode) unless skip(linecounter)
+              if instance_variable_defined?("@outputfile")
+                processdata(data_orig, outputfile, quietmode) unless skip(linecounter)
+              end
+            end
           end
         end
+        increment_limit += 1
       end
-      increment_limit += 1
-    end
-    increment_offset += 1
-    linecounter += 1
+      increment_offset += 1
+      linecounter += 1
+    }
   }
-}
-
+rescue Errno::EPIPE
+  puts "Closing session due to broken pipe"
+end
 closefile if instance_variable_defined?("@exp")
 stats(inputfile, outputfile)

data/examples/keywords.ice

@@ -0,0 +1,20 @@
+INSERT##colour=purple
+INTO##colour=purple
+VALUES##colour=purple
+CREATE TABLE##colour=red
+CREATE SCHEMA##colour=red
+SET SCHEMA##colour=yellow
+DROP TABLE##colour=red
+DROP SCHEMA##colour=red
+char
+integer
+varchar
+date
+boolean
+NOT NULL##colour=white
+NULL##colour=white
+(##colour=cyan
+)##colour=cyan
+);##colour=cyan
+true##colour=blue
+false##colour=yellow

data/lib/icersplicer.rb

@@ -12,28 +12,65 @@
 module Icersplicer
 
   module VERSION #:nodoc:
-
     MAJOR = 0
-    MINOR = 2
-    TINY = 8
-    CODENAME = "Icestorm !"
-
+    MINOR = 3
+    TINY = 6
+    CODENAME = "Ice Axe !"
     STRING = [MAJOR, MINOR, TINY].join('.')
-
   end
   
   @@nfile = 0
   @@exp = nil
+  @@keywordsfile = "keywords.ice"
+
+  COLOURS = {"black" => 0,
+             "red" => 1, 
+             "green" => 2, 
+             "yellow" => 3, 
+             "blue" => 4,
+             "purple" => 5,
+             "cyan" => 6,
+             "white" => 7}
+                
+  def load_keywords(file)
+    keys = Array.new
+    unless Dir.exists?("#{Dir.home}/.icersplicer")
+      Dir.mkdir("#{Dir.home}/.icersplicer")
+    end
+    if File.exists?("#{Dir.home}/.icersplicer/#{file}")
+      File.open("#{Dir.home}/.icersplicer/#{file}") {|n|
+        n.each_line {|l|
+          keys << l.strip unless l.strip == ""
+        }
+      }
+      return keys
+    else
+      return false
+    end
+  end
   
   def text_highlighter(text)
-    keys = ["Ln:", "SELECT", "CREATE TABLE", "UPDATE", "DELETE", "INSERT", "FROM", "OFFSET", "GROUP BY", "HAVING", "ORDER BY",
-            "ALTER USER", "ALTER TABLE", "COPY", "INTO", "VALUES", "DELIMITERS", "STDIN", "CREATE USER", "WITH", "USING",
-            "CREATE INDEX", "CONSTRAINT", "ALTER INDEX", "INTEGER", "CHAR", "CLOB", "VARCHAR", "STRING", "DEFAULT", "NULL", "NOT",
-            "RECORDS", "KEY", "PRIMARY", "FOREIGN", "BIGINT", "MERGE", "REMOTE", "DROP TABLE", "SET SCHEMA", "CREATE SCHEMA",
-            "ALTER SCHEMA", "ADD", "TABLE", "CREATE SEQUENCE", "ALTER SEQUENCE"]
+    keys = load_keywords("#{@@keywordsfile}")
+    if keys == false
+      keys = ["Ln:", "SELECT", "CREATE TABLE", "UPDATE", "DELETE", "INSERT", "FROM", "OFFSET", "GROUP BY", "HAVING", "ORDER BY",
+              "ALTER USER", "ALTER TABLE", "COPY", "INTO", "VALUES", "DELIMITERS", "STDIN", "CREATE USER", "WITH", "USING",
+              "CREATE INDEX", "CONSTRAINT", "ALTER INDEX", "INTEGER", "CHAR", "CLOB", "VARCHAR", "STRING", "DEFAULT", "NULL", "NOT",
+              "RECORDS", "KEY", "PRIMARY", "FOREIGN", "BIGINT", "MERGE", "REMOTE", "DROP TABLE", "SET SCHEMA", "CREATE SCHEMA",
+              "ALTER SCHEMA", "ADD", "TABLE", "CREATE SEQUENCE", "ALTER SEQUENCE"]
+    end
     cpicker = [2,3,4,1,7,5,6] # Just a selection of colours
     keys.each {|n|
-      text.gsub!("#{n}", "\e[4;3#{cpicker[rand(cpicker.size)]}m#{n}\e[0m\ \e[0;32m".strip)
+      if n.split("##")[1] == nil
+        text.gsub!("#{n}", "\e[4;3#{cpicker[rand(cpicker.size)]}m#{n}\e[0m\ \e[0;32m".strip)
+      else
+        name = n.split("##")[1].split("=")[1]
+        #puts "Colour: #{name} #{COLOURS[name]}"
+        cnum = COLOURS[name].to_i
+        #puts "NVal: #{n}"
+        nval = n.split("##")[0]
+        text.gsub!("#{nval}", "\e[4;3#{cnum}m#{nval}\e[0m\ \e[0;32m".strip)
+      end
+      text.gsub!(" \e[0;32m", "\e[0;32m")
     }
     return text
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icersplicer
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.6
 platform: ruby
 authors:
 - Brian Hood
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/icersplicer
+- examples/keywords.ice
 - lib/icersplicer.rb
 homepage: https://github.com/puppetpies/icersplicer
 licenses: