pry-theme 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657593d26a0afa7197bdeda4e33dac70dd3d13b5
-  data.tar.gz: eb3bf3c8dbc7c5a7f16b97027f7ea856d1efb33a
+  metadata.gz: 915606c125b12d2db78eb2fbcc80a733abb5d97e
+  data.tar.gz: c74ffb434932c0e71a84d9892e677b88398ac169
 SHA512:
-  metadata.gz: 5f3b617dab0c190ab3bbad3c8d00914f528b9235fecd8ad8895f9085d7243f71d79dfdcaef26ac5690d531ca2da841d45cc06e637456208f4d6c58edb074819b
-  data.tar.gz: 08fa73ba0512df853a2892c5f264cb830c77a3575f0a7d6719767ee169efe58511a55e9d530ef0b93f7aac9af799cbf94b48b0f4085fed83235e7dec3b3caa96
+  metadata.gz: 8b85ec4855ee1e104b5c0df4ab64d470e8678112ca6b5ceef3087befed492010bb7b6f117c20cf93b9ccfcb8e35e4eeef8b7e55d2301893cdf7499a405d67360
+  data.tar.gz: b7b7f6c96befaeb1ffc5ad4d642b45fc204bd0cf76033075b2976e2c168465ddc31dcf0030fd7f3cbfe76324729d8e71573ddef57a46d27923eaf1368b417383

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 Pry Theme changelog
 ===================
 
+### v1.1.0 (June 13, 2014)
+
+* Added `theme_options` config hash. It is a general config for Pry Theme
+* Added option that enables painting hash keys as symbols.
+  [→](https://github.com/kyrylo/pry-theme/issues/30)
+
+  ```ruby
+  {foo: 1, :bar => 2}
+  #  ^       ^
+  #  |       |
+  # key    symbol
+  ```
+
+  By default `foo` and `bar` have different colours. If you put this inside your
+  `.pryrc`, then the key will have the same colour as the symbol.
+
+  ```ruby
+  Pry.config.theme_options = {:paint_key_as_symbol => true}
+  ```
+
 ### v1.0.3 (May 12, 2014)
 
 * Fixed error when Pry.config.theme is set to a theme that doesn't exist

data/Gemfile

@@ -1,2 +1,14 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec
+
+group :development, :test do
+  gem 'pry', '0.10.0rc1'
+end
+
+group :development do
+  gem 'rake', '~> 10.1'
+end
+
+group :test do
+  gem 'bacon', '~> 1.2'
+end

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/pry-theme.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 
+require 'pry-theme/config'
 require 'pry-theme/theme_list'
 require 'pry-theme/when_started_hook'
 require 'pry-theme/hex'

data/lib/pry-theme/commands.rb

@@ -142,7 +142,7 @@ module PryTheme
         opt.run do |opts, args|
 
           if opts.present?(:c)
-            stagger_output Preview.new(ThemeList.current_theme).long
+            _pry_.pager.page Preview.new(ThemeList.current_theme).long
           elsif args.empty?
             output.puts ThemeList.current_theme.name
           end
@@ -166,7 +166,7 @@ module PryTheme
       ].each { |m| __send__(m, cmd) }
 
       cmd.add_callback(:empty) do
-        stagger_output opts.help
+        _pry_.pager.page opts.help
       end
     end
 
@@ -183,15 +183,15 @@ module PryTheme
 
     def display_colors(color_model)
       case color_model
-      when 256 then (stagger_output ColorTable.t256)
-      when 16  then (stagger_output ColorTable.t16)
-      when 8   then (stagger_output ColorTable.t8)
+      when 256 then _pry_.pager.page(ColorTable.t256)
+      when 16  then _pry_.pager.page(ColorTable.t16)
+      when 8   then _pry_.pager.page(ColorTable.t8)
       end
     end
 
     def show_local_list
       previews = ThemeList.themes.map { |theme| Preview.new(theme).short }
-      stagger_output previews.join("\n")
+      _pry_.pager.page(previews.join("\n"))
     end
 
     def show_remote_list
@@ -216,7 +216,7 @@ module PryTheme
 
         out += response.body + "\n\n"
       }
-      stagger_output out.chomp
+      _pry_.pager.page(out.chomp)
     end
 
     def json_body(address)

data/lib/pry-theme/config.rb

@@ -0,0 +1,35 @@
+module PryTheme
+  class Config
+    class Executor
+      # @note The method amends the default behaviour of CodeRay.
+      #
+      # Sets the colour of the key token to the colour of the symbol token (akin to
+      # Pygments).
+      # @example
+      #   {foo: 1, :bar => 2}
+      #   #  ^       ^
+      #   #  |       |
+      #   # key    symbol
+      # Without this patch keys and symbols have generally different colours. It's
+      # impossible to set the colour of the key token, but with help of this method
+      # you can make it look like a symbol.
+      # @return [void]
+      # @see https://github.com/kyrylo/pry-theme/issues/30
+      def paint_key_as_symbol
+        token_colors = CodeRay::Encoders::Terminal::TOKEN_COLORS
+        token_colors[:key] = token_colors[:symbol]
+      end
+    end
+
+    def initialize(options)
+      @executor = Executor.new
+      @options = options
+    end
+
+    def apply
+      @options.each do |key, value|
+        @executor.__send__(key) if value
+      end
+    end
+  end
+end

data/lib/pry-theme/when_started_hook.rb

@@ -10,10 +10,16 @@ module PryTheme
         display_warning(_pry_) if Pry.config.theme
         ThemeList.activate_theme_intelligently
       end
+
+      apply_config
     end
 
     private
 
+    def apply_config
+      PryTheme::Config.new(Pry.config.theme_options).apply
+    end
+
     # Copy a default theme to theme directory, but only if it isn't there yet.
     def recreate_user_themes_from_default_ones
       FileUtils.mkdir_p(USER_THEMES_DIR) unless File.exist?(USER_THEMES_DIR)

data/pry-theme.gemspec

@@ -12,10 +12,8 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.files        = `git ls-files`.split("\n")
 
-  s.add_runtime_dependency 'json', '~> 1.8'
-  s.add_runtime_dependency 'coderay', '~> 1.1'
+  s.add_dependency 'json', '~> 1.8'
+  s.add_dependency 'coderay', '~> 1.1'
 
-  s.add_development_dependency 'bacon', '~> 1.2'
-  s.add_development_dependency 'rake', '~> 10.1'
-  s.add_development_dependency 'pry', '~> 0.9'
+  s.add_development_dependency 'bundler', '~> 1.0'
 end

data/spec/commands_spec.rb

@@ -82,6 +82,9 @@ describe PryTheme::Command::PryTheme do
   end
 
   describe "'colors' subcommand" do
+    before { Pry.config.color = true }
+    after { Pry.config.color = false }
+
     if ENV['TERM'] =~ /256color/
       it "displays colours accordingly to the terminal color support" do
         table = pry_eval('pry-theme colors')

data/spec/config_spec.rb

@@ -0,0 +1,35 @@
+require 'helper'
+
+describe PryTheme::Config do
+  before do
+    @token_colors = CodeRay::Encoders::Terminal::TOKEN_COLORS
+    @old_key_token = @token_colors[:key]
+    @token_colors[:key].should != @token_colors[:symbol]
+  end
+
+  after do
+    CodeRay::Encoders::Terminal::TOKEN_COLORS[:key] = @old_key_token
+  end
+
+  describe "#apply" do
+    describe ":paint_key_as_symbol is true" do
+      before do
+        PryTheme::Config.new(paint_key_as_symbol: true).apply
+      end
+
+      it "sets the key token to the value of the symbol token" do
+        @token_colors[:key].should == @token_colors[:symbol]
+      end
+    end
+
+    describe ":paint_key_as symbol is false" do
+      before do
+        PryTheme::Config.new(paint_key_as_symbol: false).apply
+      end
+
+      it "doesn't set the key token to the value of the symbol token" do
+        @token_colors[:key].should != @token_colors[:symbol]
+      end
+    end
+  end
+end

data/spec/helper.rb

@@ -1,16 +1,13 @@
-require 'rubygems'
-require 'pry'
+require 'bundler/setup'
 require 'pry/test/helper'
 
+Bundler.require :default, :test
+
 Pry.config.theme = nil
 Pry.config.pager = false
 
-unless Object.const_defined? 'PryTheme'
-  $:.unshift File.expand_path '../../lib', __FILE__
-  require 'pry-theme'
-end
-
-require 'bacon'
-
-puts "Ruby: #{ RUBY_VERSION }; Ruby Engine: #{ defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' }; " \
-     "Pry Theme: #{ PryTheme::VERSION }"
+puts(
+  "Ruby: #{RUBY_VERSION}; " +
+  "Ruby Engine: #{defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'}; " +
+  "Pry Theme: #{PryTheme::VERSION}"
+)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyrylo Silin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,47 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 description: The plugin enables color theme support for Pry.
 email: kyrylosilin@gmail.com
 executables: []
@@ -103,6 +75,7 @@ files:
 - lib/pry-theme/colors/color256.rb
 - lib/pry-theme/colors/color8.rb
 - lib/pry-theme/commands.rb
+- lib/pry-theme/config.rb
 - lib/pry-theme/declaration.rb
 - lib/pry-theme/definition.rb
 - lib/pry-theme/formattable.rb
@@ -123,6 +96,7 @@ files:
 - spec/colors/color256_spec.rb
 - spec/colors/color8_spec.rb
 - spec/commands_spec.rb
+- spec/config_spec.rb
 - spec/helper.rb
 - spec/hex_spec.rb
 - spec/rgb_spec.rb