ripl-rc 0.1.1 → 0.1.2

data/CHANGES

@@ -1,5 +1,13 @@
 = ripl-rc changes history
 
+== ripl-rc 0.1.2 -- 2011-02-25
+
+* [     rc] rearranged require order
+* [ plugin] added anchor, like pry. usage: Ripl.anchor(binding) # or obj
+* [ plugin] added multiline, which works better with anchor
+* [ plugin] added mkdir_history, which tries to mkdir -p on history directory
+* [strip_backtrace] fix functionality for custom name (anchor)
+
 == ripl-rc 0.1.1 -- 2011-02-24
 
 * [ plugin] added strip_backtrace

data/README.rdoc

@@ -1,6 +1,5 @@
 = ripl-rc 0.1.1
 by Lin Jen-Shin (godfat[http://godfat.org])
- godfat (XD) godfat.org
 
 == LINKS:
 
@@ -13,11 +12,23 @@ ripl plugins collection
 
 == FEATURES:
 
+# when session ends
 * require 'ripl/rc/squeeze_history'
+* require 'ripl/rc/mkdir_history'
 * require 'ripl/rc/ctrld_newline'
-* require 'ripl/rc/eat_whites'
-* require 'ripl/rc/color'
+
+# result format
 * require 'ripl/rc/strip_backtrace'
+* require 'ripl/rc/color'
+
+# input modification
+* require 'ripl/rc/multiline' # work better with anchor...
+* require 'ripl/rc/eat_whites'
+
+# speical tool
+* require 'ripl/rc/anchor' # pry like, use: Ripl.anchor(binding) # or obj
+
+# for lazies
 * require 'ripl/rc' # for all of above
 
 == REQUIREMENTS:

data/Rakefile

@@ -1,4 +1,6 @@
 
+($LOAD_PATH << File.expand_path("#{File.dirname(__FILE__)}/lib")).uniq!
+
 gemspec = "#{File.dirname(__FILE__)}/ripl-rc.gemspec"
 
 if File.exist?(gemspec) && File.read(gemspec).strip != ''
@@ -19,25 +21,30 @@ if File.exist?(gemspec) && File.read(gemspec).strip != ''
 
   desc "Create tag #{b.version_tag} and build and push " \
        "#{b.name}-#{b.version}.gem to Rubygems"
-  task :release => [:check_version, :gemspec] do
+  task :release => [:gemspec, :check_version] do
     b.release_gem
   end
 
   task :check_version do
     if ENV['VERSION'].nil?
-      puts("\x1b[33mPlease provide "                     \
-           "\x1b[36mVERSION\x1b[33m=\x1b[36mx.y.z\x1b[m")
+      puts("\x1b[32mPlease provide "                     \
+           "\x1b[36mVERSION\x1b[32m=\x1b[36mx.y.z\x1b[m")
       exit(1)
 
     elsif ENV['VERSION'] != b.version.to_s
-      puts("\x1b[33mYou gave \x1b[36mVERSION\x1b[33m=\x1b[36m#{b.version} " \
-           "\x1b[33mbut got\n         \x1b[36m"                             \
-           "VERSION\x1b[33m=\x1b[36m#{ENV['VERSION']}\x1b[m")
+      puts("\x1b[32mYou gave \x1b[36mVERSION\x1b[32m=\x1b[36m#{b.version} " \
+           "\x1b[32mbut got\n         \x1b[36m"                             \
+           "VERSION\x1b[32m=\x1b[36m#{ENV['VERSION']}\x1b[m")
       exit(2)
     end
   end
 end
 
+desc 'Generate rdoc'
+task :rdoc do
+  sh('rdoc --output rdoc --main README.rdoc')
+end
+
 desc 'Run tests'
 task :test do
   sh("#{Gem.ruby} -I lib -S bacon test/test_*.rb")
@@ -92,16 +99,16 @@ task :gemspec do
         s.authors     = ['Lin Jen-Shin (godfat)']
         s.email       = ['godfat (XD) godfat.org']
         s.homepage    = "http://github.com/godfat/#{s.name}"
-        s.summary     = File.read("#{File.dirname(__FILE__)}/README").match(
-                        /== DESCRIPTION:\n\n(.+)?\n\n== FEATURES:/m)[1]
+        s.summary     = File.read("#{File.dirname(__FILE__)}/README.rdoc").
+                        match(/== DESCRIPTION:\n\n(.+)?\n\n== FEATURES:/m)[1]
         s.description = s.summary
 
         s.date             = Time.now.strftime('%Y-%m-%d')
         s.rubygems_version = Gem::VERSION
         s.files            = gem_files
         s.test_files       = gem_files.grep(/test_.+?\.rb$/)
-        s.extra_rdoc_files = ['CHANGES', 'README', "#{s.name}.gemspec"]
-        s.rdoc_options     = ['--main', 'README']
+        s.extra_rdoc_files = []
+        s.rdoc_options     = ['--main', 'README.rdoc']
         s.require_paths    = ['lib']
       end.to_ruby
   }

data/TODO

@@ -1,5 +1,4 @@
 = ripl-rc todo list
 
 * tests for each plugin
-* refactoring color
 * doc

data/lib/ripl/rc/anchor.rb

@@ -0,0 +1,59 @@
+
+require 'ripl'
+
+module Ripl::Rc; end
+module Ripl::Rc::Anchor
+  def loop_eval(str)
+    case obj_or_binding = (config[:rc_anchor] ||= []).last
+      when NilClass
+        super
+
+      when Binding
+        @binding = obj_or_binding
+        super
+
+      else
+        obj_or_binding.instance_eval(str, "(#{@name})", @line)
+    end
+  end
+
+  def prompt
+    if Ripl::Rc.const_defined?(:Color) && kind_of?(Ripl::Rc::Color) &&
+       obj_or_binding = (config[:rc_anchor] ||= []).last
+
+      super.sub(obj_or_binding.inspect, format_result(obj_or_binding))
+    else
+      super
+    end
+  end
+
+  # 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.object_id == Ripl.config[:rc_anchor_last].object_id
+  end
+
+  module Imp
+    def anchor obj_or_binding
+      if Ripl.config[:rc_init].nil?
+        Ripl::Runner.load_rc(Ripl.config[:riplrc])
+        Ripl.config[:rc_init] = true
+      end
+
+      (Ripl.config[:rc_anchor] ||= []) << obj_or_binding
+      Ripl::Shell.create(Ripl.config.merge(
+        :name   => obj_or_binding.inspect,
+        :prompt => obj_or_binding.inspect              +
+                   "(#{Ripl.config[:rc_anchor].size})" +
+                   Ripl.config[:prompt])).loop
+
+      # stores to check if we're exiting from an anchor
+      Ripl.config[:rc_anchor_last] = Ripl.config[:rc_anchor].pop
+    end
+  end
+end
+
+Ripl::Shell.include(Ripl::Rc::Anchor)
+
+Ripl.extend(Ripl::Rc::Anchor::Imp)
+Ripl.config[:prompt] ||= Ripl::Shell::OPTIONS[:prompt]

data/lib/ripl/rc/mkdir_history.rb

@@ -0,0 +1,14 @@
+
+require 'ripl'
+
+module Ripl::Rc; end
+module Ripl::Rc::MkdirHistory
+  # ensure path existed
+  def write_history
+    require 'fileutils'
+    FileUtils.mkdir_p(File.dirname(history_file))
+    super
+  end
+end
+
+Ripl::Shell.include(Ripl::Rc::MkdirHistory)

data/lib/ripl/rc/multiline.rb

@@ -0,0 +1,70 @@
+
+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%,
+      # rubinius
+      %q%expecting '\\n' or ';'%,
+      %q%missing 'end'%,
+      %q%expecting '}'%,
+      # jruby
+      %q%syntax error, unexpected end-of-file%,
+    ]*'|' }/
+
+  def before_loop
+    @rc_multiline_buffer = []
+    super
+  end
+
+  def prompt
+    if @rc_multiline_buffer.empty?
+      super
+    else
+      "#{' '*(@prompt.size-2)}| "
+    end
+  end
+
+  def loop_once
+    catch(:rc_multiline_cont) do
+      super
+      @rc_multiline_buffer.clear
+    end
+  end
+
+  def print_eval_error(e)
+    if e.is_a?(SyntaxError) && e.message =~ ERROR_REGEXP
+      @rc_multiline_buffer << @input
+      throw :rc_multiline_cont
+    else
+      super
+    end
+  end
+
+  def loop_eval(input)
+    if @rc_multiline_buffer.empty?
+      super
+    else
+      super "#{@rc_multiline_buffer.join("\n")}\n#{input}"
+    end
+  end
+
+  def handle_interrupt
+    if @rc_multiline_buffer.empty?
+      super
+    else
+      line = @rc_multiline_buffer.pop
+      if @rc_multiline_buffer.empty?
+        super
+      else
+        puts "[removed this line: #{line}]"
+        throw :rc_multiline_cont
+      end
+    end
+  end
+end
+
+Ripl::Shell.include(Ripl::Rc::Multiline)

