pry-theme 0.0.10 → 0.1.0

data/.gitignore

@@ -1,2 +1,3 @@
 *~
 *.gem
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,12 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx-18mode
+  - rbx-19mode
+  - jruby
+
+branches:
+  only:
+    - master

data/CHANGELOG.md

@@ -1,6 +1,45 @@
 Pry Theme changelog
 ===================
 
+### v0.1.0 (July 23, 2012)
+
+* **HOT**: Boosted the load speed of the plugin:
+
+  Before:
+  ![Before](http://img-fotki.yandex.ru/get/6405/98991937.b/0_7f768_24d92170_orig)
+
+        % time pry -e 'exit'
+        0.75s user 0.06s system 94% cpu 0.847 total
+
+  After:
+  ![After](http://img-fotki.yandex.ru/get/6400/98991937.b/0_7f767_7c1ad4e9_orig)
+
+        % time pry -e 'exit'
+        0.69s user 0.04s system 94% cpu 0.773 total
+
+* **WARM**: added `--edit` command (`-e`). `-e` brings new experience in
+  creating themes. With this command you can create and edit themes, both. For
+  example, you can create a new theme like this: `pry-theme -e +my-theme`. Check
+  out [a wiki entry][cli] for more information;
+
+* **TEPID**: improved `--color` command (`-c`). In this version `-c` can
+  understand HEX, RGB, ANSI and human-readable colors. Interested in how to use
+  it? Check out [Pry Theme CLI][cli] article in wiki;
+
+* Added [Pry Theme Cheatsheet][cheatsheet] to Pry Theme Wiki;
+* Fixed output for `--all-colors`, `--test`, `--list` and `--remote--list`. It
+  was hard-coded to `$stdout`, so therefore, when it wasn't `$stdout`,
+  information would be printed in the wrong place;
+* Fixed duplicate colors 86:aquamarine03 and 122:aquamarine03;
+* Fixed a bug when a user doesn't specify `Pry.config.theme` and tries to run
+  `pry-theme -l`, which results in a TypeError;
+* Added two new 8-color default themes for a users with limited terminals:
+  "vim-default" and "vim-detailed";
+* Changed output for `--test`: it's more terse and concise now;
+* Changed output for `--list`, because the older one looked really silly;
+* Removed some spurious attributes for `.prytheme` files;
+* Fixed the name of theme "saturday".
+
 ### v0.0.10 (July 07, 2012)
 
 * Themes can use any color from 256-color palette as background color. Before
@@ -96,3 +135,6 @@ Last but not least:
 ### v0.0.1.pre (June 26, 2012)
 
 * Initial release.
+
+[cli]: https://github.com/kyrylo/pry-theme/wiki/Pry-Theme-CLI
+[cheatsheet]: https://github.com/kyrylo/pry-theme/wiki/Pry-Theme-Cheatsheet

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.md

@@ -107,7 +107,9 @@ Credits
 * Thanks to [banister][johndogg] for bringing the plugin in masses and
   contributing a bunch of themes;
 * Thanks to Karandashev for "Puzzle" font;
-* Thanks to Creatica for "Dited" font.
+* Thanks to Creatica for "Dited" font;
+* Thanks to [noprompt][noprompt] for a HEX to ANSI conversion Ruby
+  implementation, which I borrowed from one of his projects.
 
 License
 -------
@@ -122,3 +124,4 @@ The project uses Zlib License. See LICENSE file for more information.
 [wiki]: https://github.com/kyrylo/pry-theme/wiki
 [ptc]: https://github.com/kyrylo/pry-theme-collection
 [johndogg]: https://github.com/banister/ "John Dogg"
+[noprompt]: https://github.com/noprompt/ "Joel Holdbrooks"

data/Rakefile

@@ -0,0 +1,6 @@
+desc "Run tests"
+task :test do
+  sh "bacon -Itest --automatic --quiet"
+end
+
+task :default => :test

data/lib/pry-theme/color_converter.rb

@@ -0,0 +1,55 @@
+module PryTheme
+  module ColorConverter
+
+    extend self
+
+    COLORS = Palette.new(256).colors
+
+    def rgb_to_hex(rgb)
+      "#%02x%02x%02x" % rgb.split(",")
+    end
+
+    def rgb_to_ansi(rgb)
+      hex_to_ansi(rgb_to_hex(rgb))
+    end
+
+    def hex_to_rgb(hex)
+      if m = hex.match(/\A#?([A-F\d]{2})([A-F\d]{2})([A-F\d]{2})\z/i)
+        m.captures.map(&:hex)
+      end
+    end
+
+    def hex_to_ansi(hex)
+      rgb = hex_to_rgb(hex)
+
+      unless Helper.rgb?(rgb.join(","))
+        return
+      end
+
+      if color = RGB.table.index(rgb)
+        return COLORS.find { |c| c.term == color }.term
+      end
+
+      increments = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff]
+      rgb.map! do |part|
+        for i in (0..4)
+          lower, upper = increments[i], increments[i+1]
+
+          next unless part.between?(lower, upper)
+
+          distance_from_lower = (lower - part).abs
+          distance_from_upper = (upper - part).abs
+          closest = distance_from_lower < distance_from_upper ? lower : upper
+        end
+        closest
+      end
+
+      COLORS.find { |c| c.term == RGB.table.index(rgb) }.term
+    end
+
+    def ansi_to_hex(ansi)
+      "#" + RGB.table[ansi].map { |v| (v.to_s(16) * 2)[0...2] }.join
+    end
+
+  end
+end

data/lib/pry-theme/commands.rb

@@ -1,7 +1,3 @@
-require 'net/https'
-require 'base64'
-require 'json'
-
 module PryTheme
   Commands = Pry::CommandSet.new do
 
@@ -34,6 +30,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 :e, "edit",        "Edit or create a theme"
         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"
@@ -46,6 +43,8 @@ module PryTheme
           show_specific_color
         elsif opts.t?
           test_theme
+        elsif opts.e?
+          edit_theme
         elsif opts.l?
           show_list
         elsif opts.r?
@@ -71,7 +70,7 @@ module PryTheme
       end
 
       def show_palette_colors
-        lputs in_columns(Palette.new(args[0]).to_a)
+        lputs in_columns(Palette.new(args[0]).to_a), output
       end
 
       def in_columns(list, cols=3)
@@ -79,7 +78,7 @@ module PryTheme
 
         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 = c.scan(/(\e\[[\d;]+m)(\w+)(\e\[0m)(:)(\e\[[\d;]+m)(\w+)(\e\[0m)/).flatten
             color[1] = color[1].ljust(3)
             color[-2] = color[-2].ljust(22)
             color_table << color
@@ -90,54 +89,155 @@ module PryTheme
       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
+        c = args[0]
 
-        pal = Palette.new(256)
-        color = pal.colors.detect { |c| c.term == args[0].to_i }
+        unless c
+          output.puts "This option requires an argument. Specify a color. Examples:"
+          output.puts "Pry Theme: black; RGB: 0,0,0; HEX: #000000, ANSI: 0."
+          return
+        end
 
-        if color
-          output.puts color.to_term(pal.notation)
+        color = if ansi?(c)
+                  find_color(c)
+                elsif hex?(c)
+                  find_color(ColorConverter.hex_to_ansi(c))
+                elsif rgb?(c)
+                  find_color(ColorConverter.rgb_to_ansi(c))
+                else
+                  h = ColorConverter::COLORS.select do |color|
+                    (color.human).to_s[c]
+                  end
+
+                  # Return human-readable colors if the
+                  # select selected any. If not, return nil.
+                  h if h.any?
+                end
+
+        case color
+        when Array
+          lputs color.map { |c| c.to_term(TermNotation::COLOR256) }.join("\n"), output
+        when nil
+          output.puts "Invalid color: #{ c }"
+        else
+          output.puts color.to_term(TermNotation::COLOR256)
         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 find_color(color)
+        ColorConverter::COLORS.find { |c| c.term == color.to_i }
+      end
 
-      def this_is_method
-        this_is_float   = 10_000.00
-        this_is_integer = 10_000
+      def test_theme
+        example = <<-'TEST'
+# "#{ PryTheme.current_theme }" theme.
+class PryTheme::ThisIsAClass
+  def this_is_a_method
+    THIS_IS_A_CONSTANT  = :this_is_a_symbol
+    this_is_a_local_var = "#{this} is a string.\n"
+    this_is_a_float     = 10_000.00
+    this_is_an_integer  = 10_000
+
+    # TRUE and FALSE are predefined constants.
+    $this_is_a_global_variable = TRUE or FALSE
+
+    @this_is_an_instance_variable = `echo '#{system} call\n'`
+    @@this_is_a_class_variable    = @$ # An error.
+
+    /[0-9]{1,3}this #{is} a regexp\w+/xi
+  end
+end
+        TEST
 
-        "this_is_string"
+        lputs colorize_code(example), output
+      end
 
-        TRUE or FALSE or ARGV # <-- Predefined constants
+      def edit_theme
+        theme = args.first || PryTheme.current_theme
+        theme.tr!("+", "") if new_theme_flag = (theme[0] == "+")
 
-        @this_is_instance_variable
-        @@this_is_class_variable
+        if not new_theme_flag and not installed?(theme)
+          output.puts %(Can't find "#{ theme }" theme in `#{ THEME_DIR }`.)
+          output.puts "To create a new theme, prepend a `+` sign to its name."
+          output.puts "Example: `pry-theme -e +#{ theme }`."
+          return
+        elsif new_theme_flag and installed?(theme)
+          output.puts "Can't create a theme with the given name."
+          output.puts %(The "#{ theme }" theme is already exist in your system.)
+          output.puts "You can edit it with `pry-theme -e #{ theme }` command."
+          return
+        end
 
-        `echo 'Hello, hi, from "system" call!'`
+        theme_path = pathify_theme(theme)
+
+        if new_theme_flag
+          template = <<-TEMPLATE
+---
+meta:
+  theme-name  : #{ theme }
+  version     : 1
+  color-depth : 256 # Supports 8 or 256 colors.
+  description : # Should be less than 80 characters.
+  author      : # John Doe <johndoe@example.com>
+
+theme:
+  class               : # blue on yellow
+  class_variable      : # red
+  comment             : # on green
+  constant            : # (bu)
+  error               : # black (b) on white
+  float               : # (i)
+  global_variable     :
+  instance_variable   :
+  integer             :
+  keyword             :
+  method              :
+  predefined_constant :
+  regexp:
+    self              :
+    content           :
+    delimiter         :
+    modifier          :
+    function          :
+  shell:
+    self              :
+    content           :
+    delimiter         :
+  string:
+    self              :
+    content           :
+    modifier          :
+    escape            :
+    delimiter         :
+  symbol              :
+          TEMPLATE
+
+          # Create a template in themes directory.
+          File.open(theme_path, "w") { |f| f.puts template }
+
+          output.puts %(Created "#{ theme }" theme in `#{ THEME_DIR }`.)
+          output.puts "Opened it in #{ Pry.config.editor } for editing."
+        else
+          output.puts "Opened #{ theme } theme in #{ Pry.config.editor } for editing."
+          output.puts "Don't forget to increment a version number of theme!"
+        end
 
-        $ # <-- The dollar is an error!
+        begin
+          old_theme = PryTheme.current_theme
 
-        /[0-9]{1,3}this is regexp\\w+/xi
-        $1 or $2 or $3333
+          display_preview!(theme, %<Current "#{ theme }">)
+          invoke_editor(theme_path, line=1, reloading=true)
+          display_preview!(theme, %<Edited "#{ theme }">)
+        ensure
+          PryTheme.set_theme(old_theme)
+        end
       end
 
-    end
-  end
-end
-# "#{PryTheme.current_theme}" theme.
-        TEST
-
-        lputs colorize_code(example)
+      # Please, pay attention to the fact that this method changes current
+      # theme to the given theme.
+      def display_preview!(theme, header_text)
+        PryTheme.set_theme(theme)
+        display_header(header_text, output)
+        test_theme
       end
 
       def show_list
@@ -149,9 +249,9 @@ end
           PryTheme.set_theme(theme)
 
           chunk = <<-CHUNK
-class PickMe
-  def please
-    @i, @@beg, you = 10_000, 400.00, "please!"
+class Theme
+  def method
+    @ivar, @@cvar, lvar = 10_000, 400.00, "string"
   end
 end
           CHUNK
@@ -162,12 +262,15 @@ end
           [header, meta.description, "---", snippet].compact.join("\n")
         end
 
-        lputs all_themes.join("\n")
+        lputs all_themes.join("\n"), output
       ensure
         PryTheme.set_theme(old_theme)
       end
 
       def show_remote_list
+        require 'net/https'
+        require 'json'
+
         body = {}
         fetch_collection("/") do |http, uri|
           output.puts "Fetching list of themes..."
@@ -177,17 +280,21 @@ end
 
         i = 0
         remote_themes = body.map do |theme|
-          if (name = theme["name"]) =~ /\A[[a-z][0-9]-]+\z/
+          if (name = theme["name"]) =~ /\A(?:[a-z]|[0-9]|-)+\z/
             "#{i+=1}. #{installed?(name) ? make_bold(name) : name}"
           end
         end.compact
 
-        lputs remote_themes.join("\n")
+        lputs remote_themes.join("\n"), output
       end
 
       def install_theme
         return unless args[0]
 
+        require 'net/https'
+        require 'json'
+        require 'base64'
+
         body = {}
         fetch_collection("/#{args[0]}/#{args[0]}.prytheme") do |http, uri|
           output.puts "Fetching theme from the collection..."

data/lib/pry-theme/helper.rb

@@ -36,6 +36,10 @@ module PryTheme
       File.join(THEME_DIR, name)
     end
 
+    def pathify_theme(name)
+      File.join(THEME_DIR, "#{ name }.prytheme")
+    end
+
     def fetch_collection(path, &block)
       uri = URI.parse(COLLECTION + path)
       http = Net::HTTP.new(uri.host, uri.port)
@@ -44,5 +48,40 @@ module PryTheme
       yield(http, uri)
     end
 
+    def ansi?(color)
+      if color.to_s =~ /\A(\d{1,3})\z/
+        (0..255).include?(color.to_i)
+      else
+        false
+      end
+    end
+
+    def rgb?(color)
+      rgb_pattern = /
+                      \A
+
+                      ([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])
+                      ,
+                      ([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])
+                      ,
+                      ([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])
+
+                      \z
+                    /x
+      color =~ rgb_pattern ? true : false
+    end
+
+    def hex?(color)
+      color =~ /\A#?[A-F\d]{6}\z/i ? true : false
+    end
+
+    def display_header(text, out)
+      safe_width = 80
+
+      out.puts "-" * safe_width
+      out.puts make_bold(text.center(safe_width))
+      out.puts "-" * safe_width
+    end
+
   end
 end