ripl-rc 0.2.3 → 0.2.4

data/.travis.yml

@@ -0,0 +1,9 @@
+script: 'git submodule update --init; bundle exec rake test'
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ruby-head
+  - rbx
+  - rbx-2.0
+  - jruby
+  - ree

data/CHANGES

@@ -1,5 +1,20 @@
 = ripl-rc changes history
 
+== ripl-rc 0.2.4 -- 2011-08-03
+
+* [ensure_after_loop] A plugin which would make sure after_loop is called.
+                      (Some plugins need to do cleaning up in after_loop)
+
+* [anchor           ] Fixed a bug for buggy EditLine, which would raise
+                      weird exception upon calling `HISTORY == nil`.
+                      Now we use `.nil?` to lookup if it's nil or not.
+
+* [multiline_history] Fixed a bug when multiline evaluation raised an
+                      exception, it wouldn't handle the history correctly.
+                      Moving the handling to an ensure block fixed this.
+
+* [squeeze_history  ] (Internal) Take the advantage of the new history API
+
 == ripl-rc 0.2.3 -- 2011-06-16
 
 Please read this for detail:

data/Gemfile

@@ -1,3 +1,4 @@
 
 source 'http://rubygems.org'
+
 gemspec

data/README

@@ -3,7 +3,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 
 ## LINKS:
 
