pry-theme 0.0.4.pre → 0.0.5

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 Pry Theme changelog
 ===================
 
+### v0.0.5.pre (June 29, 2012)
+
+* 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 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
+* 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)
+
 ### v0.0.4.pre (June 28, 2012)
 
 * Added `--all-colors` and `--color` options for `pry-theme` command;

data/README.md

@@ -1,6 +1,7 @@
 ![Pry Theme][logo]
 
-* [https://github.com/kyrylo/pry-theme/][pt]
+* Repository: [https://github.com/kyrylo/pry-theme/][pt]
+* Wiki: [https://github.com/kyrylo/pry-theme/wiki][wiki]
 
 Description
 -----------
@@ -14,7 +15,7 @@ Installation
 All you need is to install the gem. The `pry-theme` plugin will be detected and
 used automatically.
 
-    gem install pry-theme --pre
+    gem install pry-theme
 
 Synopsis
 --------
@@ -46,13 +47,16 @@ fly:
 
 This will switch your current theme to `pry-classic`.
 
+You can find [more information about CLI in Pry Theme Wiki][cli].
+
 ### Creating themes
 
-It's not easy now, so let's just skip this paragraph :P
+Creating new themes isn't hard. [Check out Pry Theme Wiki article on that][new_theme].
 
 ### Adding new themes
 
-Theme files must have `.prytheme` extension.
+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
 
@@ -68,20 +72,24 @@ Limitations
 -----------
 
 Basically, it will run on any terminal that is capable of displaying 256 colors,
-but with a couple of admonishments.
+but with a couple of admonishments. They are listed below.
 
 ### OS support
 
 * GNU/Linux;
 * Mac OS (I hope so, leastwise);
 
-I don't plan to support Windows, because I can't even find a sane terminal for
-it. Sorry, Windows guys. If want me to change my mind, you have to file an
-issue.
+I hope it runs on Windows too, but I couldn't find any sane terminal, that
+would support 256 colors. Sorry, Windows guys. Please, file an issue, if you
+noticed bugs or something.
 
 ### Ruby versions
 
-* CRuby 1.9.3 (in future will support other implementations).
+* MRI 1.9.3
+* MRI 1.9.2
+* MRI 1.8.7
+* REE 1.8.7-2012.02
+* JRuby 1.6.7
 
 Under the hood
 --------------
@@ -97,3 +105,7 @@ The project uses Zlib License. See LICENSE file for more information.
 [pt]: https://github.com/kyrylo/pry-theme/ "Home page"
 [logo]: http://img-fotki.yandex.ru/get/5107/98991937.a/0_7c6c8_871a1842_orig "Pry Theme"
 [pry]: https://github.com/pry/pry/ "Pry's home page"
+[new_theme]: https://github.com/kyrylo/pry-theme/wiki/Creating-a-New-Theme
+[cli]: https://github.com/kyrylo/pry-theme/wiki/Pry-Theme-CLI
+[wiki]: https://github.com/kyrylo/pry-theme/wiki
+[ptc]: https://github.com/kyrylo/pry-theme-collection

data/lib/pry-theme/commands.rb

@@ -4,43 +4,111 @@ module PryTheme
     create_command "pry-theme", "Manage your Pry themes." do
 
       banner <<-BANNER
-        Usage: pry-theme [OPTIONS]
+        Usage: pry-theme [OPTIONS] [--help]
 
         Change your theme on the fly.
-        e.g.: pry-theme pry-modern
-        e.g.: pry-theme pry-classic
-        e.g.: pry-theme --all-colors 8
+
+          pry-theme pry-modern
+
+        Display 8-color palette.
+
+          pry-theme --all-colors 8
+
+        Display Pry Theme code for terminal color 34.
+
+          pry-theme -c 34
+
+        Test your current color theme.
+
+          pry-theme -t
+
+        Wiki: https://github.com/kyrylo/pry-theme/wiki/Pry-Theme-CLI
       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
       end
 
       def process
-        return if args.empty?
-
         if opts.a?
-          output.puts Palette.new(args[0]).to_s
+          show_palette_colors
         elsif opts.c?
-          unless args[0] =~ /\A(\d{1,3})\z/ && (0...256).include?($1.to_i)
-            raise NoColorError, "Invalid color number: #{ args[0] }"
-          end
-
-          pal = Palette.new(256)
-          color = pal.colors.detect { |c| c.term == args[0].to_i }
-
-          if color
-            output.puts color.to_term(pal.notation)
-          end
-        else
-          PryTheme.set_theme(args[0].strip) and output.puts "Using #{ args[0] } theme"
+          show_specific_color
+        elsif opts.t?
+          test_theme
+        elsif args[0] =~ /\A\w+-?\w+\z/
+          switch_to_theme
         end
       rescue NoPaletteError => no_palette_error
         warn no_palette_error
       rescue NoColorError => no_color_error
         warn no_color_error
       end
+
+      private
+
+      def switch_to_theme
+        PryTheme.set_theme(args[0].strip) and
+        output.puts "Using #{ args[0] } theme"
+      end
+
+      def show_palette_colors
+        output.puts Palette.new(args[0]).to_s
+      end
+
+      def show_specific_color
+        unless args[0] =~ /\A(\d{1,3})\z/ && (0...256).include?($1.to_i)
+          raise NoColorError, "Invalid color number: #{ args[0] }"
+        end
+
+        pal = Palette.new(256)
+        color = pal.colors.detect { |c| c.term == args[0].to_i }
+
+        if color
+          output.puts color.to_term(pal.notation)
+        end
+      end
+
+      def test_theme
+        example = <<-TEST
+# Time for testing your colors!
+module PryTheme
+  module JustTesting
+
+    THIS_IS_CONSTANT = :this_is_symbol
+
+    class ThisIsClass
+
+      def this_is_method
+        this_is_float   = 10_000.00
+        this_is_integer = 10_000
+
+        "this_is_string"
+        'this is another string'
+
+        @@this_is_class_variable
+
+        `echo 'Hello, hi, from "system" call!'`
+
+        $ # <-- The dollar is an error!
+
+        /[0-9]{1,3}this is regexp\\w+/xi
+        $1 or $2 or $3333
+
+        nil
+        self
+      end
+
+    end
+  end
+end
+# Testing complete.
+        TEST
+
+        output.puts colorize_code(example)
+      end
     end
 
   end

data/lib/pry-theme/theme.rb

@@ -7,7 +7,7 @@ module PryTheme
       theme_file = File.join(THEME_DIR, "#{theme_filename}.prytheme")
 
       if File.exists?(theme_file)
-        theme = Psych.load_file(theme_file)
+        theme = YAML.load_file(theme_file)
       else
         raise NoThemeError, "#{theme_filename}.prytheme doesn't exist"
       end

data/lib/pry-theme/uninstaller.rb

@@ -0,0 +1,20 @@
+require 'fileutils'
+
+module PryTheme
+  module Uninstaller
+
+    def self.run(u)
+      puts "Do you wish to delete #{THEME_DIR} directory with all Pry themes?"
+      print "(y/n): "
+
+      case $stdin.gets.chomp
+      when "y"
+        FileUtils.rm_rf(THEME_DIR)
+        puts "Successfully deleted #{THEME_DIR} and all Pry themes."
+      else
+        puts "Nothing deleted. You can manually delete the directory."
+      end
+    end
+
+  end
+end

data/lib/pry-theme/version.rb

@@ -1,3 +1,3 @@
 module PryTheme
-  VERSION = "0.0.4.pre"
+  VERSION = "0.0.5"
 end

data/lib/pry-theme/when_started_hook.rb

@@ -4,7 +4,7 @@ module PryTheme
   class WhenStartedHook
 
     def call(target, options, _pry_)
-      Dir.mkdir(THEME_DIR) unless Dir.exists?(THEME_DIR)
+      Dir.mkdir(THEME_DIR) unless File.exists?(THEME_DIR)
 
       (Dir.entries(EXAMPLES_ROOT) - %w{ . .. }).each do |f|
         unless File.exists?(File.join(THEME_DIR, f))

data/lib/pry-theme.rb

@@ -3,8 +3,10 @@ require 'pry-theme/commands'
 require 'pry-theme/palette'
 require 'pry-theme/theme'
 require 'pry-theme/when_started_hook'
+require 'pry-theme/uninstaller'
+
 require 'pry'
-require 'psych'
+require 'yaml'
 
 module PryTheme
 
@@ -67,7 +69,7 @@ module PryTheme
 
                       # Matches "yellow".
                       (
-                        (?<fg>
+                        (
                           \w+(0[1-9])?
                         )
                         \s?
@@ -76,7 +78,7 @@ module PryTheme
                       # Matches "yellow (bu)" or "(bu)".
                       (
                         \(
-                          (?<attrs>
+                          (
                             d?b?u?i? # Order matters.
                           )
                         \)
@@ -87,32 +89,42 @@ module PryTheme
                       (
                         \s?
                         on\s
-                        (?<bg>
+                        (
                           [a-z]+(0[1-9])?
                         )
                       )?
 
                       \z
                     /x
-    m = color.match(color_pattern)
 
-    color_fg   = if m[:fg]
-                   palette.colors.find do |color|
-                     color.human == m[:fg].to_sym
-                   end.term
-                 end
+    if color
+      m = color.match(color_pattern)
+
+      color_fg   = if $2
+                     palette.colors.find do |color|
+                       color.human == $2.to_sym
+                     end.term
+                   end
+
+      formatting = if $5
+                     formatting = $5.each_char.map do |ch|
+                       Formatting::ATTRIBUTES[ch]
+                     end
+                   end
 
-    formatting = if m[:attrs]
-                   formatting = m[:attrs].each_char.map do |ch|
-                     Formatting::ATTRIBUTES[ch]
+      color_bg   = if $7
+                     Formatting::BACKGROUNDS[$7]
                    end
-                 end
 
-    color_bg   = if m[:bg]
-                   Formatting::BACKGROUNDS[m[:bg]]
-                 end
+      notation = palette.notation ? palette.notation[0..-2] : ""
+      [notation, color_fg, formatting, color_bg].flatten.compact.join(";")
+    end
+  end
 
-    [palette.notation[0..-2], color_fg, formatting, color_bg].flatten.compact.join(";")
+  def self.install_gem_hooks
+    Gem.post_uninstall do |u|
+      Uninstaller.run(u)
+    end
   end
 
 end

data/lib/rubygems_plugin.rb

@@ -0,0 +1,4 @@
+require 'pry'
+require 'pry-theme'
+
+PryTheme.install_gem_hooks

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
-  prerelease: 6
+  version: 0.0.5
+  prerelease: 
 platform: ruby
 authors:
 - Kyrylo Silin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -43,8 +43,10 @@ files:
 - lib/pry-theme/commands.rb
 - lib/pry-theme/palette.rb
 - lib/pry-theme/theme.rb
+- lib/pry-theme/uninstaller.rb
 - lib/pry-theme/version.rb
 - lib/pry-theme/when_started_hook.rb
+- lib/rubygems_plugin.rb
 - pry-theme.gemspec
 homepage: https://github.com/kyrylo/pry-theme
 licenses:
@@ -62,9 +64,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23