ripl-rc 0.2.1 → 0.2.2

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "task"]
+	path = task
+	url = git://github.com/godfat/gemgem.git

data/CHANGES

@@ -1,5 +1,10 @@
 = ripl-rc changes history
 
+== ripl-rc 0.2.2 -- 2011-06-01
+
+* [multiline_history     ] fixed multiline_history
+* [multiline_history_file] now we have persistent multiline_history
+
 == ripl-rc 0.2.1 -- 2011-04-11
 
 * [multiline] fixed history with editline (e.g. mac's build-in ruby)

data/Rakefile

@@ -12,7 +12,7 @@ task 'gem:spec' do
     s.version     = Ripl::Rc::VERSION
     s.executables = [s.name]
 
-    %w[ripl]    .each{ |g| s.add_runtime_dependency(g) }
+    %w[ripl]    .each{ |g| s.add_runtime_dependency(g, '>=0.4.1') }
     %w[bacon rr].each{ |g| s.add_development_dependency(g) }
   end
 

data/lib/ripl/rc.rb

@@ -1,6 +1,19 @@
 
+# this really messes thing up! should be loaded first if we're using
+# ripl/rc/multiline_history_file, otherwise, history couldn't really
+# be overridden...
+require 'ripl'
+if Ripl.config[:readline] == true
+  require 'readline'
+  require 'ripl/readline'
+elsif Ripl.config[:readline]
+  require Ripl.config[:readline].to_s
+  require 'ripl/readline'
+end
+
 # upon session ends
 require 'ripl/rc/squeeze_history'
+require 'ripl/rc/multiline_history_file'
 require 'ripl/rc/mkdir_history'
 require 'ripl/rc/ctrld_newline'
 
@@ -13,6 +26,7 @@ require 'ripl/rc/color'
 
 # upon input
 require 'ripl/rc/multiline'
+require 'ripl/rc/multiline_history'
 require 'ripl/rc/eat_whites'
 
 # speical tool

data/lib/ripl/rc/multiline.rb

@@ -10,12 +10,13 @@ module Ripl::Rc::Multiline
   # ruby -e '{'
   # ruby -e '['
   # ruby -e '('
+  # ruby -e '/'
   # ruby -e 'class C'
   # ruby -e 'def f'
   # ruby -e 'begin'
   ERROR_REGEXP = Regexp.new(
-    [ # string
-      "unterminated string meets end of file",
+    [ # string or regexp
+      "unterminated \\w+ meets end of file",
       # mri and rubinius
       "syntax error, unexpected \\$end",
       # rubinius
@@ -51,7 +52,6 @@ module Ripl::Rc::Multiline
     return super if Multiline.disabled?
     if e.is_a?(SyntaxError) && e.message =~ ERROR_REGEXP
       @rc_multiline_buffer << @input if @rc_multiline_buffer.empty?
-      history.pop
       throw :rc_multiline_cont
     else
       super
@@ -64,9 +64,7 @@ module Ripl::Rc::Multiline
       super
     else
       @rc_multiline_buffer << input
-      history.pop
-      history << "\n" + (str = @rc_multiline_buffer.join("\n"))
-      super str
+      super @rc_multiline_buffer.join("\n")
     end
   end
 
@@ -76,12 +74,9 @@ module Ripl::Rc::Multiline
       super
     else
       line = @rc_multiline_buffer.pop
-      if @rc_multiline_buffer.empty?
-        super
-      else
-        puts "[removed this line: #{line}]"
-        throw :rc_multiline_cont
-      end
+      print "[removed this line: #{line}]"
+      super
+      throw :rc_multiline_cont
     end
   end
 end

data/lib/ripl/rc/multiline_history.rb

@@ -0,0 +1,30 @@
+
+require 'ripl/rc/u'
+require 'ripl/rc/multiline' # dependency
+
+module Ripl::Rc::MultilineHistory
+  include Ripl::Rc::U
+
+  def loop_eval(input)
+    return super if MultilineHistory.disabled?
+    result = super # might throw
+    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
+    return super if MultilineHistory.disabled?
+    unless @rc_multiline_buffer.empty?
+      @rc_multiline_trash ||= 0
+      @rc_multiline_trash  += 1
+    end
+    super
+  end
+end
+
+Ripl::Shell.include(Ripl::Rc::MultilineHistory)

data/lib/ripl/rc/multiline_history_file.rb

@@ -0,0 +1,35 @@
+
+require 'ripl/rc/u'
+# require 'ripl/rc/history_ivar' # dependency
+
+module Ripl::Rc::MultilineHistoryFile
+  include Ripl::Rc::U
+
+  def write_history
+    return super if MultilineHistoryFile.disabled?
+    @history = history.to_a.map{ |line|
+      line.gsub("\n", "#{Ripl.config[:rc_multiline_history_file_token]}\n")
+    }
+    super
+  end
+
+  def before_loop
+    return super if MultilineHistoryFile.disabled?
+    super # this would initilaize @history to [], nothing we can do here
+    buffer = []
+    File.exist?(history_file) &&
+      IO.readlines(history_file).each{ |line|
+        if line.end_with?(
+             "#{Ripl.config[:rc_multiline_history_file_token]}\n")
+          buffer << line[0...
+               -Ripl.config[:rc_multiline_history_file_token].size-1] + "\n"
+        else
+          history << (buffer.join + line).chomp
+          buffer = []
+        end
+      }
+  end
+end
+
+Ripl::Shell.include(Ripl::Rc::MultilineHistoryFile)
+Ripl.config[:rc_multiline_history_file_token] ||= ' '

data/lib/ripl/rc/squeeze_history.rb

@@ -4,11 +4,6 @@ require 'ripl/rc/u'
 module Ripl::Rc::SqueezeHistory
   include Ripl::Rc::U
 
-  # avoid some complicated conditions...
-  def history
-    super || (@history ||= [])
-  end
-
   # write squeezed history
   def write_history
     return super if SqueezeHistory.disabled?
@@ -26,11 +21,6 @@ module Ripl::Rc::SqueezeHistory
     super
   end
 
-  def before_loop
-    return super if SqueezeHistory.disabled?
-    super if history.empty?
-  end
-
   module Imp
     def squeeze_history history
       history.to_a.inject([]){ |result, item|

data/lib/ripl/rc/version.rb

@@ -1,6 +1,6 @@
 
 module Ripl
   module Rc
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/ripl-rc.gemspec

@@ -2,37 +2,79 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripl-rc}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-04-11}
+  s.authors = [%q{Lin Jen-Shin (godfat)}]
+  s.date = %q{2011-06-01}
   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.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/last_exception.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/test.rb", "lib/ripl/rc/u.rb", "lib/ripl/rc/version.rb", "ripl-rc.gemspec", "screenshot.png", "task/gemgem.rb", "test/test_disable_shortcut.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.7.2}
+  s.email = [%q{godfat (XD) godfat.org}]
+  s.executables = [%q{ripl-rc}]
+  s.extra_rdoc_files = [
+  %q{CHANGES},
+  %q{CONTRIBUTORS},
+  %q{LICENSE},
+  %q{TODO}]
+  s.files = [
+  %q{.gitignore},
+  %q{.gitmodules},
+  %q{2011-02-28.md},
+  %q{CHANGES},
+  %q{CONTRIBUTORS},
+  %q{Gemfile},
+  %q{LICENSE},
+  %q{README},
+  %q{README.md},
+  %q{Rakefile},
+  %q{TODO},
+  %q{bin/ripl-rc},
+  %q{lib/ripl-rc.rb},
+  %q{lib/ripl/rc.rb},
+  %q{lib/ripl/rc/anchor.rb},
+  %q{lib/ripl/rc/color.rb},
+  %q{lib/ripl/rc/ctrld_newline.rb},
+  %q{lib/ripl/rc/eat_whites.rb},
+  %q{lib/ripl/rc/last_exception.rb},
+  %q{lib/ripl/rc/mkdir_history.rb},
+  %q{lib/ripl/rc/multiline.rb},
+  %q{lib/ripl/rc/multiline_history.rb},
+  %q{lib/ripl/rc/multiline_history_file.rb},
+  %q{lib/ripl/rc/noirbrc.rb},
+  %q{lib/ripl/rc/squeeze_history.rb},
+  %q{lib/ripl/rc/strip_backtrace.rb},
+  %q{lib/ripl/rc/test.rb},
+  %q{lib/ripl/rc/u.rb},
+  %q{lib/ripl/rc/version.rb},
+  %q{ripl-rc.gemspec},
+  %q{screenshot.png},
+  %q{task/gemgem.rb},
+  %q{test/test_disable_shortcut.rb},
+  %q{test/test_squeeze_history.rb}]
+  s.homepage = %q{https://github.com/godfat/}
+  s.rdoc_options = [
+  %q{--main},
+  %q{README}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{ripl plugins collection, take you want, leave you don't.}
-  s.test_files = ["test/test_disable_shortcut.rb", "test/test_squeeze_history.rb"]
+  s.test_files = [
+  %q{test/test_disable_shortcut.rb},
+  %q{test/test_squeeze_history.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ripl>, [">= 0"])
+      s.add_runtime_dependency(%q<ripl>, [">= 0.4.1"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<ripl>, [">= 0"])
+      s.add_dependency(%q<ripl>, [">= 0.4.1"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ripl>, [">= 0"])
+    s.add_dependency(%q<ripl>, [">= 0.4.1"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
   end

data/task/gemgem.rb

@@ -11,7 +11,7 @@ module Gemgem
     yield(spec = Gem::Specification.new{ |s|
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
-      s.homepage    = "http://github.com/godfat/#{s.name}"
+      s.homepage    = "https://github.com/godfat/#{s.name}"
 
       s.summary     = File.read("#{Gemgem.dir}/README").
                       match(/DESCRIPTION:\n\n(.+?)\n\n/m)[1]
@@ -33,7 +33,18 @@ module Gemgem
   end
 
   def write
-    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f| f << spec.to_ruby }
+    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
+      f << split_lines(spec.to_ruby) }
+  end
+
+  def split_lines ruby
+    ruby.gsub(/(.+?)\[(.+?)\]/){ |s|
+      if $2.index(',')
+        "#{$1}[\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+      else
+        s
+      end
+    }
   end
 
   def all_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripl-rc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-11 00:00:00.000000000Z
+date: 2011-06-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &2156654560 !ruby/object:Gem::Requirement
+  requirement: &2168485380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156654560
+  version_requirements: *2168485380
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2156654080 !ruby/object:Gem::Requirement
+  requirement: &2168484900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156654080
+  version_requirements: *2168484900
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156653600 !ruby/object:Gem::Requirement
+  requirement: &2168484420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156653600
+  version_requirements: *2168484420
 description: ripl plugins collection, take you want, leave you don't.
 email:
 - godfat (XD) godfat.org
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - TODO
 files:
 - .gitignore
+- .gitmodules
 - 2011-02-28.md
 - CHANGES
 - CONTRIBUTORS
@@ -76,6 +77,8 @@ files:
 - lib/ripl/rc/last_exception.rb
 - lib/ripl/rc/mkdir_history.rb
 - lib/ripl/rc/multiline.rb
+- lib/ripl/rc/multiline_history.rb
+- lib/ripl/rc/multiline_history_file.rb
 - lib/ripl/rc/noirbrc.rb
 - lib/ripl/rc/squeeze_history.rb
 - lib/ripl/rc/strip_backtrace.rb
@@ -87,7 +90,7 @@ files:
 - task/gemgem.rb
 - test/test_disable_shortcut.rb
 - test/test_squeeze_history.rb
-homepage: http://github.com/godfat/
+homepage: https://github.com/godfat/
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -109,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: ripl plugins collection, take you want, leave you don't.