ripl-color_result 0.1.3 → 0.2.0

data/.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'rubygems' unless Object.const_defined?(:Gem)
+require 'rubygems' unless defined? Gem
 require File.dirname(__FILE__) + "/lib/ripl/color_result"
  
 Gem::Specification.new do |s|
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "A ripl plugin to colorize result."
   s.description =  "This ripl plugin colorizes your result."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency 'ripl', '>= 0.2.4'
+  s.add_dependency 'ripl', '>= 0.2.8'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "COPYING"]
   s.license = 'MIT'

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.2.0
+* Added ap_options to pass a options hash to awesome_inspect (thanks to DirtYiCE)
+  * Renamed color_result_schema option to color_result_default_schema (better logical nesting)
+
+== 0.1.3
+* Rails (bundler) compatibility
+
 == 0.1.2
 * customize default colorization colors with Ripl.config[:color_result_scheme]
 

data/README.rdoc

@@ -4,7 +4,7 @@ This {ripl}[http://github.com/cldwalker/ripl] plugin colorizes your results.
 == Install
 Install the gem with:
 
-  sudo gem install ripl-color_result
+  gem install ripl-color_result
 
 == Usage
 
@@ -14,8 +14,8 @@ Add to your ~/.riplrc
 
 You can choose a <tt>:color_result_engine</tt>. By default, the bundled +Wirble+-like colorization is used. Possible other values are:
 
-* <tt>:ap</tt> - using the awesome_print gem
-* <tt>:coderay</tt> - using the coderay gem
+* <tt>:ap</tt> - using the _awesome_print_ gem
+* <tt>:coderay</tt> - using the _coderay_ gem
 
 Example (in your ~/.riplrc)
 
@@ -23,9 +23,11 @@ Example (in your ~/.riplrc)
 
 Set it to +nil+ to deactivate result colorization.
 
-You can change the colors used by the default colorization by editing the <tt>:color_result_scheme</tt> hash:
+You can change the colors used by the default colorization by editing the <tt>:color_result_default_schema</tt> hash:
+  Ripl.config[:color_result_default_schema][:comma] = :green
 
-  Ripl.config[:color_result_scheme][:comma] = :green
+If you use <tt>awesome_print</tt>, you can override default options using <tt>:color_result_ap_options</tt> hash:
+  Ripl.config[:color_result_ap_options] = { :multiline => false }
 
 == Credits
 
@@ -33,8 +35,8 @@ The default colorization uses code from Wirble
 * Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
 * Copyright (C) 2009 Jens Wille <jens.wille@gmail.com>
 
-Copyright (c) 2010 Jan Lelis, http://rbjl.net. See COPYING for details.
+Copyright (c) 2010 Jan Lelis <http://code-needs-smileys.com>, see COPYING for details.
 
-and cldwalker.
+Plus contributions by cldwalker and DirtYiCE.
 
 J-_-L

data/deps.rip

@@ -1 +1 @@
-ripl >=0.2.4
+ripl >=0.2.8

data/lib/ripl/color_result.rb

@@ -2,7 +2,7 @@ require 'ripl'
 
 module Ripl
   module ColorResult
-    VERSION = '0.1.3'
+    VERSION = '0.2.0'
     COLORS = {
       :nothing      => '0;0',
       :black        => '0;30',
@@ -23,31 +23,17 @@ module Ripl
       :white        => '1;37',
     }
 
-    # def inspect_result(result)
-    #   result.inspect
-    # end
-
-    def format_prompt(result)
-      @result_prompt
-    end
-
     def format_result(result)
       return super if !config[:color_result_engine]
-      format_prompt(result) + inspect_result(result)
-    end
-
-    def inspect_result(result)
-      # return super if !config[:color_result_engine]
 
-      case config[:color_result_engine].to_sym
+      @result_prompt + case config[:color_result_engine].to_sym
       when :coderay
         require 'coderay'
         CodeRay.scan( result.inspect, :ruby ).term
       when :ap, :awesome_print
         require 'ap'
-        result.awesome_inspect
+        result.awesome_inspect( config[:color_result_ap_options] || {} )
       else # :default
-        #require File.expand_path('default_colorizer', dirname(__FILE__))
         require File.dirname(__FILE__) + "/color_result/default_colorizer"
         DefaultColorizer.colorize_code( result.inspect )
       end
@@ -56,10 +42,12 @@ module Ripl
   end
 end
 
-Ripl::Shell.send :include, Ripl::ColorResult if defined? Ripl::Shell
+Ripl::Shell.send :include, Ripl::ColorResult
+
 
 Ripl.config[:color_result_engine] ||= :default
-Ripl.config[:color_result_scheme] ||= { # color scheme for default colorization, original from wirble
+# color scheme for default colorization, original from wirble
+Ripl.config[:color_result_default_schema] ||= { 
   # delimiter colors
   :comma => :blue,
   :refers => :blue,

data/lib/ripl/color_result/default_colorizer.rb

@@ -182,7 +182,7 @@ class << Ripl::ColorResult::DefaultColorizer = Module.new
   def colorize_code(str)
     ret, nocol = '', get_color(:nothing)
     tokenize(str) do |tok, val|
-      ret << colorize_string(val, Ripl.config[:color_result_scheme][tok])
+      ret << colorize_string(val, Ripl.config[:color_result_default_schema][tok])
     end
     ret
   rescue # catch any errors from the tokenizer (just in case)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 4
-        version: 0.2.4
+        - 8
+        version: 0.2.8
   type: :runtime
   version_requirements: *id001
 description: This ripl plugin colorizes your result.