pry-theme 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661d245d94e776396bfa944e1b004039d2f0bbfb
-  data.tar.gz: daf9c510a7a83a744c65291c2a2890c5a23ae51e
+  metadata.gz: 9a1eb3f214ef45843bfac7d8bf137954708f6418
+  data.tar.gz: 195401625f2ac311d07a77fc3f94db9971d3138f
 SHA512:
-  metadata.gz: 72fcb86c20788418aa6f96e37555d486a9498288d9e284766aec099715c4fcb87ec40dd84a30fa76a91a9e0a85911b9c2f37cbac966faa6abaeaa1e0cc7376ff
-  data.tar.gz: ec0586fc22e6c58810cd754f624589d124f2df3c3f21cb1cb77e00632c04bcc2b3f4db630ba4ab95c74a430ff43ffd14b0ddc2efc92f92f660d3ea02148c5ce1
+  metadata.gz: 8920c63f7ffe04ce0ea6207a192d0d7c08cc7714e12044c73db5cc4d2c98fb98ac8ca8e51c60d8c83fe4dfae2a6e0f55f97bf229aaa0e77aed8affc107a659bb
+  data.tar.gz: 193ecb28c36838b75f66b2f25a29bcaec92b1784c6d9538de367ded42a7eee6f5ae52063be155679310371016d429a877b14858f455ecba505da3114c10b5f15

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 Pry Theme changelog
 ===================
 
+### v1.0.1 (November 18, 2013)
+
+* Fixed `pry-theme convert` and `pry-theme colors`
+
 ### v1.0.0 (November 13, 2013)
 
-* **IMPORTANT**: This version is incompatible with CodeRay 1.0.9 and lower.
+* **IMPORTANT**: This version is incompatible with CodeRay 1.0.9 and lower
 * Fixed CodeRay 1.1.0 support
 
 ### v0.2.0 (March 26, 2013)

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/pry-theme/color.rb

@@ -336,9 +336,9 @@ module PryTheme
       readable ? @readable_bg : layer_color(colors(:background)[@readable_bg])
     end
 
-    def to_ansi
-      fg, bg = !!foreground, !!background
-      escape(create_ansi_sequence(fg, bg))
+    def to_ansi(inversion = false)
+      ansi = create_ansi_sequence(foreground, background)
+      escape(inversion ? ['7;', ansi].join('') : ansi)
     end
 
     private

data/lib/pry-theme/color_table.rb

@@ -15,8 +15,8 @@ module PryTheme
       end
 
       def build_color_string(color, fg = nil)
-        "\e[7;%sm%s\e[0m:\e[%sm%s\e[0m" %
-          [color.to_ansi, fg || color.foreground,
+        "%s%s\e[0m:%s%s\e[0m" %
+          [color.to_ansi(true), fg || color.foreground,
            color.to_ansi, color.foreground(true)]
       end
     end

data/spec/colors/color16_spec.rb

@@ -7,17 +7,17 @@ describe PryTheme::Color16 do
     it "can be set" do
       color = Color16.new(:foreground => 'bright_red')
       color.foreground(true).should == 'bright_red'
-      color.to_ansi.should == '31;1'
+      color.to_ansi.should == "\e[31;1m"
 
       color = Color16.new(:foreground => 'red')
       color.foreground(true).should == 'red'
-      color.to_ansi.should == '31'
+      color.to_ansi.should == "\e[31m"
     end
 
     it "defaults to no colour at all" do
       color = Color16.new
       color.foreground(true).should == false
-      color.to_ansi.should == '39;49'
+      color.to_ansi.should == "\e[39;49m"
     end
 
     it "raises error on invalid value" do
@@ -31,7 +31,7 @@ describe PryTheme::Color16 do
     it "can be set" do
       color = Color16.new(:background => 'blue')
       color.background(true).should == 'blue'
-      color.to_ansi.should == '44'
+      color.to_ansi.should == "\e[44m"
     end
 
     it "raises error on invalid value" do
@@ -48,7 +48,7 @@ describe PryTheme::Color16 do
         :background => 'bright_white')
       color.foreground(true).should == 'bright_yellow'
       color.background(true).should == 'bright_white'
-      color.to_ansi.should == '33;1;47'
+      color.to_ansi.should == "\e[33;1;47m"
     end
   end
 

data/spec/colors/color256_spec.rb

@@ -7,13 +7,13 @@ describe PryTheme::Color256 do
     it "can be set" do
       color = Color256.new(:foreground => 'bright_violet')
       color.foreground(true).should == 'bright_violet'
-      color.to_ansi.should == '38;5;128'
+      color.to_ansi.should == "\e[38;5;128m"
     end
 
     it "defaults to no colour at all" do
       color = Color256.new
       color.foreground(true).should == false
-      color.to_ansi.should == '0'
+      color.to_ansi.should == "\e[0m"
     end
 
     it "raises error on invalid value" do
