pry-theme 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 Pry Theme changelog
 ===================
 
+### v0.0.8 (July 02, 2012)
+
+* **IMPORTANT**: Changed directory where to store themes! Themes now live in
+  `$HOME/.pry/themes` directory on Mac OS and GNU/Linux, both. Do not forget
+  to delete or move your themes form the old path (On Mac OS it is
+  `$HOME/Library/Application Support/pry-theme` and on GNU/Linux it is
+  `$HOME/.pry/themes`).
+* On some operating systems Pry Theme was failing to detect correct config path.
+  Fixed.
+* Fixed wrong behaviour, when uninstalling an unrelated gem. Pry Theme asked to
+  uninstall themes every time you wanted to uninstall _any_ gem.
+* Fixed a typo in `pry-classic` theme, which was preventing to set `delimiter`
+  parameter to a string.
+* Fixed wrong convertation of theme files.
+* Implemented `--list` (`-l`) option, which displays a list of all installed
+  themes.
+
 ### v0.0.7 (June 30, 2012)
 
 * **HOTFIX**: v0.0.6 is broken (because of my inattentiveness).

data/README.md

@@ -58,13 +58,9 @@ Creating new themes isn't hard. [Check out Pry Theme Wiki article on that][new_t
 Theme files must have `.prytheme` extension. Check out [Pry Theme Collection][ptc],
 if you want to find some themes other than default ones.
 
-* On GNU/Linux
+* On GNU/Linux and Mac OS
 
-    Put your theme file in `$XDG_CONFIG_HOME/pry-theme` directory. 
-
-* On Mac OS
-
-    Put your theme file in `$HOME/Library/Application Support/pry-theme` directory. 
+    Put your theme file in `$HOME/.pry/themes` directory.
 
 And don't forget to adjust your `.pryrc`!
 

data/examples/pry-classic.prytheme

@@ -1,7 +1,7 @@
 ---
 meta:
   theme-name  : pry-classic
-  version     : 1
+  version     : 2
   color-depth : 8
   description : Based on Kornelius Kalnbach's default CodeRay's color theme.
   author      : Kyrylo Silin <kyrylosilin@gmail.com>
@@ -33,5 +33,5 @@ theme:
     self              : green
     modifier          : green (b)
     escape            : cyan (b)
-    delimite          : green (b)
+    delimiter         : green (b)
   symbol              : green (b)

data/lib/pry-theme/commands.rb

@@ -2,6 +2,7 @@ module PryTheme
   Commands = Pry::CommandSet.new do
 
     create_command "pry-theme", "Manage your Pry themes." do
+      include PryTheme::Helper
 
       banner <<-BANNER
         Usage: pry-theme [OPTIONS] [--help]
@@ -22,6 +23,10 @@ module PryTheme
 
           pry-theme -t
 
+        Show a list with currently installed themes
+
+          pry-theme --list
+
         Wiki: https://github.com/kyrylo/pry-theme/wiki/Pry-Theme-CLI
       BANNER
 
@@ -29,6 +34,7 @@ module PryTheme
         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 with all available themes", :argument => false
       end
 
       def process
@@ -38,6 +44,8 @@ module PryTheme
           show_specific_color
         elsif opts.t?
           test_theme
+        elsif opts.l?
+          show_list
         elsif args[0] =~ /\A\w+-?\w+\z/
           switch_to_theme
         end
@@ -108,6 +116,30 @@ end
 
         output.puts colorize_code(example)
       end
+
+      def show_list
+        old_theme = PryTheme.current_theme.dup
+
+        each_theme_in(THEME_DIR) do |theme, index, all_themes_num|
+          theme.sub!(/\.prytheme\z/, "")
+          PryTheme.set_theme(theme)
+
+          chunk = <<-CHUNK
+class PickMe
+  def please
+    @i, @@beg, you = 10_000, 400.00, "please!"
+  end
+end
+          CHUNK
+
+          output.puts "\e[038;0;1m[#{theme}]\e[0m#{ " *" if theme == old_theme }"
+          output.puts "---"
+          output.puts colorize_code(chunk)
+          output.puts unless index+1 == all_themes_num
+        end
+      ensure
+        PryTheme.set_theme(old_theme)
+      end
     end
 
   end

data/lib/pry-theme/helper.rb

@@ -0,0 +1,14 @@
+module PryTheme
+  module Helper
+
+    def each_theme_in(dir, &block)
+      themes = Dir.entries(dir) - %w{ . .. }
+      n = themes.size
+
+      themes.each_with_index do |theme, index|
+        yield(theme, index, n)
+      end
+    end
+
+  end
+end

data/lib/pry-theme/version.rb

@@ -1,3 +1,3 @@
 module PryTheme
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/pry-theme/when_started_hook.rb

@@ -2,18 +2,18 @@ require 'fileutils'
 
 module PryTheme
   class WhenStartedHook
+    include PryTheme::Helper
 
     def call(target, options, _pry_)
-      Dir.mkdir(THEME_DIR) unless File.exists?(THEME_DIR)
+      FileUtils.mkdir_p(THEME_DIR) unless File.exists?(THEME_DIR)
 
-      (Dir.entries(EXAMPLES_ROOT) - %w{ . .. }).each do |f|
-        unless File.exists?(File.join(THEME_DIR, f))
-          FileUtils.cp(File.join(EXAMPLES_ROOT, f), THEME_DIR)
+      each_theme_in(EXAMPLES_ROOT) do |theme, _, _|
+        unless File.exists?(File.join(THEME_DIR, theme))
+          FileUtils.cp(File.join(EXAMPLES_ROOT, theme), THEME_DIR)
         end
       end
 
-      theme_name = Pry.config.theme || "pry-classic"
-      PryTheme.set_theme(theme_name)
+      PryTheme.set_theme(Pry.config.theme)
     end
 
   end

data/lib/pry-theme.rb

@@ -1,4 +1,5 @@
 require 'pry-theme/version'
+require 'pry-theme/helper'
 require 'pry-theme/commands'
 require 'pry-theme/palette'
 require 'pry-theme/theme'
@@ -18,23 +19,31 @@ module PryTheme
 
   # The root path for the directory with configuration files for OS you're using.
   CONFIG_DIR = case RbConfig::CONFIG["host_os"]
-               when /darwin/
-                 File.join(ENV["HOME"], "Library", "Application Support")
-               when /linux/
-                 ENV["XDG_CONFIG_HOME"]
                when /mingw|mswin/
-                 ENV["APPDATA"]
+                 File.join(ENV["APPDATA"], "pry-theme")
+               else
+                 # /darwin|linux/ and friends.
+                 File.join(ENV["HOME"], ".pry")
                end
 
   # Pry themes' directory.
-  THEME_DIR = File.join(CONFIG_DIR, "pry-theme")
+  THEME_DIR = File.join(CONFIG_DIR, "themes")
+
+  # The name of the default theme of Pry Theme.
+  DEFAULT_THEME_NAME = "pry-classic"
 
   def self.set_theme(theme_name)
-    if theme = PryTheme.convert(theme_name)
+    theme = PryTheme.convert(theme_name)
+    if theme ||= PryTheme.convert(theme_name = DEFAULT_THEME_NAME)
       ::CodeRay::Encoders::Terminal::TOKEN_COLORS.merge!(theme)
+      @current_theme = theme_name
     end
   end
 
+  def self.current_theme
+    @current_theme
+  end
+
   def self.convert(theme_name)
     begin
       theme = Theme.new(theme_name)
@@ -124,11 +133,11 @@ module PryTheme
 
       # Uh oh :(
       notation = if !color_fg
-                   "38;0;"
+                   "38;0"
                  elsif palette.notation
                    palette.notation[0..-2]
                  else
-                   ""
+                   nil
                  end
 
       [notation, color_fg, formatting, color_bg].flatten.compact.join(";")
@@ -144,7 +153,7 @@ module PryTheme
 
   def self.install_gem_hooks
     Gem.post_uninstall do |u|
-      Uninstaller.run(u)
+      Uninstaller.run(u) if u.spec.name == "pry-theme"
     end
   end
 

data/lib/rubygems_plugin.rb

@@ -1,4 +1,9 @@
-require 'pry'
-require 'pry-theme'
+begin
+  require 'pry'
+  require 'pry-theme'
+
+  PryTheme.install_gem_hooks
+rescue LoadError
+  # Be silent, when we can't load Pry (when it's uninstalled).
+end
 
-PryTheme.install_gem_hooks

data/pry-theme.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version      = PryTheme::VERSION
   s.date         = Time.now.strftime('%Y-%m-%d')
   s.summary      = "Easy way to customize your Pry colors"
-  s.description  = "The plugin enables color theme for your Pry. No more pryrc bustling."
+  s.description  = "The plugin enables color theme support for your Pry. No more .pryrc bustling."
   s.author       = "Kyrylo Silin"
   s.email        = "kyrylosilin@gmail.com"
   s.homepage     = "https://github.com/kyrylo/pry-theme"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -27,7 +27,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-description: The plugin enables color theme for your Pry. No more pryrc bustling.
+description: The plugin enables color theme support for your Pry. No more .pryrc bustling.
 email: kyrylosilin@gmail.com
 executables: []
 extensions: []
@@ -41,6 +41,7 @@ files:
 - examples/pry-modern.prytheme
 - lib/pry-theme.rb
 - lib/pry-theme/commands.rb
+- lib/pry-theme/helper.rb
 - lib/pry-theme/palette.rb
 - lib/pry-theme/theme.rb
 - lib/pry-theme/uninstaller.rb