icersplicer 0.8.4 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bcc6bdd964101db8f7fe11ac53410d6b31fb8d1
-  data.tar.gz: 5b3726eef1d632772527722561f9b08981353b2c
+  metadata.gz: c79c144aea7b10ae25373863f07871e381b53baf
+  data.tar.gz: 135decaecbfe484b53fef4579e31b8a5477a01bc
 SHA512:
-  metadata.gz: 02b127c69b259952cf8de687d1ecf0a891f516e73a39332ef6166f7f6768e5d367c8bc676bdfb6e54fc6f62c654705001b157e01483c1ecef5569cd7e52a3716
-  data.tar.gz: 5a63de22a01e9f1f0a4f5fb886cf83dd0c2a8a387b5579a2e428b6afc90409b773ec0b36590e03ad4b62419c0e0585026f80562f9925d8222ab549b7364aea15
+  metadata.gz: 201632e6e5dcb26d1c80792a6bfb4a65d4109349622c915c533051ebb147400b68a25eddf4a741c4ee8c96b3312da905c66fbdcd72ffb89de857542c522527d6
+  data.tar.gz: 5e6b0a8962aaa87ccb6e9dcbf263b7dc88544b9c15f8fe3eb29378cfa4d70fdca0f76ac915494ad5d511138de3f697fcb31da443d49facbc82190e30bc05ce3d

data/bin/icersplicer

@@ -25,16 +25,18 @@ include Icersplicer
 
 trap("INT") {
   puts "Goodbye see you soon!"
-  reset_screen
+  ice.reset_screen
   exit
 }
 
 VERSION = Icersplicer::VERSION::STRING