@@ -28,7 +28,7 @@ describe PryTheme::Color256 do
         color.bold?.should == false
         color.underline?.should == false
         color.italic?.should == false
-        color.to_ansi.should == '38;5;128'
+        color.to_ansi.should == "\e[38;5;128m"
       end
 
       it "uses bold" do
@@ -36,7 +36,7 @@ describe PryTheme::Color256 do
         color.bold?.should == true
         color.underline?.should == false
         color.italic?.should == false
-        color.to_ansi.should == '38;5;178;1'
+        color.to_ansi.should == "\e[38;5;178;1m"
       end
 
       it "uses underline" do
@@ -44,7 +44,7 @@ describe PryTheme::Color256 do
         color.bold?.should == false
         color.underline?.should == true
         color.italic?.should == false
-        color.to_ansi.should == '38;5;62;4'
+        color.to_ansi.should == "\e[38;5;62;4m"
       end
 
       it "uses italic" do
@@ -52,7 +52,7 @@ describe PryTheme::Color256 do
         color.bold?.should == false
         color.underline?.should == false
         color.italic?.should == true
-        color.to_ansi.should == '38;5;161;3'
+        color.to_ansi.should == "\e[38;5;161;3m"
       end
 
       it "combines everything" do
@@ -64,7 +64,7 @@ describe PryTheme::Color256 do
         color.bold?.should == true
         color.underline?.should == true
         color.italic?.should == true
-        color.to_ansi.should == '38;5;160;1;3;4'
+        color.to_ansi.should == "\e[38;5;160;1;3;4m"
       end
 
       describe "with defaults" do
@@ -73,7 +73,7 @@ describe PryTheme::Color256 do
           color.bold?.should == false
           color.underline?.should == false
           color.italic?.should == false
-          color.to_ansi.should == '0'
+          color.to_ansi.should == "\e[0m"
         end
 
         it "can be used without foreground" do
@@ -81,7 +81,7 @@ describe PryTheme::Color256 do
           color.bold?.should == true
           color.underline?.should == false
           color.italic?.should == false
-          color.to_ansi.should == '48;5;235;1'
+          color.to_ansi.should == "\e[48;5;235;1m"
         end
 
         it "can be used with the default colour" do
@@ -89,7 +89,7 @@ describe PryTheme::Color256 do
           color.bold?.should == true
           color.underline?.should == true
           color.italic?.should == true
-          color.to_ansi.should == '1;3;4'
+          color.to_ansi.should == "\e[1;3;4m"
         end
       end
     end
@@ -99,13 +99,13 @@ describe PryTheme::Color256 do
     it "can be set" do
       color = Color256.new(:background => 'bright_violet')
       color.background(true).should == 'bright_violet'
-      color.to_ansi.should == '48;5;128'
+      color.to_ansi.should == "\e[48;5;128m"
     end
 
     it "defaults to no colour at all" do
       color = Color256.new
       color.background(true).should == false
-      color.to_ansi.should == '0'
+      color.to_ansi.should == "\e[0m"
     end
 
     it "raises error on invalid value" do
@@ -122,7 +122,7 @@ describe PryTheme::Color256 do
         :foreground => 'pale_brown')
       color.foreground(true).should == 'pale_brown'
       color.background(true).should == 'red_violet01'
-      color.to_ansi.should == '38;5;137;48;5;126'
+      color.to_ansi.should == "\e[38;5;137;48;5;126m"
     end
 
     it "can be set with effects" do
@@ -132,7 +132,7 @@ describe PryTheme::Color256 do
           :italic    => true,
           :bold      => true,
           :underline => true)
-      color.to_ansi.should == '38;5;137;1;3;4;48;5;126'
+      color.to_ansi.should == "\e[38;5;137;1;3;4;48;5;126m"
     end
   end
 
@@ -320,4 +320,18 @@ describe PryTheme::Color256 do
     end
   end
 
+  describe "#to_ansi" do
+    before do
+      @color = Color256.new(:from => :term, :background => 84)
+    end
+
+    it "converts a colour to an ANSI sequence" do
+      @color.to_ansi.should == "\e[48;5;84m"
+    end
+
+    it "given `true` converts a colour to an inverted ANSI sequence" do
+      @color.to_ansi(true).should == "\e[7;48;5;84m"
+    end
+  end
+
 end

data/spec/colors/color8_spec.rb

@@ -7,13 +7,13 @@ describe PryTheme::Color8 do
     it "can be set" do
       color = Color8.new(:foreground => 'red')
       color.foreground(true).should == 'red'
-      color.to_ansi.should == '31'
+      color.to_ansi.should == "\e[31m"
     end
 
     it "defaults to no colour at all" do
       color = Color8.new
       color.foreground(true).should == false
-      color.to_ansi.should == '39;49'
+      color.to_ansi.should == "\e[39;49m"
     end
 
     it "raises error on invalid value" do
@@ -27,13 +27,13 @@ describe PryTheme::Color8 do
     it "can be set" do
       color = Color8.new(:background => 'blue')
       color.background(true).should == 'blue'
