pry-theme 0.0.9 → 0.0.10

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 Pry Theme changelog
 ===================
 
+### v0.0.10 (July 07, 2012)
+
+* Themes can use any color from 256-color palette as background color. Before
+  this release you could use only 8 colors;
+* Changed command flag `--list --remote` to `--remote-list`. Now, to get a list
+  of themes from Pry Theme Collection, you type `pry-theme -r` or
+  `pry-theme --remote-list` instead of `pry-theme -lr`;
+* Limited theme descriptions to 80 characters;
+* Added "content" subparameter for "string" parameter (`.prytheme` syntax).
+* Changed the appearance of output from `pry-theme --all-colors` command, so it
+  displays data in 3 columns instead of 1;
+* Changed some colors of Railscasts and Tomorrow themes;
+* Fixed bug when a user installs fresh gem and gets an improper warning, because
+  `Pry.config.theme` is not defined. Added a proper notification message for
+  such situations;
+* Renamed default theme `charcoal-black` to `pry-cold` (they are not the same).
+
 ### v0.0.9 (July 05, 2012)
 
 * **HOT**: Added `--install` flag. Now, you can easily install Pry themes from

data/README.md

@@ -9,6 +9,11 @@ Description
 Pry Theme is a plugin for [Pry][pry], which helps you to customize your Pry
 colors via `prytheme` files.
 
+![Railscasts](/kyrylo/pry-theme/raw/master/screenshots/railscasts.png)
+![Solarized](/kyrylo/pry-theme/raw/master/screenshots/solarized.png)
+![Tomorrow](/kyrylo/pry-theme/raw/master/screenshots/tomorrow.png)
+![Zenburn](/kyrylo/pry-theme/raw/master/screenshots/zenburn.png)
+
 Installation
 ------------
 
@@ -23,9 +28,8 @@ Synopsis
 ### Theme files
 
 Theme file is a valid YAML file, which has `.prytheme` extension (for example,
-`beautiful.prytheme`). Pry Theme ships only with two themes: `pry-classic` and
-`pry-modern`. In order to set up the desired theme, add the following line into
-your `.pryrc`:
+`beautiful.prytheme`). In order to set up the desired theme, add the following
+line into your `.pryrc`:
 
     Pry.config.theme = "theme-name"
 
@@ -101,7 +105,9 @@ Credits
 -------
 
 * Thanks to [banister][johndogg] for bringing the plugin in masses and
-  contributing a bunch of themes.
+  contributing a bunch of themes;
+* Thanks to Karandashev for "Puzzle" font;
+* Thanks to Creatica for "Dited" font.
 
 License
 -------

data/lib/pry-theme.rb

@@ -6,7 +6,6 @@ require 'pry-theme/theme'
 require 'pry-theme/when_started_hook'
 require 'pry-theme/uninstaller'
 
-require 'pry'
 require 'yaml'
 
 module PryTheme
@@ -15,7 +14,7 @@ module PryTheme
   ROOT = File.expand_path(File.dirname(__FILE__))
 
   # The root path for PryTheme examples.
-  EXAMPLES_ROOT = File.join(ROOT, "..", "examples")
+  EXAMPLES_ROOT = File.join(ROOT, "..", "themes")
 
   # The root path for the directory with configuration files for OS you're using.
   CONFIG_DIR = case RbConfig::CONFIG["host_os"]
@@ -51,6 +50,10 @@ module PryTheme
     rescue NoThemeError => no_theme_error
       warn no_theme_error
       return
+    rescue ThemeDescriptionError => long_descr
+      Pry.output.puts long_descr
+      Pry.output.puts "Using #{DEFAULT_THEME_NAME} theme."
+      return
     end
 
     palette = Palette.new(theme.color_depth)
@@ -100,7 +103,7 @@ module PryTheme
                         \s?
                         on\s
                         (
-                          [a-z]+(0[1-9])?
+                          \w+(0[1-9])?
                         )
                       )?
 
@@ -110,17 +113,7 @@ module PryTheme
     if color
       m = color.match(color_pattern)
 
-      color_fg   = if $2
-                     c = palette.colors.find do |color|
-                       color.human == $2.to_sym
-                     end
-
-                     if c
-                       c.term
-                     else
-                       raise NoColorError
-                     end
-                   end
+      color_fg   = find_color($2, palette) { |c| c.term }
 
       formatting = if $5
                      formatting = $5.each_char.map do |ch|
@@ -128,8 +121,12 @@ module PryTheme
                      end
                    end
 
-      color_bg   = if $7
-                     Formatting::BACKGROUNDS[$7]
+      color_bg   = find_color($7, palette) do |c|
+                     if palette.color_depth == 256
+                       "48;5;#{c.term}"
+                      else
+                        Formatting::BACKGROUNDS[c.human.to_s]
+                     end
                    end
 
       # Uh oh :(
@@ -149,7 +146,7 @@ module PryTheme
       "38;0;0"
     end
   rescue NoColorError => e
-    Pry.output.puts "#{e}: wrong color value: `#{$2}`. Typo?"
+    Pry.output.puts "#{e}: wrong color value: `#{color}`. Typo?"
   end
 
   def self.install_gem_hooks
@@ -158,6 +155,20 @@ module PryTheme
     end
   end
 
+  def self.find_color(color, palette, &block)
+    if color
+      c = palette.colors.find do |palette_color|
+        palette_color.human == color.to_sym
+      end
+
+      if c
+        block.call(c)
+      else
+        raise NoColorError
+      end
+    end
+  end
+
 end
 
 # Apply a theme of a user from their theme file.

data/lib/pry-theme/commands.rb

@@ -17,7 +17,7 @@ module PryTheme
 
         Show all themes from Pry Theme Collection.
 
-          pry-theme -lr
+          pry-theme -r
 
         Install a theme from Pry Theme Collection.
 
@@ -31,12 +31,12 @@ module PryTheme
       BANNER
 
       def options(opt)
-        opt.on :a, "all-colors", "Show all available 8/256 colors."
-        opt.on :c, "color",      "Show information about a specific color (256)."
-        opt.on :t, "test",       "Test your current theme", :argument => false
-        opt.on :l, "list",       "Show a list of installed themes", :argument => false
-        opt.on :r, "remote",     "Show a list of themes from Pry Theme Collection", :argument => false
-        opt.on :i, "install",    "Install a theme from Pry Theme Collection"
+        opt.on :a, "all-colors",  "Show all available 8/256 colors."
+        opt.on :c, "color",       "Show information about a specific color (256)."
+        opt.on :t, "test",        "Test your current theme", :argument => false
+        opt.on :l, "list",        "Show a list of installed themes", :argument => false
+        opt.on :r, "remote-list", "Show a list of themes from Pry Theme Collection", :argument => false
+        opt.on :i, "install",     "Install a theme from Pry Theme Collection"
       end
 
       def process
@@ -47,7 +47,9 @@ module PryTheme
         elsif opts.t?
           test_theme
         elsif opts.l?
-          opts.r? ? show_remote_list : show_list
+          show_list
+        elsif opts.r?
+          show_remote_list
         elsif opts.i?
           install_theme
         elsif args[0] =~ /\A\w+-?\w+\z/
@@ -69,7 +71,22 @@ module PryTheme
       end
 
       def show_palette_colors
