pry-theme 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -1,21 +1,30 @@
 Pry Theme changelog
 ===================
 
-### v0.0.5.pre (June 29, 2012)
+### v0.0.6 (June 30, 2012)
 
-* Added Ruby 1.8.7, JRuby and Ruby Enterprise Edition support.
+* Fixed bug when a `prytheme` attribute has no color value, but with attributes
+  (for example, `symbol : (b)`);
+* Fixed bug when a `prytheme` has no color value at all (for example,
+  `symbol : `);
+* Add basic checking for a valid color in `prytheme`.
+
+### v0.0.5 (June 29, 2012)
+
+* No pre!
+* Added Ruby 1.8.7, JRuby and Ruby Enterprise Edition support;
 * Fixed 8-color themes bug. We could not even use them in the previous version;
-* Added `--test` command, which allows to "test" your theme visually.
+* Added `--test` command, which allows to "test" your theme visually;
 * Added uninstaller, which basically just asks a user if he or she wants to
   remove a directory with Pry themes (personally, I hate when software leave
-  their crap).
-* Slightly improved `help` of `pry-theme` command
+  their crap);
+* Slightly improved `help` of `pry-theme` command;
 * Made theme attributes optional. Now, if you are not sure about some parameter
   in a Pry Theme, you can leave it empty.
 
 Last but not least:
 
-  * Check out new Wiki! (https://github.com/kyrylo/pry-theme/wiki)
+  * Check out new Wiki! (https://github.com/kyrylo/pry-theme/wiki).
 
 ### v0.0.4.pre (June 28, 2012)
 

data/examples/pry-classic.prytheme

@@ -7,36 +7,31 @@ meta:
   author      : Kyrylo Silin <kyrylosilin@gmail.com>
 
 theme:
-  binary          : magenta (b)
-  char:
-    self          : cyan
-    delimiter     : blue (b)
-  class           : magenta (b)
-  class_variable  : cyan
-  comment         : blue
-  constant        : blue (bu)
-  doctype         : black (b)
-  error           : yellow (b) on red
-  float           : magenta (b)
-  global_variable : on green
-  hex             : cyan (b)
-  integer         : blue (b)
-  keyword         : red (b)
-  method          : blue (b)
+  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)
+    self              : red
+    content           : red
+    delimiter         : red (db)
+    modifier          : magenta (b)
+    function          : (db)
   shell:
-    self          : on green
-    content       : (db)
-    delimiter     : white
+    self              : on green
+    content           : (db)
+    delimiter         : white
   string:
-    self          : green
-    modifier      : green (b)
-    escape        : cyan (b)
-    delimiter     : green (b)
-  symbol          : green (b)
+    self              : green
+    modifier          : green (b)
+    escape            : cyan (b)
+    delimite          : green (b)
+  symbol              : green (b)

data/examples/pry-modern.prytheme

@@ -7,36 +7,31 @@ meta:
   author      : Kyrylo Silin <kyrylosilin@gmail.com>
 
 theme:
-  binary          : magenta (b)
-  char:
-    self          : cyan
-    delimiter     : blue (b)
-  class           : fuchsia (b)
-  class_variable  : robin_egg_blue04
-  comment         : cerulean_grey01
-  constant        : klein_blue (bu)
-  doctype         : black (b)
-  error           : cerulean_grey02
-  float           : dark_pink01 (b)
-  global_variable : gold
-  hex             : cyan (b)
-  integer         : robin_egg_blue01 (b)
-  keyword         : chestnut01 (b)
-  method          : grass01 (b)
+  class               : fuchsia (b)
+  class_variable      : robin_egg_blue04
+  comment             : cerulean_grey01
+  constant            : klein_blue (bu)
+  error               : cerulean_grey02
+  float               : dark_pink01 (b)
+  global_variable     : gold
+  instance_variable   : (d)
+  integer             : robin_egg_blue01 (b)
+  keyword             : chestnut01 (b)
+  method              : grass01 (b)
   predefined_constant : cyan (b)
   regexp:
-    self          : tangerine
-    content       : violaceous03
-    delimiter     : tangerine (db)
-    modifier      : dark_pink01 (b)
-    function      : (db)
+    self              : tangerine
+    content           : violaceous03
+    delimiter         : tangerine (db)
+    modifier          : dark_pink01 (b)
+    function          : (db)
   shell:
-    self          : on green
-    content       : grass01
-    delimiter     : white
+    self              : on green
+    content           : grass01
+    delimiter         : white
   string:
-    self          : malachite01
-    modifier      : malachite01 (b)
-    escape        : cyan (b)
-    delimiter     : malachite01 (b)
-  symbol          : malachite02 (b)
+    self              : malachite01
+    modifier          : malachite01 (b)
+    escape            : cyan (b)
+    delimiter         : malachite01 (b)
+  symbol              : malachite02 (b)

data/lib/pry-theme/commands.rb

@@ -86,8 +86,10 @@ module PryTheme
         this_is_integer = 10_000
 
         "this_is_string"
-        'this is another string'
 
+        TRUE or FALSE or ARGV # <-- Predefined constants
+
+        @this_is_instance_variable
         @@this_is_class_variable
 
         `echo 'Hello, hi, from "system" call!'`
@@ -96,9 +98,6 @@ module PryTheme
 
         /[0-9]{1,3}this is regexp\\w+/xi
         $1 or $2 or $3333
-
-        nil
-        self
       end
 
     end

data/lib/pry-theme/version.rb

@@ -1,3 +1,3 @@
 module PryTheme
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/pry-theme.rb

@@ -103,7 +103,13 @@ module PryTheme
       color_fg   = if $2
                      palette.colors.find do |color|
                        color.human == $2.to_sym
-                     end.term
+                     end
+
+                     if c
+                       c.term
+                     else
+                       raise NoColorError unless c
+                     end
                    end
 
       formatting = if $5
@@ -116,9 +122,24 @@ module PryTheme
                      Formatting::BACKGROUNDS[$7]
                    end
 
-      notation = palette.notation ? palette.notation[0..-2] : ""
+      # Uh oh :(
+      notation = if !color_fg
+                   "38;0;"
+                 elsif palette.notation
+                   palette.notation[0..-2]
+                 else
+                   ""
+                 end
+
       [notation, color_fg, formatting, color_bg].flatten.compact.join(";")
+    else
+      # 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"
     end
+  rescue NoColorError => e
+    Pry.output.puts "#{e}: wrong color value: `#{$2}`. Typo?"
   end
 
   def self.install_gem_hooks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry