tco 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8243ccc5a5dda73c772ea3fe8241f5529ad7cab7
-  data.tar.gz: 0dd668bc9775a1d8c89101531c73f9349e155819
+  metadata.gz: 7855a328ecfda6385c65b4ad9ef8945d2ddb07e9
+  data.tar.gz: 94967d9ed4d9fbe718ff0477b1bbc8e36020a95c
 SHA512:
-  metadata.gz: fbf7069d2873edd80e188b059d710715b7e48ca6e1d32cd71493c4fe746dd3c0ecc64db4c9aea11631291b8e3c6f8ed4374b105b19443e3a5a4cd41ef94829b4
-  data.tar.gz: 0a3451d6158bfad953ab32432ea41379eba531ca654b13fd60b66346ca59f6e56f970cfa283302322d6386ba5739050eee1837fabaf6df7c6afbe25b73c82a8e
+  metadata.gz: 123aa1226971a310e86d69e258a742f5cc04855a9962bbfb794b81ba5b4a2d2d82bea11dfcee1468755c34df30526b6fe59e63646f0b4ff648747aabe09816bb
+  data.tar.gz: d7df16214c894953b7f16ef3962c884cb6195edff262ec060fae0e00783167affb6281ea5f6a0f6ac79c83c911f679a8cc5e4d5f62787eadd504d339e357aa5b

data/README.md

@@ -1,7 +1,7 @@
 # tco - terminal colours made simple
 
 [![Gem Version](https://badge.fury.io/rb/tco.png)](http://badge.fury.io/rb/tco)
-[![Inline docs](http://inch-pages.github.io/github/pazdera/tco.png)](http://inch-pages.github.io/github/pazdera/tco)
+[![Inline docs](http://inch-ci.org/github/pazdera/tco.png)](http://inch-ci.org/github/pazdera/tco)
 [![Build Status][BS img]][Build Status]
 [Build Status]: https://travis-ci.org/pazdera/tco
 [BS img]: https://travis-ci.org/pazdera/tco.png

data/bin/tco

@@ -60,6 +60,11 @@ parser = OptionParser.new do |opts|
     options[:display] = true
   end
 
+  desc = "Show the matching colour from the current palette for this spec"
+  opts.on("-m COLOUR", "--match COLOUR", desc) do |colour|
+    options[:match] = colour
+  end
+
   opts.on("-p PALETTE", "--force-palette PALETTE",
           "Force either ansi or extended palette") do |palette|
     options[:palette] = palette
@@ -100,6 +105,11 @@ begin
     Kernel.exit! 0
   end
 
+  if options.has_key? :match
+    Tco::show_matching_colour options[:match]
+    Kernel.exit! 0
+  end
+
   if options.has_key? :style
     style = Tco::get_style options[:style]
   else

data/lib/tco.rb

@@ -101,6 +101,19 @@ module Tco
     @colouring = Colouring.new config
   end
 
+  def self.show_matching_colour(colour_spec)
+    colour = @colouring.get_colour_instance colour_spec
+    colour_index = @colouring.palette.match_colour colour
+
+    fg = @colouring.get_best_font_colour colour
+    bg = @colouring.palette.colours[colour_index]
+
+    puts Tco::colour fg, bg, " "*9
+    puts Tco::colour fg, bg, colour_index.to_s.center(9)
+    puts Tco::colour fg, bg, bg.to_s.center(9)
+    puts Tco::colour fg, bg, " "*9
+  end
+
   def self.display_palette
     # TODO: Might be worth sorting, so the pallete is easier to navigate
     colours = @colouring.palette.colours
@@ -117,15 +130,7 @@ module Tco
       # Prepare the squares for the line
       square_styles = []
       squares.times do
-        black = Tco::Colour.new([0,0,0])
-        white = Tco::Colour.new([255,255,255])
-
-        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]]
+        square_styles.push [c, @colouring.get_best_font_colour(colours[c]), colours[c]]
         c += 1
       end
 

data/lib/tco/colouring.rb

@@ -108,6 +108,33 @@ module Tco
       @output_type = output_type
     end
 
+    def get_best_font_colour(background)
+        black = Tco::Colour.new([0,0,0])
+        white = Tco::Colour.new([255,255,255])
+
+        if background.is_a?(Colour) &&
+           (background - black).abs < (background - white).abs
+          return white
+        end
+
+        black
+    end
+
+    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
+
     private
     def e(seq)
       if @output_type == :raw
@@ -236,20 +263,5 @@ module Tco
         end
       end
     end
-
-    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/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tco
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -63,8 +63,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: tco
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool and a library for terminal output colouring