tco 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4472e4cc2bf0a46eddb2cd6d31f30c2dce37b386
-  data.tar.gz: c619231ff03672b43f59104873929c6608b73fb7
+  metadata.gz: 94ecede596bc95edcd19290a9cdb8220eb64a9a6
+  data.tar.gz: 5bb02dc3efa44a85fa79c2b9af4550489360b08e
 SHA512:
-  metadata.gz: 9d10fc13418a767089535cedf5e8923914d33a1e44006183011585c40034e51cdbfae5e9f5a675a1e183ac7625300ccbc039789aa6878bf3f815c369a37070ae
-  data.tar.gz: aecdca9ecae68ce531254be1a5d8c0198434732c09300a0e9f35fe36a3b158048d11dde24d5f9e598a6b82d6745b01ea45cc05d077a20d5dae491ca9beff9da0
+  metadata.gz: b2b8caeefe0f8aabc4976422ecd4a4558e2d31d545ed8b4d23e9fdbe4fb3854da21394150ad46c3178f4c89af8ed26cb6ec6776e5e3d0ac7875fe0f4ad192bce
+  data.tar.gz: bf03af845a23893bd97b7f5897251f6e907640e6ef23ccd514978599ddbd66a9ea720c18daad6dd52189f3f95370bbc9426ef29eed1b4bf515e24e4b2b146fa9

data/bin/tco

@@ -25,7 +25,7 @@
 require 'optparse'
 require 'tco'
 
-options = {:newline => true}
+options = {:newline => true, :debug => false}
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: tco [options] [TEXT]"
 
@@ -75,6 +75,10 @@ parser = OptionParser.new do |opts|
     options[:raw] = true
   end
 
+  opts.on("-D", "--debug", "Run tco in debug mode") do |raw|
+    options[:debug] = true
+  end
+
   # TODO: This should output HTML (not implemented yet)
   #opts.on("-w", "--web", "Output HTML") do |html|
   #  options[:html] = html
@@ -83,7 +87,6 @@ end
 
 begin
   parser.parse!
-
   config = Tco::config
 
   # Force palette setting
@@ -120,7 +123,7 @@ begin
   end
 
   if ARGV.length > 0
-    input = ARGV[0].gsub /\\[nt]/, "\\n" => "\n", "\\t" => "\t"
+    input = ARGV[0].gsub(/\\[nt]/, "\\n" => "\n", "\\t" => "\t")
   else
     input = ""
     while input_line = gets
@@ -136,6 +139,10 @@ begin
 
   print "\n" if options[:newline] && !(input =~ /\n$/)
 rescue Exception => e
-  puts e
-  exit
+  if options[:debug]
+    raise e
+  else
+    puts e
+    exit
+  end
 end

data/lib/tco/colouring.rb

@@ -59,8 +59,8 @@ module Tco
     def decorate(string, (fg, bg, bright, underline))
       return string unless STDOUT.isatty || @output_type == :raw
 
-      fg = to_colour fg
-      bg = to_colour bg
+      fg = get_colour_instance fg
+      bg = get_colour_instance bg
 
       output = []
       lines = string.lines.map(&:chomp)
@@ -116,12 +116,20 @@ module Tco
 
     def colour_ansi(string, fg=nil, bg=nil)
       unless fg == nil
-        colour_id = @palette.match_colour(fg)
+        colour_id = if fg.is_a? Unknown
+          fg.id
+        else
+          @palette.match_colour(fg)
+        end
         string = e(colour_id + 30) + string
       end
 
       unless bg == nil
-        colour_id = @palette.match_colour(bg)
+        colour_id = if bg.is_a? Unknown
+          bg.id
+        else
+          @palette.match_colour(bg)
+        end
         string = e(colour_id + 40) + string
       end
 
@@ -134,12 +142,20 @@ module Tco
 
     def colour_extended(string, fg=nil, bg=nil)
       unless fg == nil
-        colour_id = @palette.match_colour(fg)
+        colour_id = if fg.is_a? Unknown
+          fg.id
+        else
+          @palette.match_colour(fg)
+        end
         string = e("38;5;#{colour_id}") + string
       end
 
       unless bg == nil
-        colour_id = @palette.match_colour(bg)
+        colour_id = if bg.is_a? Unknown
+          bg.id
+        else
+          @palette.match_colour(bg)
+        end
         string = e("48;5;#{colour_id}") + string
       end
 
@@ -192,11 +208,17 @@ module Tco
 
     def resolve_colour_def(colour_def)
       return nil if colour_def == "" || colour_def == "default"
+
       begin
-        @palette.get_colour_value parse_colour_id colour_def
+        id = parse_colour_id colour_def
+        if @palette.is_known? id
+          Colour.new @palette.get_colour_value id
+        else
+          Unknown.new id
+        end
       rescue RuntimeError
         begin
-          parse_rgb_value colour_def
+          Colour.new parse_rgb_value colour_def
         rescue RuntimeError
           begin
             colour_def = resolve_colour_name colour_def
@@ -212,16 +234,19 @@ module Tco
       end
     end
 
-    def to_colour(value)
-      rgb = case
-            when value.is_a?(String) then resolve_colour_def value
-            when value.is_a?(Array) then value
-            when value.is_a?(Colour) then value.rgb
-            when value == nil then return nil
-            else raise "Colour value type '#{value.class}' not supported."
-            end
-
-      Colour.new rgb
+    def get_colour_instance(value)
+      case
+      when value.is_a?(String)
+        resolve_colour_def value
+      when value.is_a?(Array)
+        Colour.new value
+      when value.is_a?(Colour) || value.is_a?(Unknown)
+        value
+      when value == nil
+        nil
+      else
+        raise "Colour value type '#{value.class}' not supported."
+      end
     end
   end
 end

data/lib/tco/palette.rb

@@ -22,6 +22,18 @@
 # THE SOFTWARE.
 
 module Tco
+  class Unknown
+    attr_reader :id
+
+    def initialize(id)
+      @id = id
+    end
+
+    def to_s
+      "@#{@id}"
+    end
+  end
+
   class Colour
     attr_reader :rgb, :lab
 
@@ -243,7 +255,8 @@ module Tco
       xDL = xDL / (kl * xSL)
       xDC = xDC / (kc * xSC)
       xDH = xDH / (kh * xSH)
-      de = Math.sqrt(xDL**2 + xDC**2 + xDH**2 + xRT * xDC * xDH)
+
+      Math.sqrt(xDL**2 + xDC**2 + xDH**2 + xRT * xDC * xDH)
     end
   end
 
@@ -260,22 +273,22 @@ module Tco
         # they were explicitly configured in tco.conf.
         #
         # The colour values in comments are the defaults for xterm.
-        nil, # [0, 0, 0]
-        nil, # [205, 0, 0]
-        nil, # [0, 205, 0]
-        nil, # [205, 205, 0]
-        nil, # [0, 0, 238]
-        nil, # [205, 0, 205]
-        nil, # [0, 205, 205]
-        nil, # [229, 229, 229]
-        nil, # [127, 127, 127]
-        nil, # [255, 0, 0]
-        nil, # [0, 255, 0]
-        nil, # [255, 255, 0]
-        nil, # [92, 92, 255]
-        nil, # [255, 0, 255]
-        nil, # [0, 255, 255]
-        nil, # [255, 255, 255]
+        Unknown.new(0), # [0, 0, 0]
+        Unknown.new(1), # [205, 0, 0]
+        Unknown.new(2), # [0, 205, 0]
+        Unknown.new(3), # [205, 205, 0]
+        Unknown.new(4), # [0, 0, 238]
+        Unknown.new(5), # [205, 0, 205]
+        Unknown.new(6), # [0, 205, 205]
+        Unknown.new(7), # [229, 229, 229]
+        Unknown.new(8), # [127, 127, 127]
+        Unknown.new(9), # [255, 0, 0]
+        Unknown.new(10), # [0, 255, 0]
+        Unknown.new(11), # [255, 255, 0]
+        Unknown.new(12), # [92, 92, 255]
+        Unknown.new(13), # [255, 0, 255]
+        Unknown.new(14), # [0, 255, 255]
+        Unknown.new(15), # [255, 255, 255]
 
         # The colours bellow are the definitions from xterm extended
         # colour palette. They should be the same across terminals.
@@ -529,10 +542,15 @@ module Tco
 
     def get_colour_value(id)
       raise "Id '#{id}' out of range." unless id.between?(0, @palette.length-1)
+      raise "Value of colour '#{id}' is unknown" if @palette[id].is_a? Unknown
       @palette[id].rgb if @palette[id]
     end
 
-    # Returns an index of the closest colour in the palette
+    def is_known?(id)
+      raise "Id '#{id}' out of range." unless id.between?(0, @palette.length-1)
+      !@palette[id].is_a? Unknown
+    end
+
     def match_colour(colour)
       unless colour.is_a? Colour
         msg = "Unsupported argument type '#{colour.class}', must be 'Colour'."
@@ -547,7 +565,7 @@ module Tco
       if @cache.has_key? colour.to_s
         @cache[colour.to_s]
       else
-        distances = colours.map { |c| c ? c - colour : Float::INFINITY }
+        distances = colours.map { |c| c.is_a?(Colour) ? c - colour : Float::INFINITY }
         colour_index = distances.each_with_index.min[1]
 
         # TODO: No cache eviction is currently in place

data/lib/tco/version.rb

@@ -22,5 +22,5 @@
 # THE SOFTWARE.
 
 module Tco
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/tco.rb

@@ -88,6 +88,13 @@ module Tco
   def self.config
     @config
   end
+  
+  def self.configure
+    c = config
+    yield(c)
+    reconfigure(c)
+    c
+  end
 
   def self.reconfigure(config)
     @config = config
@@ -113,11 +120,10 @@ module Tco
         black = Tco::Colour.new([0,0,0])
         white = Tco::Colour.new([255,255,255])
 
-        font_colour = if (colours[c] - black).abs > (colours[c] - white).abs
-                        black
-                      else
-                        white
-                      end
+        font_colour = black
+        if colours[c].is_a?(Colour) && (colours[c] - black).abs < (colours[c] - white).abs
+          font_colour = white
+        end
 
         square_styles.push [c, font_colour, colours[c]]
         c += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tco
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler