icersplicer 1.0.7 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19e22f059ad62dc8dd6c4f43be341eb14e5f3a3
-  data.tar.gz: a3acc16cb4123dd98c4d76d16efd587309111a15
+  metadata.gz: 1ed0550a22c725c9d54bf723d1f708844022d9bc
+  data.tar.gz: 8b295dd653c3d6eedcb2bcd741d97814ac7aeb3b
 SHA512:
-  metadata.gz: 9f0058e6fefe6ac373d03d256d0020856f53ab323883f19e7712ea72bd1130d719e70fb9a57ae853684a86a4b46e1726808ea0fdee06ab7b8ebd0273e0386311
-  data.tar.gz: e50323c24f03be0cd75c66a152c9c8b653ad76dd65878784a8fb59b748e4486d38dcc5b59e5820746d4d6fd77d38cf08ffc1b2091fbadbafb09bb4f1b5ee78f1
+  metadata.gz: 1ea2903a7adda3b0824898589d2545252c708bec1b3ca2d6221ee0ecd60bcac320b81a003e491bd07b5844808225ad5bcc1a5649953977fbfbe433c851ce86c8
+  data.tar.gz: 7511032048d26a6c8deea2f7598e875b08da4082c37ce74a61001258a6730b42ff28833567c0451fe0904489d1406b01e6d8e1aeccdc017fb5fe601a69d3d443

data/bin/icersplicer

@@ -95,18 +95,18 @@ opts.each do |opt, arg|
 
 Features:
 
-  Syntax highlighting / On / Off
-  Head /Tail functionality
-  Tail follow like tail -f
-  Support for multiple input for files / wildcards
-  Ability to Skip lines and line ranges and blank lines
-  Quiet mode for exporting large files
-  Countlines in a file
-  Grep functionality
-  Search & Replace in a file
-  Turn off line numbers
-  Debugging mode
-  Turn off line numbers
+      Syntax highlighting / On / Off
+      Head /Tail functionality
+      Tail follow like tail -f
+      Support for multiple input for files / wildcards
+      Ability to Skip lines and line ranges and blank lines
+      Quiet mode for exporting large files
+      Countlines in a file
+      Grep functionality
+      Search & Replace in a file
+      Turn off line numbers
+      Debugging mode
+      Turn off line numbers
   
 Example:
       
@@ -278,13 +278,13 @@ begin
           }
         }
       }
-  rescue
-    raise NoMethodError, "Please specify a valid filename or wildcard file extension"
+  rescue NoMethodError
+    raise LoadError, "Please specify a valid filename or wildcard file extension"
   end
 rescue Errno::EPIPE, IOError
   raise IOError, "Closing session due to broken pipe"
 end
-ice.closefile
+ice.close
 unless instance_variable_defined?("@nostats")
   ice.filterlinestats(filterlines)
   ice.stats(inputfile, outputfile)

data/examples/keywords-ruby.ice

@@ -20,12 +20,13 @@ include##colour=cyan
 public##colour=cyan
 private##colour=cyan
 protected##colour=cyan
-unless##colour=purple
-case##colour=purple
-when##colour=purple
+unless##colour=magenta
+while##colour=magenta
+case##colour=magenta
+when##colour=magenta
 do##colour=yellow
-if##colour=purple
-else##colour=purple
+if##colour=magenta
+else##colour=magenta
 puts##colour=blue
 print##colour=blue
 each##colour=green
@@ -34,7 +35,7 @@ gsub##colour=cyan
 strip##colour=cyan
 split##colour=cyan
 rand##colour=yellow
-and##colour=yellow
+ and ##colour=yellow
 raise##colour=yellow
 trap##colour=blue
 new##colour=cyan
@@ -43,6 +44,9 @@ nil##colour=cyan
 .write##colour=cyan
 .close##colour=cyan
 .update##colour=cyan
+.glob##colour=cyan
+.upto##colour=cyan
+.downto##colour=cyan
 ::##colour=white
 @##colour=yellow
 ||=##colour=white
@@ -50,6 +54,24 @@ nil##colour=cyan
 -=##colour=white
 +=##colour=white
 =##colour=white
-{##colour=white
-}##colour=white
-exit##colour=purple
+{##colour=red
+}##colour=red
+exit##colour=magenta
+INSERT##colour=green
+INTO##colour=green
+UPDATE##colour=green
+DELETE##colour=green
+FROM##colour=green
+GROUP##colour=green
+BY##colour=green
+ORDER##colour=green
+LIMIT##colour=green
+OFFSET##colour=green
+SELECT##colour=green
+FROM##colour=green
+WHERE##colour=green
+VALUES##colour=green
+AND##colour=green
+OR##colour=green
+NOT##colour=green
+IN##colour=green

data/examples/keywords.ice

@@ -1,11 +1,26 @@
-INSERT##colour=purple
-INTO##colour=purple
-VALUES##colour=purple
+INSERT##colour=magenta
+INTO##colour=magenta
+VALUES##colour=magenta
 CREATE TABLE##colour=red
 CREATE SCHEMA##colour=red
+ALTER SEQUENCE##colour=red
+CREATE SEQUENCE##colour=red
+CREATE USER##colour=red
+ALTER USER##colour=red
+COPY##colour=magenta
 SET SCHEMA##colour=yellow
 DROP TABLE##colour=red
 DROP SCHEMA##colour=red