data/lib/ripl/rc/squeeze_history.rb

@@ -19,6 +19,10 @@ module Ripl::Rc::SqueezeHistory
     super
   end
 
+  def before_loop
+    super if history.empty?
+  end
+
   module Imp
     def squeeze_history history
       history.to_a.inject([]){ |result, item|
@@ -27,7 +31,7 @@ module Ripl::Rc::SqueezeHistory
         else
           result << item
         end
-      }
+      }.last(Ripl.config[:rc_squeeze_history_size] ||= 500)
     end
   end
 end

data/lib/ripl/rc/strip_backtrace.rb

@@ -7,12 +7,12 @@ module Ripl::Rc::StripBacktrace
 
   # strip backtrace until ripl
   def format_error e
-    "#{e.class}: #{e.message}\n  #{U.strip_backtrace(e).join("\n  ")}"
+    "#{e.class}: #{e.message}\n  #{U.strip_backtrace(e, @name).join("\n  ")}"
   end
 
   module Imp
-    def strip_backtrace e
-      home(cwd(snip(e)))
+    def strip_backtrace e, name
+      home(cwd(snip(e, name)))
     end
 
     def home b
@@ -23,9 +23,10 @@ module Ripl::Rc::StripBacktrace
       b.map{ |p| p.sub(Dir.pwd, './') }
     end
 
-    def snip e
-      e.backtrace[0..e.backtrace.rindex{ |l| l =~ /\(ripl\):\d+:in `.+?'/ } ||
-                     -1]
+    def snip e, name
+      e.backtrace[
+        0..
+        e.backtrace.rindex{ |l| l =~ /\(#{name}\):\d+:in `.+?'/ } || -1]
     end
   end
 end

data/lib/ripl/rc/version.rb

@@ -1,6 +1,6 @@
 
 module Ripl
   module Rc
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/ripl/rc.rb

@@ -1,6 +1,16 @@
 
+# when session ends
 require 'ripl/rc/squeeze_history'
+require 'ripl/rc/mkdir_history'
 require 'ripl/rc/ctrld_newline'
-require 'ripl/rc/eat_whites'
-require 'ripl/rc/color'
+
+# result format
 require 'ripl/rc/strip_backtrace'
+require 'ripl/rc/color'
+
+# input modification
+require 'ripl/rc/multiline'
+require 'ripl/rc/eat_whites'
+
+# speical tool
+require 'ripl/rc/anchor'

data/ripl-rc.gemspec

@@ -2,17 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripl-rc}
-  s.version = "0.1.1"
+  s.version = "0.1.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-02-24}
+  s.date = %q{2011-02-25}
   s.description = %q{ripl plugins collection}
   s.email = ["godfat (XD) godfat.org"]
-  s.extra_rdoc_files = ["CHANGES", "README", "ripl-rc.gemspec"]
-  s.files = [".gitignore", "CHANGES", "Gemfile", "LICENSE", "README", "README.rdoc", "Rakefile", "TODO", "ripl-rc.gemspec", "lib/ripl/rc.rb", "lib/ripl/rc/color.rb", "lib/ripl/rc/ctrld_newline.rb", "lib/ripl/rc/eat_whites.rb", "lib/ripl/rc/squeeze_history.rb", "lib/ripl/rc/strip_backtrace.rb", "lib/ripl/rc/version.rb", "test/test_squeeze_history.rb"]
+  s.files = [".gitignore", "CHANGES", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "TODO", "ripl-rc.gemspec", "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/squeeze_history.rb", "lib/ripl/rc/strip_backtrace.rb", "lib/ripl/rc/version.rb", "test/test_squeeze_history.rb"]
   s.homepage = %q{http://github.com/godfat/ripl-rc}
-  s.rdoc_options = ["--main", "README"]
+  s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{ripl plugins collection}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripl-rc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-24 00:00:00.000000000 +08:00
+date: 2011-02-25 00:00:00.000000000 +08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &2152294800 !ruby/object:Gem::Requirement
+  requirement: &2152358620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152294800
+  version_requirements: *2152358620
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2152262760 !ruby/object:Gem::Requirement
+  requirement: &2152357840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152262760
+  version_requirements: *2152357840
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152171240 !ruby/object:Gem::Requirement
+  requirement: &2152357040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,30 +44,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152171240
+  version_requirements: *2152357040
 description: ripl plugins collection
 email:
 - godfat (XD) godfat.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGES
-- README
-- ripl-rc.gemspec
+extra_rdoc_files: []
 files:
 - .gitignore
 - CHANGES
 - Gemfile
 - LICENSE
-- README
 - README.rdoc
 - Rakefile
 - TODO
 - ripl-rc.gemspec
 - 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/squeeze_history.rb
 - lib/ripl/rc/strip_backtrace.rb
 - lib/ripl/rc/version.rb
@@ -78,7 +77,7 @@ licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/README

@@ -1,47 +0,0 @@
-= ripl-rc 0.1.1
-by Lin Jen-Shin (godfat[http://godfat.org])
- godfat (XD) godfat.org
-
-== LINKS:
-
-* {github}[http://github.com/godfat/ripl-rc]
-* {rubygems}[http://rubygems.org/gems/ripl-rc]
-
-== DESCRIPTION:
-
-ripl plugins collection
-
-== FEATURES:
-
-* require 'ripl/rc/squeeze_history'
-* require 'ripl/rc/ctrld_newline'
-* require 'ripl/rc/eat_whites'
-* require 'ripl/rc/color'
-* require 'ripl/rc/strip_backtrace'
-* require 'ripl/rc' # for all of above
-
-== REQUIREMENTS:
-
-* ripl
-
-== INSTALL:
-
- gem install ripl-rc
-
-== LICENSE:
-
-  Apache License 2.0
-
-  Copyright (c) 2010, Lin Jen-Shin (godfat)
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.