pry-theme 0.0.10 → 0.1.0

data/lib/pry-theme/palette.rb

@@ -43,7 +43,7 @@ module PryTheme
     # @param [Integer] colors The number of colors to be used in the palette.
     def initialize(colors=8)
       @color_depth = colors.to_i
-      @notation = "38;5;" if color_depth == 256
+      @notation = TermNotation::COLOR256 if color_depth == 256
 
       init_palette = "init_#{@color_depth}_colors"
 
@@ -74,7 +74,7 @@ module PryTheme
     def init_256_colors
       {
         :term  => (0...256).to_a,
-        :human => [ :black, :maroon, :toad_in_love, :olive, :navy_blue, :violet_eggplant, :teal, :silver, :gray, :red, :green, :yellow, :blue, :magenta, :cyan, :white, :black, :dark_indigo, :ultramarine01, :ultramarine02, :persian_blue01, :blue, :dark_spring_green, :dark_turquoise, :cerulean_grey01, :denim01, :royal_blue01, :royal_blue02, :toad_in_love01, :sea_green01, :teal01, :cerulean_grey02, :klein_blue, :azure01, :vert_de_pomme01, :jade01, :jade02, :robin_egg_blue01, :bondi_blue, :light_blue01, :vert_de_pomme02, :malachite01, :emerald01, :turquoise, :robin_egg_blue02, :electric01, :green, :spring_green01, :spring_green02, :mint_green01, :aquamarine01, :cyan, :flea_belly, :plum, :indigo, :purple01, :violet01, :persian_blue02, :khaki01, :wet_asphalt01, :seroburomalinovyj01, :denim02, :royal_blue03, :royal_blue04, :olive_drab, :fern_green, :slate_gray, :steel_blue, :cornflower_blue01, :azure02, :grass01, :emerald02, :sea_green02, :robin_egg_blue03, :bluish01, :light_blue02, :vert_de_pomme03, :pale_green01, :emerald03, :aquamarine02, :robin_egg_blue04, :sky01, :bright_green, :malachite02, :spring_green03, :chartreuse01, :aquamarine03, :cyan01, :maroon01, :eggplant01, :violet_eggplant01, :purple02, :violet02, :violet03, :khaki02, :pale_mauve01, :seroburomalinovyj02, :amethyst01, :amethyst02, :heliotrope01, :olive01, :dark_tan, :gray01, :bluish02, :cornflower_blue02, :royal_blue05, :grass02, :asparagus, :swamp_green01, :light_grey01, :bluish03, :cornflower_blue03, :green_yellow01, :pale_green02, :emerald04, :celadon, :pale_blue01, :sky02, :viridian, :vert_de_pomme04, :mint_green02, :chartreuse02, :aquamarine03, :electric02, :bismarck_furious, :eggplant02, :red_violet01, :violet_eggplant02, :bright_violet, :violet04, :ochre, :pale_mauve02, :pale_red_violet01, :orchid01, :amethyst03, :heliotrope02, :dark_goldenrod, :pale_brown, :mountbatten_pink, :lilac01, :wisteria01, :amethyst04, :old_gold, :brass01, :swamp_green02, :light_grey02, :niagara, :wisteria02, :lime01, :pistachio01, :moss_green, :dark_tea_green, :pale_blue02, :pale_cornflower_blue, :green_yellow02, :green_yellow03, :pistachio02, :chartreuse03, :aquamarine04, :pale_blue03, :titian, :cerise01, :red_violet02, :hot_pink01, :bright_violet, :magenta01, :tenne, :chestnut01, :pale_red_violet02, :orchid02, :orchid03, :heliotrope03, :siena, :dark_salmon, :puce01, :puce2, :violaceous01, :violaceous02, :dark_pear, :brass02, :tan, :pale_chestnut, :lilac02, :wisteria03, :childs_surprise, :vert_de_peche, :flax, :gray_tea_green, :abdel_kerims_beard01, :periwinkle, :lime02, :pistachio03, :pistachio04, :tea_green01, :tea_green02, :pang, :red, :crimson, :cerise02, :hot_pink02, :hot_pink03, :magenta, :international_orange, :alizarin, :dark_pink01, :dark_pink02, :shocked_star, :fuchsia, :tangerine, :salmon, :chestnut02, :pale_red_violet03, :pale_magenta, :violaceous03, :orange, :pink_orange, :saumon, :pink01, :pink02, :violaceous04, :gold, :mustard01, :mustard02, :dark_peach, :pale_pink, :thistle, :yellow, :corn01, :corn02, :perhydor, :lemon_cream, :white, :black01, :black02, :black03, :bistre, :anthracite, :wet_asphalt02, :wet_asphalt03, :wet_asphalt04, :wet_asphalt05, :wet_asphalt06, :wet_asphalt07, :gray01, :gray, :gray02, :gray03, :gray04, :gray05, :light_grey03, :light_grey04, :silver01, :abdel_kerims_beard02, :abdel_kerims_beard03, :abdel_kerims_beard04, :seashell ]
+        :human => [ :black, :maroon, :toad_in_love, :olive, :navy_blue, :violet_eggplant, :teal, :silver, :gray, :red, :green, :yellow, :blue, :magenta, :cyan, :white, :black, :dark_indigo, :ultramarine01, :ultramarine02, :persian_blue01, :blue, :dark_spring_green, :dark_turquoise, :cerulean_grey01, :denim01, :royal_blue01, :royal_blue02, :toad_in_love01, :sea_green01, :teal01, :cerulean_grey02, :klein_blue, :azure01, :vert_de_pomme01, :jade01, :jade02, :robin_egg_blue01, :bondi_blue, :light_blue01, :vert_de_pomme02, :malachite01, :emerald01, :turquoise, :robin_egg_blue02, :electric01, :green, :spring_green01, :spring_green02, :mint_green01, :aquamarine01, :cyan, :flea_belly, :plum, :indigo, :purple01, :violet01, :persian_blue02, :khaki01, :wet_asphalt01, :seroburomalinovyj01, :denim02, :royal_blue03, :royal_blue04, :olive_drab, :fern_green, :slate_gray, :steel_blue, :cornflower_blue01, :azure02, :grass01, :emerald02, :sea_green02, :robin_egg_blue03, :bluish01, :light_blue02, :vert_de_pomme03, :pale_green01, :emerald03, :aquamarine02, :robin_egg_blue04, :sky01, :bright_green, :malachite02, :spring_green03, :chartreuse01, :aquamarine03, :cyan01, :maroon01, :eggplant01, :violet_eggplant01, :purple02, :violet02, :violet03, :khaki02, :pale_mauve01, :seroburomalinovyj02, :amethyst01, :amethyst02, :heliotrope01, :olive01, :dark_tan, :gray01, :bluish02, :cornflower_blue02, :royal_blue05, :grass02, :asparagus, :swamp_green01, :light_grey01, :bluish03, :cornflower_blue03, :green_yellow01, :pale_green02, :emerald04, :celadon, :pale_blue01, :sky02, :viridian, :vert_de_pomme04, :mint_green02, :chartreuse02, :aquamarine04, :electric02, :bismarck_furious, :eggplant02, :red_violet01, :violet_eggplant02, :bright_violet, :violet04, :ochre, :pale_mauve02, :pale_red_violet01, :orchid01, :amethyst03, :heliotrope02, :dark_goldenrod, :pale_brown, :mountbatten_pink, :lilac01, :wisteria01, :amethyst04, :old_gold, :brass01, :swamp_green02, :light_grey02, :niagara, :wisteria02, :lime01, :pistachio01, :moss_green, :dark_tea_green, :pale_blue02, :pale_cornflower_blue, :green_yellow02, :green_yellow03, :pistachio02, :chartreuse03, :aquamarine05, :pale_blue03, :titian, :cerise01, :red_violet02, :hot_pink01, :bright_violet, :magenta01, :tenne, :chestnut01, :pale_red_violet02, :orchid02, :orchid03, :heliotrope03, :siena, :dark_salmon, :puce01, :puce2, :violaceous01, :violaceous02, :dark_pear, :brass02, :tan, :pale_chestnut, :lilac02, :wisteria03, :childs_surprise, :vert_de_peche, :flax, :gray_tea_green, :abdel_kerims_beard01, :periwinkle, :lime02, :pistachio03, :pistachio04, :tea_green01, :tea_green02, :pang, :red, :crimson, :cerise02, :hot_pink02, :hot_pink03, :magenta, :international_orange, :alizarin, :dark_pink01, :dark_pink02, :shocked_star, :fuchsia, :tangerine, :salmon, :chestnut02, :pale_red_violet03, :pale_magenta, :violaceous03, :orange, :pink_orange, :saumon, :pink01, :pink02, :violaceous04, :gold, :mustard01, :mustard02, :dark_peach, :pale_pink, :thistle, :yellow, :corn01, :corn02, :perhydor, :lemon_cream, :white, :black01, :black02, :black03, :bistre, :anthracite, :wet_asphalt02, :wet_asphalt03, :wet_asphalt04, :wet_asphalt05, :wet_asphalt06, :wet_asphalt07, :gray01, :gray, :gray02, :gray03, :gray04, :gray05, :light_grey03, :light_grey04, :silver01, :abdel_kerims_beard02, :abdel_kerims_beard03, :abdel_kerims_beard04, :seashell ]
       }
     end
 

data/lib/pry-theme/rgb.rb

@@ -0,0 +1,24 @@
+module PryTheme
+  module RGB
+
+    SYSTEM = [
+      [0x00, 0x00, 0x00], [0x80, 0x00, 0x00], [0x00, 0x80, 0x00],
+      [0x80, 0x80, 0x00], [0x00, 0x00, 0x80], [0x80, 0x00, 0x80],
+      [0x00, 0x80, 0x80], [0xc0, 0xc0, 0xc0], [0x80, 0x80, 0x80],
+      [0xff, 0x00, 0x00], [0x00, 0xff, 0x00], [0xff, 0xff, 0x00],
+      [0x00, 0x00, 0xff], [0xff, 0x00, 0xff], [0x00, 0xff, 0xff],
+      [0xff, 0xff, 0xff]
+    ]
+
+    COLORS = [
+      [0, 0, 0], [0, 0, 95], [0, 0, 135], [0, 0, 175], [0, 0, 215], [0, 0, 255], [0, 95, 0], [0, 95, 95], [0, 95, 135], [0, 95, 175], [0, 95, 215], [0, 95, 255], [0, 135, 0], [0, 135, 95], [0, 135, 135], [0, 135, 175], [0, 135, 215], [0, 135, 255], [0, 175, 0], [0, 175, 95], [0, 175, 135], [0, 175, 175], [0, 175, 215], [0, 175, 255], [0, 215, 0], [0, 215, 95], [0, 215, 135], [0, 215, 175], [0, 215, 215], [0, 215, 255], [0, 255, 0], [0, 255, 95], [0, 255, 135], [0, 255, 175], [0, 255, 215], [0, 255, 255], [95, 0, 0], [95, 0, 95], [95, 0, 135], [95, 0, 175], [95, 0, 215], [95, 0, 255], [95, 95, 0], [95, 95, 95], [95, 95, 135], [95, 95, 175], [95, 95, 215], [95, 95, 255], [95, 135, 0], [95, 135, 95], [95, 135, 135], [95, 135, 175], [95, 135, 215], [95, 135, 255], [95, 175, 0], [95, 175, 95], [95, 175, 135], [95, 175, 175], [95, 175, 215], [95, 175, 255], [95, 215, 0], [95, 215, 95], [95, 215, 135], [95, 215, 175], [95, 215, 215], [95, 215, 255], [95, 255, 0], [95, 255, 95], [95, 255, 135], [95, 255, 175], [95, 255, 215], [95, 255, 255], [135, 0, 0], [135, 0, 95], [135, 0, 135], [135, 0, 175], [135, 0, 215], [135, 0, 255], [135, 95, 0], [135, 95, 95], [135, 95, 135], [135, 95, 175], [135, 95, 215], [135, 95, 255], [135, 135, 0], [135, 135, 95], [135, 135, 135], [135, 135, 175], [135, 135, 215], [135, 135, 255], [135, 175, 0], [135, 175, 95], [135, 175, 135], [135, 175, 175], [135, 175, 215], [135, 175, 255], [135, 215, 0], [135, 215, 95], [135, 215, 135], [135, 215, 175], [135, 215, 215], [135, 215, 255], [135, 255, 0], [135, 255, 95], [135, 255, 135], [135, 255, 175], [135, 255, 215], [135, 255, 255], [175, 0, 0], [175, 0, 95], [175, 0, 135], [175, 0, 175], [175, 0, 215], [175, 0, 255], [175, 95, 0], [175, 95, 95], [175, 95, 135], [175, 95, 175], [175, 95, 215], [175, 95, 255], [175, 135, 0], [175, 135, 95], [175, 135, 135], [175, 135, 175], [175, 135, 215], [175, 135, 255], [175, 175, 0], [175, 175, 95], [175, 175, 135], [175, 175, 175], [175, 175, 215], [175, 175, 255], [175, 215, 0], [175, 215, 95], [175, 215, 135], [175, 215, 175], [175, 215, 215], [175, 215, 255], [175, 255, 0], [175, 255, 95], [175, 255, 135], [175, 255, 175], [175, 255, 215], [175, 255, 255], [215, 0, 0], [215, 0, 95], [215, 0, 135], [215, 0, 175], [215, 0, 215], [215, 0, 255], [215, 95, 0], [215, 95, 95], [215, 95, 135], [215, 95, 175], [215, 95, 215], [215, 95, 255], [215, 135, 0], [215, 135, 95], [215, 135, 135], [215, 135, 175], [215, 135, 215], [215, 135, 255], [215, 175, 0], [215, 175, 95], [215, 175, 135], [215, 175, 175], [215, 175, 175], [215, 175, 215], [215, 175, 255], [215, 215, 0], [215, 215, 95], [215, 215, 135], [215, 215, 175], [215, 215, 215], [215, 215, 255], [215, 255, 0], [215, 255, 95], [215, 255, 135], [215, 255, 175], [215, 255, 215], [215, 255, 255], [255, 0, 0], [255, 0, 95], [255, 0, 135], [255, 0, 175], [255, 0, 215], [255, 0, 255], [255, 95, 0], [255, 95, 95], [255, 95, 135], [255, 95, 175], [255, 95, 215], [255, 95, 255], [255, 135, 0], [255, 135, 95], [255, 135, 135], [255, 135, 175], [255, 135, 215], [255, 135, 255], [255, 175, 0], [255, 175, 95], [255, 175, 135], [255, 175, 175], [255, 175, 215], [255, 175, 255], [255, 215, 0], [255, 215, 95], [255, 215, 135], [255, 215, 175], [255, 215, 215], [255, 215, 255], [255, 255, 0], [255, 255, 95], [255, 255, 135], [255, 255, 175], [255, 255, 215]
+    ]
+
+    GREYSCALE = (0x08..0xee).step(0x0a).map { |v| [v] * 3 }
+
+    def self.table
+      SYSTEM + COLORS + GREYSCALE
+    end
+
+  end
+end

data/lib/pry-theme/term_notation.rb

@@ -0,0 +1,17 @@
+module PryTheme
+  module TermNotation
+
+    # The prefix for 256-color ANSI foreground codes.
+    COLOR256 = "38;5;"
+
+    # The prefix for 256-color ANSI background codes.
+    BACKGROUND256 = "48;5;"
+
+    # The prefix for displaying a text only with a background color.
+    NO_FOREGROUND = "38;0"
+
+    # The prefix represents an empty ANSI code (used to please CodeRay).
+    EMPTY = "38;0;0"
+
+  end
+end

data/lib/pry-theme/theme.rb

@@ -4,7 +4,7 @@ module PryTheme
     attr_reader :scheme, :author, :description, :color_depth, :version, :name
 
     def initialize(theme_filename)
-      theme_file = File.join(THEME_DIR, "#{theme_filename}.prytheme")
+      theme_file = Helper.pathify_theme(theme_filename)
 
       if File.exists?(theme_file)
         theme = YAML.load_file(theme_file)

data/lib/pry-theme/version.rb

@@ -1,3 +1,3 @@
 module PryTheme
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

data/lib/pry-theme/when_started_hook.rb

@@ -27,11 +27,12 @@ module PryTheme
         if Helper.installed?(Pry.config.theme)
           PryTheme.set_theme(Pry.config.theme)
         else
-          _pry_.output.puts %{Can't find "#{Pry.config.theme}" theme. Using "#{DEFAULT_THEME_NAME}"}
+          _pry_.output.puts %{Can't find "#{ Pry.config.theme }" theme. Using "#{ DEFAULT_THEME_NAME }"}
           PryTheme.set_theme(DEFAULT_THEME_NAME)
         end
       else
-        _pry_.output.puts %{Can't find `Pry.config.theme` definition in your `~/.pryrc`.\nUsing "pry-classic" theme now.}
+        _pry_.output.puts %{Can't find `Pry.config.theme` definition in your `~/.pryrc`.\nUsing "#{ DEFAULT_THEME_NAME }" theme now.}
+        PryTheme.set_theme(DEFAULT_THEME_NAME)
       end
     end
 

data/lib/pry-theme.rb

@@ -1,10 +1,13 @@
 require 'pry-theme/version'
+require 'pry-theme/uninstaller'
 require 'pry-theme/helper'
-require 'pry-theme/commands'
 require 'pry-theme/palette'
+require 'pry-theme/term_notation'
 require 'pry-theme/theme'
+require 'pry-theme/rgb'
+require 'pry-theme/color_converter'
+require 'pry-theme/commands'
 require 'pry-theme/when_started_hook'
-require 'pry-theme/uninstaller'
 
 require 'yaml'
 
@@ -123,7 +126,7 @@ module PryTheme
 
       color_bg   = find_color($7, palette) do |c|
                      if palette.color_depth == 256
-                       "48;5;#{c.term}"
+                       "#{ TermNotation::BACKGROUND256 }#{c.term}"
                       else
                         Formatting::BACKGROUNDS[c.human.to_s]
                      end
@@ -131,7 +134,7 @@ module PryTheme
 
       # Uh oh :(
       notation = if !color_fg
-                   "38;0"
+                   TermNotation::NO_FOREGROUND
                  elsif palette.notation
                    palette.notation[0..-2]
                  else
@@ -143,7 +146,7 @@ module PryTheme
       # In cases when a user decided not to provide an argument value in theme,
       # use default color. Not handling this situation results in CodeRay's
       # error ("can't convert nil into String" stuff).
-      "38;0;0"
+      TermNotation::EMPTY
     end
   rescue NoColorError => e
     Pry.output.puts "#{e}: wrong color value: `#{color}`. Typo?"

data/lib/rubygems_plugin.rb

@@ -4,6 +4,5 @@ begin
 
   PryTheme.install_gem_hooks
 rescue LoadError
-  # Be silent, when we can't load Pry (when it's uninstalled).
+  # Be silent when we can't load Pry (when it's uninstalled).
 end
-

data/pry-theme.gemspec

@@ -1,4 +1,7 @@
-require './lib/pry-theme/version'
+unless defined? PryTheme::VERSION
+  require File.expand_path('../lib/pry-theme/version', __FILE__)
+end
+
 Gem::Specification.new do |s|
   s.name         = "pry-theme"
   s.version      = PryTheme::VERSION
@@ -13,6 +16,9 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.files        = `git ls-files`.split "\n"
 
-  s.add_runtime_dependency "pry",   "~> 0.9"
   s.add_runtime_dependency "json"
+
+  s.add_development_dependency "bacon"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "pry"
 end

data/test/fixtures/pry-classic.prytheme

@@ -0,0 +1,38 @@
+---
+meta:
+  theme-name  : pry-classic
+  version     : 4
+  color-depth : 8
+  description : Default Pry theme
+  author      : Kyrylo Silin <kyrylosilin@gmail.com>, Kornelius Kalnbach
+
+theme:
+  class               : magenta (b)
+  class_variable      : cyan
+  comment             : blue
+  constant            : blue (bu)
+  error               : yellow (b) on red
+  float               : magenta (b)
+  global_variable     : on green
+  instance_variable   : (d)
+  integer             : blue (b)
+  keyword             : red (b)
+  method              : blue (b)
+  predefined_constant : cyan (b)
+  regexp:
+    self              : red
+    content           : red
+    delimiter         : red (db)
+    modifier          : magenta (b)
+    function          : (db)
+  shell:
+    self              : on green
+    content           : (db)
+    delimiter         : white
+  string:
+    self              : green
+    content           : green
+    modifier          : green (b)
+    escape            : cyan (b)
+    delimiter         : green (b)
+  symbol              : green (b)

data/test/helper.rb

@@ -0,0 +1,56 @@
+require 'rubygems'
+require 'pry'
+
+# Brute force or otherwise it won't work for all platforms.
+begin
+  $:.unshift File.expand_path("../../lib", __FILE__)
+  require 'pry-theme'
+rescue
+end
+
+require 'bacon'
+
+puts "Ruby version: #{RUBY_VERSION}; Pry Theme version: #{PryTheme::VERSION}"
+
+class InputTester
+  def initialize(*actions)
+    @orig_actions = actions.dup
+    @actions = actions
+  end
+
+  def readline(*)
+    @actions.shift
+  end
+
+  def rewind
+    @actions = @orig_actions.dup
+  end
+end
+
+def mock_pry(*args)
+  args.flatten!
+  binding = args.first.is_a?(Binding) ? args.shift : binding()
+
+  input = InputTester.new(*args)
+  output = StringIO.new
+
+  redirect_pry_io(input, output) do
+    binding.pry
+  end
+
+  output.string
+end
+
+def redirect_pry_io(new_in, new_out = StringIO.new)
+  old_in = Pry.input
+  old_out = Pry.output
+
+  Pry.input = new_in
+  Pry.output = new_out
+  begin
+    yield
+  ensure
+    Pry.input = old_in
+    Pry.output = old_out
+  end
+end

data/test/test_color_converter.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+describe PryTheme::ColorConverter do
+
+  before do
+    @converter = PryTheme::ColorConverter
+  end
+
+  describe PryTheme::ColorConverter::COLORS do
+    it 'should have 256 colors' do
+      @converter::COLORS.size.should == 256
+    end
+  end
+
+  it "should convert from rgb to hex" do
+    @converter.rgb_to_hex("55,55,55").should == "#373737"
+  end
+
+  it "should convert from rgb to ansi" do
+    @converter.rgb_to_ansi("55,55,55").should == 59
+  end
+
+  it "should convert from hex to rgb with an octothorp sign" do
+    @converter.hex_to_rgb("#373737").should == [55, 55, 55]
+  end
+
+  it "should convert from hex to rgb without an octothorp sign" do
+    @converter.hex_to_rgb("373737").should == [55, 55, 55]
+  end
+
+  it "should convert from hex to ansi with an octothorp sign" do
+    @converter.hex_to_ansi("#373737").should == 59
+  end
+
+  it "should convert from ansi to rgb without an octothorp sign" do
+    @converter.hex_to_ansi("373737").should == 59
+  end
+end

data/test/test_commands.rb

@@ -0,0 +1,55 @@
+require 'helper'
+
+describe "PryTheme::Commands" do
+  describe "color option" do
+    it "should display a color when given a numeric argument" do
+      mock_pry(binding, "pry-theme -c 23").should =~ /dark_turquoise/
+    end
+
+    it "should display warning when invalid color number given" do
+      out = mock_pry("pry-theme -c 1000")
+      out.should =~ /Invalid color: 1000/
+    end
+
+    it "should display warning when random symbols given" do
+      out = mock_pry("pry-theme -c $_dopey+")
+      out.should =~ /Invalid color: \$_dopey\+/
+    end
+
+    it "should display a color when a hex given" do
+      mock_pry("pry-theme -c #625a2d").should =~ /khaki01/
+    end
+
+    it "should display a color when an rgb given" do
+      mock_pry("pry-theme -c 95,196,60").should =~ /pale_green01/
+    end
+
+    it "should display a color when a human-readable name given" do
+      mock_pry("pry-theme -c steel_blue").should =~ /steel_blue/
+    end
+
+    it "should display multiple colors when a substring given" do
+      out = mock_pry("pry-theme -c dark_t")
+
+      out.should =~ /dark_turquoise/
+      out.should =~ /dark_tan/
+      out.should =~ /dark_tea_green/
+    end
+  end
+
+  describe "all-colors option" do
+    it "should display all colors for 8-color palette" do
+      out = mock_pry("pry-theme -a 8")
+
+      out.should =~ /black/
+      out.should =~ /magenta/
+    end
+
+    #it "should display all colors for 256-color palette" do
+      #out = mock_pry("pry-theme -a 256")
+
+      #out.should =~ /black/
+      #out.should =~ /seashell/
+    #end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,45 @@
+require 'helper'
+
+describe PryTheme::Helper do
+  before do
+    @h = PryTheme::Helper
+  end
+
+  it "should show correctly default themes" do
+    themes = %w{
+      zenburn solarized vim-default railscasts pry-cold saturday twilight
+      github monokai pry-modern tomorrow pry-classic vim-detailed
+    }
+    themes.map! { |theme| theme + ".prytheme" }
+
+    (@h.example_themes - themes).should == []
+  end
+
+  it "should show correct theme file_version" do
+    path = File.join(File.dirname(__FILE__), "fixtures", "pry-classic.prytheme")
+    @h.theme_file_version(path).should == 4
+  end
+
+  it "should detect ansi color" do
+    @h.ansi?(0).should == true
+    @h.ansi?(-1).should == false
+    @h.ansi?(256).should == false
+    @h.ansi?("bashful").should == false
+  end
+
+  it "should detect rgb color" do
+    @h.rgb?("55,55,55").should == true
+    @h.rgb?("0,0,0").should == true
+    @h.rgb?("256,255,255").should == false
+    @h.rgb?("1").should == false
+    @h.rgb?("55,55,55,").should == false
+    @h.rgb?("sneezy").should == false
+  end
+
+  it "should detect hex color" do
+    @h.hex?("#373737").should == true
+    @h.hex?("3A3F3E").should == true
+    @h.hex?("dopey").should == false
+    @h.hex?(373737).should == false
+  end
+end

data/test/test_palette.rb

@@ -0,0 +1,11 @@
+require 'helper'
+
+describe "A PryTheme::Color instance" do
+  before do
+    @c = PryTheme::Color.new("111", "dopey")
+  end
+
+  it "should represent itself in terminal form" do
+    @c.to_term("38;5;").should == "\e[38;5;111;7m111\e[0m:\e[38;5;111mdopey\e[0m"
+  end
+end

data/themes/github.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : github
-  version     : 3
+  version     : 4
   color-depth : 256
   description : Based on github theme
   author      : John Mair
@@ -24,7 +24,6 @@ theme:
     content           : toad_in_love01
     delimiter         : toad_in_love01
     modifier          : toad_in_love01
-    function          : toad_in_love01
   shell:
     self              : puce01
     content           : puce01
@@ -32,7 +31,5 @@ theme:
   string:
     self              : alizarin
     content           : alizarin
-    modifier          : alizarin
-    escape            : alizarin
     delimiter         : alizarin
   symbol              : pale_magenta