-* [github](http://github.com/godfat/ripl-rc)
+* [github](https://github.com/godfat/ripl-rc)
 * [rubygems](http://rubygems.org/gems/ripl-rc)
 
 ## DESCRIPTION:

data/README.md

@@ -3,7 +3,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 
 ## LINKS:
 
-* [github](http://github.com/godfat/ripl-rc)
+* [github](https://github.com/godfat/ripl-rc)
 * [rubygems](http://rubygems.org/gems/ripl-rc)
 
 ## DESCRIPTION:

data/lib/ripl/rc.rb

@@ -16,6 +16,7 @@ require 'ripl/rc/squeeze_history'
 require 'ripl/rc/multiline_history_file'
 require 'ripl/rc/mkdir_history'
 require 'ripl/rc/ctrld_newline'
+require 'ripl/rc/ensure_after_loop'
 
 # upon exception occurs
 require 'ripl/rc/last_exception'

data/lib/ripl/rc/anchor.rb

@@ -31,7 +31,7 @@ module Ripl::Rc::Anchor
   # if the object is the same, then we're exiting from an anchor,
   # so don't print anything.
   def print_result result
-    super unless result != nil &&
+    super unless !result.nil? &&
                  result.object_id == Ripl.config[:rc_anchor_last].object_id
   end
 

data/lib/ripl/rc/color.rb

@@ -4,6 +4,7 @@ require 'ripl/rc/u'
 module Ripl::Rc::Color
   include Ripl::Rc::U
 
+  module_function
   def format_result result, display=result.inspect
     return super(result) if Color.disabled?
     case result

data/lib/ripl/rc/ensure_after_loop.rb

@@ -0,0 +1,18 @@
+
+require 'ripl/rc/u'
+
+module Ripl::Rc::EnsureAfterLoop
+  include Ripl::Rc::U
+
+  def in_loop
+    return super if EnsureAfterLoop.disabled?
+    begin
+      super
+    rescue Exception
+      after_loop
+      raise
+    end
+  end
+end
+
+Ripl::Shell.include(Ripl::Rc::EnsureAfterLoop)

data/lib/ripl/rc/multiline_history.rb

@@ -7,14 +7,14 @@ module Ripl::Rc::MultilineHistory
 
   def loop_eval(input)
     return super if MultilineHistory.disabled?
-    result = super # might throw
+    super # might throw
+  ensure
     unless @rc_multiline_buffer.empty?
       (@rc_multiline_buffer.size + (@rc_multiline_trash || 0)).
         times{ history.pop }
        @rc_multiline_trash = 0
       history << "\n" + @rc_multiline_buffer.join("\n")
     end
-    result
   end
 
   def handle_interrupt

data/lib/ripl/rc/multiline_history_file.rb

@@ -1,6 +1,5 @@
 
 require 'ripl/rc/u'
-# require 'ripl/rc/history_ivar' # dependency
 
 module Ripl::Rc::MultilineHistoryFile
   include Ripl::Rc::U

data/lib/ripl/rc/squeeze_history.rb

@@ -7,9 +7,8 @@ module Ripl::Rc::SqueezeHistory
   # write squeezed history
   def write_history
     return super if SqueezeHistory.disabled?
-    File.open(history_file, 'w'){ |f|
-      f.puts U.squeeze_history(history).join("\n")
-    }
+    @history = [U.squeeze_history(history).join("\n") + "\n"]
+    super
   end
 
   # squeeze history on memory too

data/lib/ripl/rc/test.rb

@@ -9,3 +9,5 @@ require 'rr'
 require 'fileutils'
 Bacon.summary_on_exit
 include RR::Adapters::RRMethods
+
+require 'ripl/rc/noirbrc'

data/lib/ripl/rc/version.rb

@@ -1,6 +1,6 @@
 
 module Ripl
   module Rc
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/ripl-rc.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripl-rc}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Lin Jen-Shin (godfat)}]
-  s.date = %q{2011-06-16}
+  s.date = %q{2011-08-03}
   s.description = %q{ripl plugins collection, take you want, leave you don't.}
   s.email = [%q{godfat (XD) godfat.org}]
   s.executables = [%q{ripl-rc}]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
   %q{.gitignore},
   %q{.gitmodules},
+  %q{.travis.yml},
   %q{2011-02-28.md},
   %q{CHANGES},
   %q{CONTRIBUTORS},
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
   %q{lib/ripl/rc/ctrld_newline.rb},
   %q{lib/ripl/rc/debug.rb},
   %q{lib/ripl/rc/eat_whites.rb},
+  %q{lib/ripl/rc/ensure_after_loop.rb},
   %q{lib/ripl/rc/last_exception.rb},
   %q{lib/ripl/rc/mkdir_history.rb},
   %q{lib/ripl/rc/multiline.rb},
@@ -48,18 +50,23 @@ Gem::Specification.new do |s|
   %q{lib/ripl/rc/version.rb},
   %q{ripl-rc.gemspec},
   %q{screenshot.png},
+  %q{task/.gitignore},
   %q{task/gemgem.rb},
+  %q{test/test_color.rb.rb},
   %q{test/test_disable_shortcut.rb},
+  %q{test/test_ensure_after_loop.rb},
   %q{test/test_squeeze_history.rb}]
   s.homepage = %q{https://github.com/godfat/ripl-rc}
   s.rdoc_options = [
   %q{--main},
   %q{README}]
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{ripl plugins collection, take you want, leave you don't.}
   s.test_files = [
+  %q{test/test_color.rb.rb},
   %q{test/test_disable_shortcut.rb},
+  %q{test/test_ensure_after_loop.rb},
   %q{test/test_squeeze_history.rb}]
 
   if s.respond_to? :specification_version then

data/task/.gitignore

@@ -0,0 +1 @@
+*.rbc

data/task/gemgem.rb

@@ -12,11 +12,15 @@ module Gemgem
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
-      s.summary     = File.read("#{Gemgem.dir}/README").
-                      match(/DESCRIPTION:\n\n(.+?)\n\n/m)[1]
-      s.description = s.summary
+      description   = File.read("#{Gemgem.dir}/README").
+                      match(/DESCRIPTION:\n\n(.+?)(?=\n\n[^\n]+:\n)/m)[1].
+                      lines.to_a
 
-      s.extra_rdoc_files = %w[CHANGES CONTRIBUTORS LICENSE TODO]
+      s.description = description.join
+      s.summary     = description.first
+
+      s.extra_rdoc_files = %w[CHANGES CONTRIBUTORS LICENSE TODO].select{ |f|
+                             File.exist?(f) }
       s.rdoc_options     = %w[--main README]
       s.rubygems_version = Gem::VERSION
       s.date             = Time.now.strftime('%Y-%m-%d')
@@ -24,8 +28,7 @@ module Gemgem
       s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
       s.require_paths    = %w[lib]
     })
-    spec.homepage = "https://github.com/godfat/#{spec.name}" unless
-      spec.homepage
+    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
     spec
   end
 
@@ -142,9 +145,27 @@ end
 
 end # of gem namespace
 
-desc 'Run tests'
+desc 'Run tests in memory'
 task :test do
-  sh("#{Gem.ruby} -I lib -S bacon test/test_*.rb")
+  require 'bacon'
+  Bacon.extend(Bacon::TestUnitOutput)
+  Bacon.summary_on_exit
+  $LOAD_PATH.unshift('lib')
+  Dir['test/test_*.rb'].each{ |file| load file }
+end
+
+desc 'Run tests with shell'
+task 'test:shell', :RUBY_OPTS do |t, args|
+  files = unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+            'test/test_*.rb'
+          else
+            Dir['test/test_*.rb'].join(' ')
+          end
+
+  cmd = [Gem.ruby, args[:RUBY_OPTS],
+         '-I', 'lib', '-S', 'bacon', '--quiet', files]
+
+  sh(cmd.compact.join(' '))
 end
 
 desc 'Generate rdoc'

data/test/test_color.rb.rb

@@ -0,0 +1,17 @@
+
+require 'ripl/rc/test'
+require 'ripl/rc/color'
+
+describe Ripl::Rc::Color do
+  should 'give correct color' do
+    Ripl::Rc::Color.format_result(
+      [{0 => :a}, 'b', [nil, {false => Object}], {true => Exception.new}]).
+        should ==
+          "\e[34m[\e[m\e[34m{\e[m\e[31m0\e[m\e[34m=>\e[m\e[36m:a\e[m\e[" \
+          "34m}\e[m\e[34m, \e[m\e[32m\"b\"\e[m\e[34m, \e[m\e[34m[\e[m\e" \
+          "[35mnil\e[m\e[34m, \e[m\e[34m{\e[m\e[35mfalse\e[m\e[34m=>\e[" \
+          "m\e[33mObject\e[m\e[34m}\e[m\e[34m]\e[m\e[34m, \e[m\e[34m{\e" \
+          "[m\e[35mtrue\e[m\e[34m=>\e[m\e[35m#<Exception: Exception>\e[" \
+          "m\e[34m}\e[m\e[34m]\e[m"
+  end
+end

data/test/test_disable_shortcut.rb

@@ -7,7 +7,8 @@ describe Ripl::Rc::U do
     @names = Dir[File.expand_path(
                "#{File.dirname(__FILE__)}/../lib/ripl/rc/*.rb")].
                map   {|path| File.basename(path)[0..-4]                     }.
-               reject{|name| %w[version u noirbrc test debug].include?(name)}
+               reject{|name| %w[version u noirbrc test debug].include?(name)}.
+               each  {|name| require "ripl/rc/#{name}"}
     @mods  = Ripl::Shell.ancestors[1..-1].select{ |mod| mod < Ripl::Rc }
   end
 

data/test/test_ensure_after_loop.rb

@@ -0,0 +1,14 @@
+
+require 'ripl/rc/test'
+require 'ripl/rc/ensure_after_loop'
+
+describe Ripl::Rc::EnsureAfterLoop do
+  after do; RR.verify; end
+
+  should 'call after_loop even if in_loop raises' do
+    @shell = Ripl.shell
+    mock(@shell).loop_once{ raise 'boom' }
+    mock(@shell).after_loop
+    lambda{ @shell.loop }.should.raise(RuntimeError)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripl-rc
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-16 00:00:00.000000000Z
+date: 2011-08-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &2156666920 !ruby/object:Gem::Requirement
+  requirement: &2153474960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156666920
+  version_requirements: *2153474960
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2156666300 !ruby/object:Gem::Requirement
+  requirement: &2153474400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156666300
+  version_requirements: *2153474400
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156665760 !ruby/object:Gem::Requirement
+  requirement: &2153473720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156665760
+  version_requirements: *2153473720
 description: ripl plugins collection, take you want, leave you don't.
 email:
 - godfat (XD) godfat.org
@@ -58,6 +58,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .gitmodules
+- .travis.yml
 - 2011-02-28.md
 - CHANGES
 - CONTRIBUTORS
@@ -75,6 +76,7 @@ files:
 - lib/ripl/rc/ctrld_newline.rb
 - lib/ripl/rc/debug.rb
 - lib/ripl/rc/eat_whites.rb
+- lib/ripl/rc/ensure_after_loop.rb
 - lib/ripl/rc/last_exception.rb
 - lib/ripl/rc/mkdir_history.rb
 - lib/ripl/rc/multiline.rb
@@ -88,8 +90,11 @@ files:
 - lib/ripl/rc/version.rb
 - ripl-rc.gemspec
 - screenshot.png
+- task/.gitignore
 - task/gemgem.rb
+- test/test_color.rb.rb
 - test/test_disable_shortcut.rb
+- test/test_ensure_after_loop.rb
 - test/test_squeeze_history.rb
 homepage: https://github.com/godfat/ripl-rc
 licenses: []
@@ -113,10 +118,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ripl plugins collection, take you want, leave you don't.
 test_files:
+- test/test_color.rb.rb
 - test/test_disable_shortcut.rb
+- test/test_ensure_after_loop.rb
 - test/test_squeeze_history.rb