-        lputs Palette.new(args[0]).to_a.join("\n")
+        lputs in_columns(Palette.new(args[0]).to_a)
+      end
+
+      def in_columns(list, cols=3)
+        color_table = []
+
+        list.each_slice(cols) do |slice|
+          slice.each do |c|
+            color = c.scan(/(\e\[[[0-9];]+m)(\w+)(\e\[0m)(:)(\e\[[[0-9];]+m)(\w+)(\e\[0m)/).flatten
+            color[1] = color[1].ljust(3)
+            color[-2] = color[-2].ljust(22)
+            color_table << color
+          end
+          color_table << "\n"
+        end
+        color_table.join
       end
 
       def show_specific_color
@@ -117,7 +134,7 @@ module PryTheme
     end
   end
 end
-# Testing "#{PryTheme.current_theme}" theme complete.
+# "#{PryTheme.current_theme}" theme.
         TEST
 
         lputs colorize_code(example)

data/lib/pry-theme/theme.rb

@@ -17,7 +17,14 @@ module PryTheme
       @name        = meta["theme-name"]
       @version     = meta["version"]
       @color_depth = meta["color-depth"].to_i
-      @description = meta["description"]
+
+      # Forbid too long descriptions.
+      if @description = meta["description"]
+        if (size = @description.size) > 80
+          raise ThemeDescriptionError, "Description of #{name} theme is too long (#{size}). Max size is 80 characters."
+        end
+      end
+
       @author      = meta["author"]
       @scheme      = theme["theme"]
     end
@@ -33,4 +40,5 @@ module PryTheme
   end
 
   class NoThemeError < StandardError; end
+  class ThemeDescriptionError < StandardError; end
 end

data/lib/pry-theme/version.rb

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

data/lib/pry-theme/when_started_hook.rb

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

data/pry-theme.gemspec

@@ -1,5 +1,4 @@
 require './lib/pry-theme/version'
-
 Gem::Specification.new do |s|
   s.name         = "pry-theme"
   s.version      = PryTheme::VERSION

data/{examples → themes}/github.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : github
-  version     : 2
+  version     : 3
   color-depth : 256
   description : Based on github theme
   author      : John Mair
@@ -31,6 +31,7 @@ theme:
     delimiter         : gray02
   string:
     self              : alizarin
+    content           : alizarin
     modifier          : alizarin
     escape            : alizarin
     delimiter         : alizarin

data/{examples → themes}/monokai.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : monokai
-  version     : 1
+  version     : 2
   color-depth : 256
   description : Based on Wimer Hazenberg's theme
   author      : Kyrylo Silin <kyrylosilin@gmail.com>
@@ -31,6 +31,7 @@ theme:
     delimiter         : flax
   string:
     self              : flax
+    content           : flax
     modifier          : flax
     escape            : flax
     delimiter         : flax

data/{examples → themes}/pry-classic.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : pry-classic
-  version     : 3
+  version     : 4
   color-depth : 8
   description : Default Pry theme
   author      : Kyrylo Silin <kyrylosilin@gmail.com>, Kornelius Kalnbach
@@ -31,6 +31,7 @@ theme:
     delimiter         : white
   string:
     self              : green
+    content           : green
     modifier          : green (b)
     escape            : cyan (b)
     delimiter         : green (b)

data/{examples/charcoal-black.prytheme → themes/pry-cold.prytheme}

@@ -1,17 +1,18 @@
 ---
 meta:
-  theme-name  : charcoal-black
-  version     : 3
+  theme-name  : pry-cold
+  version     : 1
   color-depth : 256
   description : Based on Charcoalblack theme from Emacs
-  author      : John Mair
+  author      : John Mair,
+                Kyrylo Silin <kyrylosilin@gmail.com>
 
 theme:
   class               : robin_egg_blue02 (b)
   class_variable      : pale_blue03 (b)
   comment             : light_grey03
   constant            : robin_egg_blue02 (b)
-  error               : tenne (i)
+  error               : robin_egg_blue02 (bi)
   float               : silver01
   global_variable     : robin_egg_blue02
   instance_variable   : pale_blue03
@@ -20,17 +21,18 @@ theme:
   method              : royal_blue05
   predefined_constant : robin_egg_blue02 (b)
   regexp:
-    self              : alizarin
-    content           : alizarin
-    delimiter         : alizarin
-    modifier          : alizarin
-    function          : alizarin
+    self              : bluish03
+    content           : bluish03
+    delimiter         : gray02
+    modifier          : gray02
+    function          : gray02
   shell:
     self              : puce01
     content           : puce01
     delimiter         : gray02
   string:
     self              : bluish03
+    content           : bluish03
     modifier          : bluish03
     escape            : bluish03
     delimiter         : bluish03

data/{examples → themes}/pry-modern.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : pry-modern
-  version     : 2
+  version     : 3
   color-depth : 256
   description : Nifty version of pry-classic
   author      : Kyrylo Silin <kyrylosilin@gmail.com>
@@ -31,6 +31,7 @@ theme:
     delimiter         : white
   string:
     self              : malachite01
+    content           : malachite01
     modifier          : malachite01 (b)
     escape            : cyan (b)
     delimiter         : malachite01 (b)

data/themes/railscasts.prytheme

@@ -0,0 +1,40 @@
+---
+meta:
+  theme-name  : railscasts
+  version     : 6
+  color-depth : 256
+  description : RailsCasts theme
+  author      : Ryan Fitzgerald,
+                John Mair,
+                Kyrylo Silin <kyrylosilin@gmail.com>
+
+theme:
+  class               : (d)
+  class_variable      : robin_egg_blue03
+  comment             : tan
+  constant            : (d)
+  error               : white on maroon
+  float               : asparagus
+  global_variable     : robin_egg_blue03
+  instance_variable   : robin_egg_blue03
+  integer             : asparagus
+  keyword             : international_orange
+  method              : mustard02
+  predefined_constant : robin_egg_blue03
+  regexp:
+    self              : orange
+    content           : asparagus
+    delimiter         : asparagus
+    modifier          : asparagus
+    function          : asparagus
+  shell:
+    self              : asparagus
+    content           : asparagus
+    delimiter         : asparagus
+  string:
+    self              : asparagus
+    content           : asparagus
+    modifier          : asparagus
+    escape            : asparagus
+    delimiter         : asparagus
+  symbol              : cornflower_blue01

data/{examples → themes}/saturday.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : saturday-night
-  version     : 4
+  version     : 5
   color-depth : 256
   description : A modification of "tommorow night"
   author      : John Mair (banisterfiend)
@@ -31,6 +31,7 @@ theme:
     delimiter         : green
   string:
     self              : old_gold
+    content           : old_gold
     modifier          : old_gold
     escape            : old_gold
     delimiter         : old_gold

data/{examples → themes}/solarized.prytheme

@@ -1,10 +1,11 @@
 ---
 meta:
   theme-name  : solarized
-  version     : 3
+  version     : 4
   color-depth : 256
   description : Precision colors for machines and people
-  author      : Kyrylo Silin <kyrylosilin@gmail.com>, Ethan Schoonover
+  author      : Kyrylo Silin <kyrylosilin@gmail.com>,
+                Ethan Schoonover
 
 theme:
   class               : dark_goldenrod
@@ -26,12 +27,13 @@ theme:
     modifier          : titian
     function          : black
   shell:
-    self              :
+    self              : robin_egg_blue01
     content           : robin_egg_blue01
     delimiter         : titian
   string:
     self              : robin_egg_blue01
-    modifier          :
-    escape            :
+    content           : robin_egg_blue01
+    modifier          : robin_egg_blue01
+    escape            : robin_egg_blue01
     delimiter         : titian
   symbol              : robin_egg_blue01

data/{examples → themes}/tomorrow.prytheme

@@ -1,19 +1,20 @@
 ---
 meta:
   theme-name  : tomorrow
-  version     : 2
+  version     : 4
   color-depth : 256
-  description : Based on Tomorrow by Chris Kempson
-  author      : John Mair
+  description : A theme should not get in your way
+  author      : John Mair,
+                Chris Kempson
 
 theme:
   class               : gold
-  class_variable      : flea_belly (b)
+  class_variable      : alizarin
   comment             : gray03
   constant            : gold
-  error               : tenne (i)
-  float               : silver01
-  global_variable     : dark_peach
+  error               : tangerine (i)
+  float               : tangerine
+  global_variable     : alizarin
   instance_variable   : alizarin
   integer             : tangerine
   keyword             : heliotrope03
@@ -31,6 +32,7 @@ theme:
     delimiter         : gray02
   string:
     self              : old_gold
+    content           : old_gold
     modifier          : old_gold
     escape            : old_gold
     delimiter         : old_gold

data/{examples → themes}/twilight.prytheme

@@ -31,6 +31,7 @@ theme:
     delimiter         : moss_green
   string:
     self              : moss_green
+    content           : moss_green
     modifier          : pale_cornflower_blue
     escape            : moss_green
     delimiter         : moss_green

data/{examples → themes}/zenburn.prytheme

@@ -1,10 +1,11 @@
 ---
 meta:
   theme-name  : zenburn
-  version     : 3
+  version     : 4
   color-depth : 256
   description : A low-contrast color scheme
-  author      : Kyrylo Silin <kyrylosilin@gmail.com>, Jani Nurminen
+  author      : Kyrylo Silin <kyrylosilin@gmail.com>,
+                Jani Nurminen
 
 theme:
   class               : dark_peach (b)
@@ -24,14 +25,15 @@ theme:
     content           : puce01
     delimiter         : gray02
     modifier          : gray02
-    function          :
+    function          : gray02
   shell:
-    self              :
+    self              : puce01
     content           : puce01
     delimiter         : gray02
   string:
     self              : puce01
-    modifier          :
-    escape            :
+    content           : puce01
+    modifier          : puce01
+    escape            : puce01
     delimiter         : gray02
   symbol              : puce01 (b)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -53,17 +53,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- examples/charcoal-black.prytheme
-- examples/github.prytheme
-- examples/monokai.prytheme
-- examples/pry-classic.prytheme
-- examples/pry-modern.prytheme
-- examples/railscasts.prytheme
-- examples/saturday.prytheme
-- examples/solarized.prytheme
-- examples/tomorrow.prytheme
-- examples/twilight.prytheme
-- examples/zenburn.prytheme
 - lib/pry-theme.rb
 - lib/pry-theme/commands.rb
 - lib/pry-theme/helper.rb
@@ -74,6 +63,21 @@ files:
 - lib/pry-theme/when_started_hook.rb
 - lib/rubygems_plugin.rb
 - pry-theme.gemspec
+- screenshots/railscasts.png
+- screenshots/solarized.png
+- screenshots/tomorrow.png
+- screenshots/zenburn.png
+- themes/github.prytheme
+- themes/monokai.prytheme
+- themes/pry-classic.prytheme
+- themes/pry-cold.prytheme
+- themes/pry-modern.prytheme
+- themes/railscasts.prytheme
+- themes/saturday.prytheme
+- themes/solarized.prytheme
+- themes/tomorrow.prytheme
+- themes/twilight.prytheme
+- themes/zenburn.prytheme
 homepage: https://github.com/kyrylo/pry-theme
 licenses:
 - zlib

data/examples/railscasts.prytheme

@@ -1,37 +0,0 @@
----
-meta:
-  theme-name  : railscasts
-  version     : 5
-  color-depth : 256
-  description : RailsCasts theme
-  author      : Ryan Fitzgerald, John Mair
-
-theme:
-  class               : red
-  class_variable      : periwinkle (b)
-  comment             : brass02
-  constant            : red
-  error               : green (u) on maroon
-  float               : lilac01
-  global_variable     : red
-  instance_variable   : periwinkle
-  integer             : cornflower_blue03
-  keyword             : international_orange (b)
-  method              : mustard02 (b)
-  predefined_constant : sky02
-  regexp:
-    self              : green
-    content           : green
-    delimiter         : green
-    modifier          : green
-    function          : green
-  shell:
-    self              : toad_in_love
-    content           : green
-    delimiter         : green
-  string:
-    self              : pistachio04
-    modifier          : robin_egg_blue01
-    escape            : old_gold
-    delimiter         : pistachio04
-  symbol              : sky02