ripl-color_streams 0.1.0 → 0.1.1

data/.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "A ripl plugin to colorize stdout and stderr."
   s.description =  "This ripl plugin colorizes your stdout and stderr streams."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency 'ripl', '>= 0.2.3'
+  s.add_dependency 'ripl', '>= 0.2.7'
   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", "LICENSE.txt"]
   s.license = 'MIT'

data/README.rdoc

@@ -4,7 +4,7 @@ This {ripl}[http://github.com/cldwalker/ripl] plugin colorizes your +stdout+ and
 == Install
 Install the gem with:
 
-  sudo gem install ripl-color_streams
+  gem install ripl-color_streams
 
 == Usage
 
@@ -12,7 +12,7 @@ Add to your ~/.riplrc
 
   require 'ripl/color_streams'
 
-The default colors are :dark_gray (1;30) and :light_red (1;31). You can change them like this:
+The default colors are <tt>:dark_gray</tt> (1;30) and <tt>:light_red</tt> (1;31). You can change them like this:
 
   Ripl.config[:color_streams_stdout] = :light_gray
   Ripl.config[:color_streams_stderr] = :red

data/deps.rip

@@ -1 +1 @@
-ripl >=0.2.3
+ripl >=0.2.7

data/lib/ripl/color_streams.rb

@@ -2,7 +2,7 @@ require 'ripl'
 
 module Ripl
   module ColorStreams
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
     COLORS = {
       :nothing      => '0;0',
       :black        => '0;30',
@@ -24,20 +24,9 @@ module Ripl
     }
 
     def before_loop
-      # patch stream output (but do not activate)
-      $stdout.instance_eval do
-        alias real_write write
-        def color_write(*args)
-          Ripl::ColorStreams.write_stream :stdout, *args
-        end
-      end
-
-      $stderr.instance_eval do
-        alias real_write write
-        def color_write(*args)
-          Ripl::ColorStreams.write_stream :stderr, *args
-        end
-      end
+      # patch $stdout/$stderr
+      Ripl::ColorStreams.patch_stream :stdout
+      Ripl::ColorStreams.patch_stream :stderr
 
       # default settings
       Ripl.config[:color_streams_stdout] ||= :dark_gray
@@ -48,12 +37,12 @@ module Ripl
     end
 
     def loop_eval(input)
-      $stdout.instance_eval do alias write color_write end
-      $stderr.instance_eval do alias write color_write end
+      Ripl::ColorStreams.set_stream_status :stdout, true
+      Ripl::ColorStreams.set_stream_status :stderr, true
       super
     ensure
-      $stdout.instance_eval do alias write real_write end
-      $stderr.instance_eval do alias write real_write end
+      Ripl::ColorStreams.set_stream_status :stdout, false
+      Ripl::ColorStreams.set_stream_status :stderr, false
     end
 
     class << self
@@ -65,10 +54,39 @@ module Ripl
 
         stream.real_write color_code ? "\e[#{ color_code }m#{ data }\e[0;0m" : data.to_s
       end
+
+      # patch stream output (but do not activate)
+      def patch_stream(stream_name)
+        stream = Object.const_get stream_name.to_s.upcase
+
+        stream.instance_eval do
+          alias real_write write
+          def color_write(*args) # define_method is not defined for singletons :/
+            stream_name = (self == $stdout) ? :stdout : :stderr
+            Ripl::ColorStreams.write_stream stream_name, *args
+          end
+        end
+      end
+
+      def set_stream_status(stream_name, true_or_false)
+        stream = Object.const_get stream_name.to_s.upcase
+
+        # check if stream object has changed
+        unless stream.respond_to?(:real_write) && stream.respond_to?(:color_write)
+          Ripl::ColorStreams.patch_stream stream_name
+        end
+
+        # (de)activate
+        if true_or_false
+          stream.instance_eval do alias write color_write end
+        else
+          stream.instance_eval do alias write real_write  end
+        end
+      end
     end
   end
 end
 
-Ripl::Shell.send :include, Ripl::ColorStreams if defined? Ripl::Shell
+Ripl::Shell.send :include, Ripl::ColorStreams
 
 # J-_-L

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ripl-color_streams
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2010-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 7
+        version: 0.2.7
   type: :runtime
   version_requirements: *id001
 description: This ripl plugin colorizes your stdout and stderr streams.
@@ -65,7 +63,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -74,7 +71,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3