+ice = FileProcessor.new
 
 ARGV[0] = "--help" if ARGV[0] == nil
 
 opts = GetoptLong.new(
   [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+  [ '--keywordsfile', '-k', GetoptLong::REQUIRED_ARGUMENT],
   [ '--lineoffset', '-l', GetoptLong::OPTIONAL_ARGUMENT],
   [ '--linelimit', '-n', GetoptLong::REQUIRED_ARGUMENT],
   [ '--head', '-3', GetoptLong::REQUIRED_ARGUMENT],
@@ -52,6 +54,7 @@ opts = GetoptLong.new(
   [ '--search', '-1', GetoptLong::REQUIRED_ARGUMENT],
   [ '--replace', '-2', GetoptLong::REQUIRED_ARGUMENT],
   [ '--nostats', '-6', GetoptLong::NO_ARGUMENT ],
+  [ '--debug', '-d', GetoptLong::REQUIRED_ARGUMENT ]
 )
 
 opts.each do |opt, arg|
@@ -61,7 +64,9 @@ opts.each do |opt, arg|
       helper << "\e[1;34m============================\e[0m\ \n"
       helper << %Q[
 -h, --help '-h':
-   show help
+   show help, )
+--keywordsfile '-k' STRING ( Syntax Highlighting Keywords file see examples )
+  Full path not required just keywords-ruby.ice just place it in .icersplicer
 --lineoffset '-l' INTEGER
 --linelimit '-n' INTEGER
 --head '-3' INTEGER
@@ -74,10 +79,11 @@ opts.each do |opt, arg|
 --outputfile '-o' filename
 --countlines '-c' Counts the lines of a file
 --grep '-g' Filter data
---nohighlighter '-t' NO ARGUMENTS ( Turns off syntax hightlighting )
+--nohighlighter '-t' NO ARGUMENTS ( Turns off Syntax Hightlighting )
 --search '-1' Text to search for
 --replace '-2' Replacement string
 --nostats '-6' Don't process statistics before exit
+--debug '-d' Verbose debug for hacking on this project
 
 Example:
       
@@ -94,11 +100,13 @@ Written by Brian Hood
       ]
       puts helper
       exit
+    when '--keywordsfile'
+      ice.keywordsfile = arg.to_s
     when  /^--lineoffset|^--tail/
       if opt == "--lineoffset"
         @line_offset = arg.to_i
       else
-        count = countlines(@inputfile)
+        count = ice.countlines(@inputfile)
         @line_offset = count - arg.to_i
       end
     when /^--linelimit|^--head/
@@ -114,7 +122,7 @@ Written by Brian Hood
       @outputfile = arg.to_s
       puts "Outputfile: #{@outputfile}"
     when '--skiplines'
-      @skip_lines = skip_processor(arg)
+      ice.skip_lines = ice.skip_processor(arg)
     when '--skipblank'
       @skipblank = "SKIP"
     when '--quiet'
@@ -125,13 +133,15 @@ Written by Brian Hood
     when '--grep'
       @grep = arg.to_s
     when '--nohighlighter'
-      @nohighlighter = "OFF"
+      ice.nohighlighter = "OFF"
     when '--search'
       @search = arg.to_s
     when '--replace'
       @replace = arg.to_s
     when '--nostats'
       @nostats = "SKIP"
+    when '--debug'
+      ice.debug = arg.to_i
   end
 end
 
@@ -141,7 +151,7 @@ grep = @grep
 
 if instance_variable_defined?("@followtail")
   lines = @followtail
-  followtail(inputfile, lines)
+  ice.followtail(inputfile, lines)
 end
 
 if instance_variable_defined?("@search")
@@ -177,7 +187,7 @@ linecounter = 0
 quietmode = false | @quiet_mode
 
 if @countlines == true
-  countlines(inputfile)
+  ice.countlines(inputfile)
   exit
 end
 
@@ -204,10 +214,10 @@ begin
             unless instance_variable_defined?("@skipblank") and data_orig.strip  == ""
               if data_orig =~ /#{grep}/
                 filterlines += 1
-                print_to_screen(linecounter, text_processor(data), quietmode) unless skip(linecounter)
+                ice.print_to_screen(linecounter, ice.text_processor(data), quietmode) unless ice.skip(linecounter)
                 if instance_variable_defined?("@outputfile")
                   data_orig.gsub!("#{search}", "#{replace}")
-                  processdata(data_orig, outputfile, quietmode) unless skip(linecounter)
+                  ice.processdata(data_orig, outputfile, quietmode) unless ice.skip(linecounter)
                 end
               end
             end
@@ -216,10 +226,10 @@ begin
           unless instance_variable_defined?("@skipblank") and data_orig.strip == ""
             if data_orig =~ /#{grep}/
               filterlines += 1
-              print_to_screen(linecounter, text_processor(data), quietmode) unless skip(linecounter)
+              ice.print_to_screen(linecounter, ice.text_processor(data), quietmode) unless ice.skip(linecounter)
               if instance_variable_defined?("@outputfile")
                 data_orig.gsub!("#{search}", "#{replace}")
-                processdata(data_orig, outputfile, quietmode) unless skip(linecounter)
+                ice.processdata(data_orig, outputfile, quietmode) unless ice.skip(linecounter)
               end
             end
           end
@@ -233,11 +243,11 @@ begin
 rescue Errno::EPIPE, IOError
   raise IOError, "Closing session due to broken pipe"
 end
-closefile
+ice.closefile
 unless instance_variable_defined?("@nostats")
-  filterlinestats(filterlines)
-  stats(inputfile, outputfile)
+  ice.filterlinestats(filterlines)
+  ice.stats(inputfile, outputfile)
   timer.watch('stop')
   timer.print_stats
 end
-reset_screen
+ice.reset_screen

data/lib/icersplicer.rb

@@ -15,182 +15,195 @@ module Icersplicer
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY = 4
-    CODENAME = "Ice Seal !"
+    TINY = 9
+    CODENAME = "Icey Sea !"
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
+
+end
+
+module Icersplicer
+
+  class FileProcessor
   
-  @@nfile = 0
-  @@exp = nil
-  @@keywordsfile = "keywords.ice"
-  @@debug = false
-
-  COLOURS = {"black" => 0,
-             "red" => 1, 
-             "green" => 2, 
-             "yellow" => 3, 
-             "blue" => 4,
-             "purple" => 5,
-             "cyan" => 6,
-             "white" => 7}
-
-  def reset_screen
-    puts "\e[0m\ "
-  end
-  
-  def filterlinestats(filterlines)
-    puts "\nLines Displayed by Filter: #{filterlines}"
-  end
+    attr_writer :nohighlighter, :skip_lines, :keywordsfile, :debug
+    
+    COLOURS = {"black" => 0,
+              "red" => 1, 
+              "green" => 2, 
+              "yellow" => 3, 
+              "blue" => 4,
+              "purple" => 5,
+              "cyan" => 6,
+              "white" => 7}
+
+    def initialize
+      @fileopen = 0
+      @exp = nil
+      @keywordsfile = "keywords.ice"
+      @debug = 0
+    end
+    
+    def reset_screen
+      puts "\e[0m\ "
+    end
+    
+    def filterlinestats(filterlines)
+      puts "\nLines Displayed by Filter: #{filterlines}"
+    end
 
-  def followtail(filename, number)
-    File::Tail::Logfile.open(filename) do |log|
-      log.interval = 3
-      log.backward(10)
-      log.backward(number).tail { |line| puts line }
+    def followtail(filename, number)
+      File::Tail::Logfile.open(filename) do |log|
+        log.interval = 3
+        log.backward(10)
+        log.backward(number).tail { |line| puts line }
+      end
+      exit
     end
-    exit
-  end
 
-  def load_keywords(file)
-    keys = Hash.new
-    linenum = 0
-    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.update({linenum => "#{l.strip}"}) unless l.strip == ""
-          puts "L: #{l.strip}" if @@debug == true
-          linenum += 1
+    def load_keywords(file)
+      keys = Hash.new
+      linenum = 0
+      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.update({linenum => "#{l.strip}"}) unless l.strip == ""
+            puts "L: #{l.strip}" if @debug >= 1
+            linenum += 1
+          }
         }
-      }
-      return keys
-    else
-      return false
+        return keys
+      else
+        return false
+      end
     end
-  end
 
-  def text_processor(data)
-    unless instance_variable_defined?("@nohighlighter")
-      data = text_highlighter(data)
-      return data
-    else
-      return data
+    def text_processor(data)
+      unless @nohighlighter == "OFF"
+        data = text_highlighter(data)
+        return data
+      else
+        return data
+      end
     end
-  end
 
-  def text_highlighter(text)
-    @keys ||= load_keywords("#{@@keywordsfile}")
-    unless @keys.class == Hash
-      @keys = {0 => "Ln:", 
-               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")
-      else
-        name = n[1].split("##")[1].split("=")[1]; puts "Name: #{name}" if @@debug == true
-        cnum = COLOURS[name].to_i; puts "Colour Number: #{cnum}" if @@debug == true
-        nval = n[1].split("##")[0]; puts "Value: #{nval}" if @@debug == true
-        text.gsub!("#{nval}", "\e[4;3#{cnum}m#{nval}\e[0m\ \e[0;32m")
+    def text_highlighter(text)
+      @keys ||= load_keywords("#{@keywordsfile}")
+      unless @keys.class == Hash
+        @keys = {0 => "Ln:", 
+                 1 => "SELECT", 
+                 2 => "CREATE TABLE", 
+                 3 => "UPDATE", 
+                 4 => "DELETE", 
+                 5 => "INSERT"}
       end
-      text.gsub!(" \e[0;32m", "\e[0;32m")
-    }
-    return text
-  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")
+        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")
+        end
+        text.gsub!(" \e[0;32m", "\e[0;32m")
+      }
+      return text
+    end
 
-  def countlines(inputfile)
-    lines = 0
-    unless inputfile == nil
-      if File.exist?(inputfile)
-        File.open(inputfile) {|n|
-          n.each_line {
-            lines += 1
+    def countlines(inputfile)
+      lines = 0
+      unless inputfile == nil
+        if File.exist?(inputfile)
+          File.open(inputfile) {|n|
+            n.each_line {
+              lines += 1
+            }
           }
-        }
-        puts "Filename: #{inputfile} Total Line Count: #{lines}"
+          puts "Filename: #{inputfile} Total Line Count: #{lines}"
+        end
       end
+      return lines
     end
-    return lines
-  end
-  
-  def skip_processor(filter)
-    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 == true
-        unless n.split("-")[1] == nil
-          if min > max
-            raise RangeError, "Range Error: Minimun value can't be more than Maxiumun Range value"              
+    
+    def skip_processor(filter)
+      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
+            }
+          end
+        skipcounter += 1
+      }
+      return skip_lines
+    end
+    
+    def skip(line)
+      begin
+        if instance_variable_defined?("@skip_lines")
+          line_element = @skip_lines.key(line)
+          if line_element != nil
+            skiper = @skip_lines[line_element]
           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
-  end
-  
-  def skip(line)
-    begin
-      if instance_variable_defined?("@skip_lines")
-        line_element = @skip_lines.key(line)
-        if line_element != nil
-          skiper = @skip_lines[line_element]
         end
+      rescue NoMethodError
+        return nil
       end
-    rescue NoMethodError
-      return nil
+      return skiper
     end
-    return skiper
-  end
 
-  def print_to_screen(linenum, text, quiet)
-    puts "\e[1;33mLn: #{linenum}:\e[0m\ #{text}" unless quiet == true
-  end
+    def print_to_screen(linenum, text, quiet)
+      puts "\e[1;33mLn: #{linenum}:\e[0m\ #{text}" unless quiet == true
+    end
 
-  def openfile(outputfile)
-    begin
-      puts "Openfile: #{outputfile}"
-     @@exp = File.open("#{outputfile}", 'w')
-    rescue Errno::EACCES
-      raise IOError, "Can't create file please check file / directory permissions"
+    def openfile(outputfile)
+      begin
+        puts "Openfile: #{outputfile}" if @debug == true
+        @export = File.open("#{outputfile}", 'w')
+      rescue Errno::EACCES
+        raise IOError, "Can't create file please check file / directory permissions"
+      end
     end
-  end
 
-  def writefile(data)
-    @@exp.write(data)
-  end
+    def writefile(data)
+      @export.write(data)
+    end
 
-  def closefile
-    begin
-      @@exp.close
-      puts "Closing file"
-    rescue NoMethodError
+    def closefile
+      begin
+        @export.close
+        puts "Closing file"
+      rescue NoMethodError
+      end
     end
-  end
 
-  def processdata(data, outputfile, quietmode)
-    openfile(outputfile) if @@nfile == 0
-    writefile(data)
-    @@nfile += 1
-  end
+    def processdata(data, outputfile, quietmode)
+      openfile(outputfile) if @fileopen == 0
+      writefile(data)
+      @fileopen += 1
+    end
 
-  def stats(inputfile, outputfile)
-    print "Inputfile lines: "
-    countlines(inputfile)
-  end
+    def stats(inputfile, outputfile)
+      puts "Skip Lines #{@skip_lines}" if @debug >= 1
+      print "Inputfile lines: "
+      countlines(inputfile)
+    end
 
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icersplicer
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.9
 platform: ruby
 authors:
 - Brian Hood