+IGNORE##colour=red
+IF##colour=red
+EXISTS##colour=red
+CONSTRAINT##colour=magenta
+PRIMARY KEY##colour=magenta
+FOREIGN KEY##colour=magenta
+ALTER TABLE##colour=red
+REFERENCES##colour=magenta
+ADD##colour=red
+COMMIT##colour=cyan
 char
 integer
 varchar
@@ -13,8 +28,3 @@ 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

@@ -9,7 +9,40 @@
 #
 ########################################################################
 require 'file-tail'
+require 'rainbow'
 
+module OutputFile
+
+    @@fileopen = 0
+    
+    def open(outputfile)
+      begin
+        puts "Openfile: #{outputfile}" if @debug >= 1
+        @export = File.open("#{outputfile}", 'w')
+      rescue Errno::EACCES
+        raise IOError, "Can't create file please check file / directory permissions"
+      end
+    end
+
+    def write(data)
+      @export.write(data)
+    end
+
+    def close
+      begin
+        @export.close
+        puts "Closing file"
+      rescue NoMethodError
+      end
+    end
+
+    def processdata(data, outputfile, quietmode)
+      open(outputfile) if @@fileopen == 0
+      write(data)
+      @@fileopen += 1
+    end
+    
+end
 
 module Icersplicer
 
@@ -17,17 +50,18 @@ module Icersplicer
   
     attr_writer :nohighlighter, :skip_lines, :keywordsfile, :debug, :nolinenumbers
     
-    COLOURS = {"black" => 0,
-               "red" => 1, 
-               "green" => 2, 
-               "yellow" => 3, 
-               "blue" => 4,
-               "purple" => 5,
-               "cyan" => 6,
-               "white" => 7}
+    include OutputFile
+    
+    COLOURS = {0 => "black",
+               1 => "red", 
+               2 => "green", 
+               3 => "yellow", 
+               4 => "blue",
+               5 => "purple",
+               6 => "cyan",
+               7 => "white"}
 
     def initialize
-      @fileopen = 0
       @keywordsfile = "keywords.ice"
       @debug = 0
       @nolinenumbers = false
@@ -83,23 +117,22 @@ module Icersplicer
       keys ||= load_keywords("#{@keywordsfile}")
       unless keys.class == Hash
         keys = {0 => "Ln:", 
-                 1 => "SELECT", 
-                 2 => "CREATE TABLE", 
-                 3 => "UPDATE", 
-                 4 => "DELETE", 
-                 5 => "INSERT"}
+                1 => "SELECT", 
+                2 => "CREATE TABLE", 
+                3 => "UPDATE", 
+                4 => "DELETE", 
+                5 => "INSERT"}
       end
       cpicker = [2,3,4,1,7,5,6] # Just a selection of colours
       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")
+          name = COLOURS[rand(COLOURS.size - 1)]
+          text.gsub!("#{n[1]}", Rainbow.new.wrap("#{n[1]}").send(name.to_sym))
         else
-          name = n[1].split("##")[1].split("=")[1]; puts "Name: #{name}" if @debug >= 3
-          cnum = COLOURS[name].to_i; puts "Colour Number: #{cnum}" if @debug >= 3
           nval = n[1].split("##")[0]; puts "Value: #{nval}" if @debug >= 3
-          text.gsub!("#{nval}", "\e[4;3#{cnum}m#{nval}\e[0m\ \e[0;32m")
+          name = n[1].split("##")[1].split("=")[1]; puts "Value: #{name}" if @debug >= 3
+          text.gsub!("#{nval}", Rainbow.new.wrap("#{nval}").send(name.to_sym))
         end
-        text.gsub!(" \e[0;32m", "\e[0;32m")
       }
       return text
     end
@@ -157,39 +190,12 @@ module Icersplicer
     end
 
     def print_to_screen(linenum, text, quiet)
-      unless @nolinenumbers == true
-        print "\e[1;33mLn: #{linenum}:\e[0m\ "
+      unless @nolinenumbers == true or quiet == true
+        print Rainbow.new.wrap("Ln: #{linenum}:").yellow
       end
       print "#{text}" unless quiet == true
     end
 
-    def openfile(outputfile)
-      begin
-        puts "Openfile: #{outputfile}" if @debug >= 1
-        @export = File.open("#{outputfile}", 'w')
-      rescue Errno::EACCES
-        raise IOError, "Can't create file please check file / directory permissions"
-      end
-    end
-
-    def writefile(data)
-      @export.write(data)
-    end
-
-    def closefile
-      begin
-        @export.close
-        puts "Closing file"
-      rescue NoMethodError
-      end
-    end
-
-    def processdata(data, outputfile, quietmode)
-      openfile(outputfile) if @fileopen == 0
-      writefile(data)
-      @fileopen += 1
-    end
-
     def stats(inputfile, outputfile)
       puts "Skip Lines #{@skip_lines}" if @debug >= 1
       print "Inputfile lines: "

data/lib/version.rb

@@ -3,8 +3,8 @@ module Icersplicer
 
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0 
-    TINY = 7 
+    MINOR = 1
+    TINY = 3
     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.7
+  version: 1.1.3
 platform: ruby
 authors:
 - Brian Hood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: walltime
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Text file manipulation similar to UNIX tools like cat / head / tail
 email: brianh6854@googlemail.com
 executables: