ripl-color_result 0.3.1 → 0.4.0

data/.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description =  "This ripl plugin colorizes ripl results."
   s.required_rubygems_version = ">= 1.3.6"
   s.add_dependency 'ripl', '>= 0.4.1'
-  s.add_dependency 'wirb', '>= 0.3.0'
+  s.add_dependency 'wirb', '>= 0.4.0'
   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,7 @@
+== 0.4.0
+* Be compatible with wirb 0.4.0
+* Bundler compatibility improvements
+
 == 0.3.1
 * Be compatible with wirb 0.3.0
 

data/lib/ripl/color_result.rb

@@ -2,21 +2,28 @@ require 'ripl'
 
 module Ripl
   module ColorResult
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
+
+    def before_loop
+      if Ripl.config[:color_result_engine] == :default
+        require 'wirb' unless defined?(Wirb)
+        Ripl.config[:color_result_default_schema].merge! Wirb.schema
+      end
+    end
 
     def format_result(result)
       return super if !config[:color_result_engine]
 
       @result_prompt + case config[:color_result_engine].to_sym
       when :coderay
-        require 'coderay'
+        require 'coderay' unless defined?(CodeRay)
         CodeRay.scan( result.inspect, :ruby ).term
       when :ap, :awesome_print
-        require 'ap'
+        require 'ap' unless defined?(AwesomePrint)
         result.awesome_inspect( config[:color_result_ap_options] || {} )
       else # :default
-        require 'wirb'
-        Wirb.start
+        require 'wirb' unless defined?(Wirb)
+        Wirb.start unless Wirb.running?
         Wirb.colorize_result result.inspect, Ripl.config[:color_result_default_schema]
       end
     end
@@ -26,70 +33,4 @@ end
 Ripl::Shell.include Ripl::ColorResult
 
 Ripl.config[:color_result_engine] ||= :default
-Ripl.config[:color_result_default_schema] ||= { # see Wirb::COLORS for a color list
-    # container
-    :open_hash        => :light_green,
-    :close_hash       => :light_green,
-    :open_array       => :light_green,
-    :close_array      => :light_green,
-
-    :open_set         => :green,
-    :close_set        => :green,
-
-    # delimiter colors
-    :comma            => :green,
-    :refers           => :green,
-
-    # class
-    :class            => :light_green,
-    :class_separator  => :green,
-    :object_class     => :light_green,
-
-    # object
-    :open_object               => :green,
-    :object_description_prefix => :green,
-    :object_description        => :brown,
-    :object_address_prefi      => :brown_underline,
-    :object_address            => :brown_underline,
-    :object_line_prefix        => :brown_underline,
-    :object_line               => :brown_underline,
-    :object_line_number        => :brown_underline,
-    :object_variable_prefix    => :light_purple,
-    :object_variable           => :light_purple,
-    :close_object              => :green,
-
-    # symbol
-    :symbol_prefix       => :yellow,
-    :symbol              => :yellow,
-    :open_symbol_string  => :brown,
-    :symbol_string       => :yellow,
-    :close_symbol_string => :brown,
-
-    # string
-    :open_string  => :light_gray,
-    :string       => :dark_gray,
-    :close_string => :light_gray,
-
-    # regexp
-    :open_regexp  => :light_blue,
-    :regexp       => :dark_gray,
-    :close_regexp => :light_blue,
-    :regexp_flags => :light_red,
-
-    # number
-    :number => :cyan,
-    :range  => :red,
-    :open_rational      => :light_cyan,
-    :rational_separator => :light_cyan,
-    :close_rational     => :light_cyan,
-
-    # misc
-    :default => nil,
-    :keyword => nil, # some lowercased word, merge with default?
-    :time    => :purple,
-    :nil     => :light_red,
-    :false   => :red,
-    :true    => :green,
-}
-
-# J-_-L
+Ripl.config[:color_result_default_schema] = Hash.new{ |h,k| h[k] = {} }

metadata

@@ -2,7 +2,7 @@
 name: ripl-color_result
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 Z
+date: 2011-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ripl
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id002
 description: This ripl plugin colorizes ripl results.