-      color.to_ansi.should == '44'
+      color.to_ansi.should == "\e[44m"
     end
 
     it "defaults to no colour at all" do
       color = Color8.new
       color.background(true).should == false
-      color.to_ansi.should == '39;49'
+      color.to_ansi.should == "\e[39;49m"
     end
 
     it "raises error on invalid value" do
@@ -48,7 +48,7 @@ describe PryTheme::Color8 do
       color = Color8.new(:foreground => 'green', :background => 'red')
       color.foreground(true).should == 'green'
       color.background(true).should == 'red'
-      color.to_ansi.should == '32;41'
+      color.to_ansi.should == "\e[32;41m"
     end
   end
 

data/spec/theme_spec.rb

@@ -128,7 +128,7 @@ describe PryTheme::Theme do
 
         it "defaults to proper colours" do
           theme = PryTheme.create(:color_model => 8){ define_theme{} }
-          theme.definition.integer.to_ansi.should == '39;49'
+          theme.definition.integer.to_ansi.should == "\e[39;49m"
         end
       end
 
@@ -156,7 +156,7 @@ describe PryTheme::Theme do
 
         it "defaults to proper colours" do
           theme = PryTheme.create(:color_model => 16){ define_theme{} }
-          theme.definition.integer.to_ansi.should == '39;49'
+          theme.definition.integer.to_ansi.should == "\e[39;49m"
         end
       end
 
@@ -184,7 +184,7 @@ describe PryTheme::Theme do
 
         it "defaults to proper colours" do
           theme = PryTheme.create(:color_model => 256){ define_theme{} }
-          theme.definition.integer.to_ansi.should == '0'
+          theme.definition.integer.to_ansi.should == "\e[0m"
         end
 
         describe "effects" do
@@ -297,10 +297,10 @@ describe PryTheme::Theme do
           string{ self_ 'green'; delimiter 'black' } } }
       theme.definition.regexp.self_.foreground(true).should == 'blue'
       theme.definition.string.self_.foreground(true).should == 'green'
-      theme.definition.regexp.modifier.to_ansi.should == '39;49'
+      theme.definition.regexp.modifier.to_ansi.should == "\e[39;49m"
       theme.definition.string.delimiter.foreground(true).should == 'black'
-      theme.definition.regexp.delimiter.to_ansi.should == '39;49'
-      theme.definition.shell.delimiter.to_ansi.should == '39;49'
+      theme.definition.regexp.delimiter.to_ansi.should == "\e[39;49m"
+      theme.definition.shell.delimiter.to_ansi.should == "\e[39;49m"
     end
   end
 
@@ -433,41 +433,41 @@ describe PryTheme::Theme do
   describe "#to_coderay" do
     before do
       @coderay_hash = {
-        :class => '48;5;118',
-        :class_variable => '0',
-        :comment => '0',
-        :constant => '0',
-        :error => '0',
-        :float => '0',
-        :global_variable => '38;5;81;4',
-        :integer => '38;5;64;48;5;208',
-        :inline_delimiter => '0',
-        :instance_variable => '0',
-        :keyword => '0',
-        :method => '0',
-        :predefined_constant => '0',
-        :symbol => '0',
+        :class => "\e[48;5;118m",
+        :class_variable => "\e[0m",
+        :comment => "\e[0m",
+        :constant => "\e[0m",
+        :error => "\e[0m",
+        :float => "\e[0m",
+        :global_variable => "\e[38;5;81;4m",
+        :integer => "\e[38;5;64;48;5;208m",
+        :inline_delimiter => "\e[0m",
+        :instance_variable => "\e[0m",
+        :keyword => "\e[0m",
+        :method => "\e[0m",
+        :predefined_constant => "\e[0m",
+        :symbol => "\e[0m",
         :regexp => {
-          :self => '0',
-          :char => '0',
-          :content => '0',
-          :delimiter => '0',
-          :modifier => '38;5;148',
-          :escape => '0',
+          :self => "\e[0m",
+          :char => "\e[0m",
+          :content => "\e[0m",
+          :delimiter => "\e[0m",
+          :modifier => "\e[38;5;148m",
+          :escape => "\e[0m",
         },
         :shell => {
-          :self => '0',
-          :char => '0',
-          :content => '0',
-          :delimiter => '0',
-          :escape => '0',
+          :self => "\e[0m",
+          :char => "\e[0m",
+          :content => "\e[0m",
+          :delimiter => "\e[0m",
+          :escape => "\e[0m",
         },
         :string => {
-          :self => '38;5;186',
-          :char => '0',
-          :content => '0',
-          :delimiter => '0',
-          :escape => '0',
+          :self => "\e[38;5;186m",
+          :char => "\e[0m",
+          :content => "\e[0m",
+          :delimiter => "\e[0m",
+          :escape => "\e[0m",
         }
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kyrylo Silin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json