ripl-rc 0.1.4 → 0.1.5

data/CHANGES

@@ -1,5 +1,12 @@
 = ripl-rc changes history
 
+== ripl-rc 0.1.5 -- 2011-03-26
+
+* [      bin] shows a better error message when ripl-rails can't be found
+* [  ripl-rc] made require 'ripl-rc' works like require 'ripl/rc'
+* [multiline] fixed regexp warning on ruby 1.8.7
+* [multiline] fixed history when using multiline
+
 == ripl-rc 0.1.4 -- 2011-03-01
 
 * [  color] fix syntax error; sorry, i definitely need tests.. :s

data/bin/ripl-rc

@@ -1,8 +1,17 @@
 #!/usr/bin/env ruby
 
 require 'ripl/rc'
+
 if ARGV.size > 0
-  load(`which #{Ripl::Runner.app}-#{ARGV.shift}`.chomp)
+  plugin = "#{Ripl::Runner.app}-#{ARGV.shift}"
+  path   = `which #{plugin}`.strip
+  if path == ''
+    puts("Can't find `#{plugin}' in $PATH.\n"           \
+         "Please make sure `#{plugin}' is installed.\n" \
+         "e.g. run `gem install #{plugin}`")
+  else
+    load(path)
+  end
 else
   Ripl.start
 end

data/lib/ripl-rc.rb

@@ -0,0 +1,2 @@
+
+require 'ripl/rc'

data/lib/ripl/rc/multiline.rb

@@ -4,16 +4,16 @@ require 'ripl'
 # from https://github.com/janlelis/ripl-multi_line
 module Ripl::Rc; end
 module Ripl::Rc::Multiline
-  ERROR_REGEXP = /#{
-    [ %q%unexpected \$end%,
-      %q%unterminated [a-z]+ meets end of file%,
+  ERROR_REGEXP = Regexp.new(
+    [ "unexpected \\$end",
+      "unterminated [a-z]+ meets end of file",
       # rubinius
-      %q%expecting '\\n' or ';'%,
-      %q%missing 'end'%,
-      %q%expecting '}'%,
+      "expecting '\\\\n' or ';'",
+      "missing 'end'",
+      "expecting '}'",
       # jruby
-      %q%syntax error, unexpected end-of-file%,
-    ]*'|' }/
+      "syntax error, unexpected end-of-file",
+    ].join('|'))
 
   def before_loop
     @rc_multiline_buffer = []
@@ -37,7 +37,8 @@ module Ripl::Rc::Multiline
 
   def print_eval_error(e)
     if e.is_a?(SyntaxError) && e.message =~ ERROR_REGEXP
-      @rc_multiline_buffer << @input
+      @rc_multiline_buffer << @input if @rc_multiline_buffer.empty?
+      history.pop
       throw :rc_multiline_cont
     else
       super
@@ -48,7 +49,10 @@ module Ripl::Rc::Multiline
     if @rc_multiline_buffer.empty?
       super
     else
-      super "#{@rc_multiline_buffer.join("\n")}\n#{input}"
+      @rc_multiline_buffer << input
+      history.pop
+      history << "\n" + (str = @rc_multiline_buffer.join("\n"))
+      super str
     end
   end
 

data/lib/ripl/rc/version.rb

@@ -1,6 +1,6 @@
 
 module Ripl
   module Rc
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/ripl-rc.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripl-rc}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-26}
   s.default_executable = %q{ripl-rc}
   s.description = %q{ripl plugins collection, take you want, leave you don't.}
   s.email = ["godfat (XD) godfat.org"]
   s.executables = ["ripl-rc"]
   s.extra_rdoc_files = ["CHANGES", "CONTRIBUTORS", "LICENSE", "TODO"]
-  s.files = [".gitignore", "2011-02-28.md", "CHANGES", "CONTRIBUTORS", "Gemfile", "LICENSE", "README", "README.md", "Rakefile", "TODO", "bin/ripl-rc", "lib/ripl/rc.rb", "lib/ripl/rc/anchor.rb", "lib/ripl/rc/color.rb", "lib/ripl/rc/ctrld_newline.rb", "lib/ripl/rc/eat_whites.rb", "lib/ripl/rc/mkdir_history.rb", "lib/ripl/rc/multiline.rb", "lib/ripl/rc/noirbrc.rb", "lib/ripl/rc/squeeze_history.rb", "lib/ripl/rc/strip_backtrace.rb", "lib/ripl/rc/version.rb", "ripl-rc.gemspec", "screenshot.png", "task/gemgem.rb", "test/test_squeeze_history.rb"]
+  s.files = [".gitignore", "2011-02-28.md", "CHANGES", "CONTRIBUTORS", "Gemfile", "LICENSE", "README", "README.md", "Rakefile", "TODO", "bin/ripl-rc", "lib/ripl-rc.rb", "lib/ripl/rc.rb", "lib/ripl/rc/anchor.rb", "lib/ripl/rc/color.rb", "lib/ripl/rc/ctrld_newline.rb", "lib/ripl/rc/eat_whites.rb", "lib/ripl/rc/mkdir_history.rb", "lib/ripl/rc/multiline.rb", "lib/ripl/rc/noirbrc.rb", "lib/ripl/rc/squeeze_history.rb", "lib/ripl/rc/strip_backtrace.rb", "lib/ripl/rc/version.rb", "ripl-rc.gemspec", "screenshot.png", "task/gemgem.rb", "test/test_squeeze_history.rb"]
   s.homepage = %q{http://github.com/godfat/}
   s.rdoc_options = ["--main", "README"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{ripl plugins collection, take you want, leave you don't.}
   s.test_files = ["test/test_squeeze_history.rb"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripl-rc
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-01 00:00:00.000000000 +08:00
+date: 2011-03-26 00:00:00.000000000 +08:00
 default_executable: ripl-rc
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &2168489000 !ruby/object:Gem::Requirement
+  requirement: &2158040060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168489000
+  version_requirements: *2158040060
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2168488280 !ruby/object:Gem::Requirement
+  requirement: &2158039580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168488280
+  version_requirements: *2158039580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2168487580 !ruby/object:Gem::Requirement
+  requirement: &2158039100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168487580
+  version_requirements: *2158039100
 description: ripl plugins collection, take you want, leave you don't.
 email:
 - godfat (XD) godfat.org
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - TODO
 - bin/ripl-rc
+- lib/ripl-rc.rb
 - lib/ripl/rc.rb
 - lib/ripl/rc/anchor.rb
 - lib/ripl/rc/color.rb
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ripl plugins collection, take you want, leave you don't.