ripl-multi_line 0.2.2 → 0.2.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.3
+* fix 0.2.2 bugs
+* allow procs as multi_line_prompt (and different default value)
+
 == 0.2.2
 * fix for mri regexes
 

data/README.rdoc

@@ -1,5 +1,5 @@
 == Description
-This {ripl}[http://github.com/cldwalker/ripl] plugin allows you to evaluate multiple lines of Ruby code.
+This {ripl}[https://github.com/cldwalker/ripl] plugin allows you to evaluate multiple lines of Ruby code.
 
 == Install
 Install the gem with
@@ -14,11 +14,15 @@ Add the following line to your <tt>~/.riplrc</tt>
 
 You can customize your multi-line prompt with the <tt>:multi_line_prompt</tt> option. For example, put this into your <tt>~/.riplrc</tt>:
 
-  Ripl.config[:multi_line_prompt] = ' >'
+  Ripl.config[:multi_line_prompt] = ' > '
 
 If you are in multi-line situation, you can press <tt>ctrl+c</tt> and the last line will be removed.
 
-== Todo
-* Replaceable check if syntax is valid (allows use of this plugin for other languages than Ruby)
+== AutoIndent
+There is also an indention plugin available: {ripl-auto_indent}[https://github.com/janlelis/ripl-auto_indent]
+
+== Planned for version 0.3.0
+* Tests :)
+* Replaceable check if syntax is valid (then, the plugin can be used for other languages than Ruby)
 
 J-_-L

data/deps.rip

@@ -1 +1 @@
-ripl >=0.2.0
+ripl >=0.3.0

data/lib/ripl/multi_line.rb

@@ -2,9 +2,9 @@ require 'ripl'
 
 module Ripl
   module MultiLine
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
     ERROR_REGEXP = /#{
-      [ %q%unexpected $end%,
+      [ %q%unexpected \$end%,
         %q%unterminated [a-z]+ meets end of file%,
         # rubinius
         %q%expecting '\\n' or ';'%,
@@ -12,7 +12,7 @@ module Ripl
         %q%expecting '}'%,
         # jruby
         %q%syntax error, unexpected end-of-file%,
-      ].map{|e| Regexp.escape(e)}*'|' }/
+      ]*'|' }/
 
     def before_loop
       super
@@ -20,7 +20,16 @@ module Ripl
     end
 
     def prompt
-      @buffer ? config[:multi_line_prompt] : super
+      if @buffer
+        config[:multi_line_prompt].respond_to?(:call) ? 
+            config[:multi_line_prompt].call :
+            config[:multi_line_prompt]
+      else
+        super
+      end
+    rescue StandardError, SyntaxError
+      warn "ripl: Error while creating prompt:\n"+ format_error($!)
+      Ripl::Shell::OPTIONS[:prompt]
     end
 
     def loop_once
@@ -68,6 +77,8 @@ module Ripl
 end
 
 Ripl::Shell.include Ripl::MultiLine
-Ripl.config[:multi_line_prompt] ||= '|    '
+Ripl.config[:multi_line_prompt] ||= proc do # you can also use a plain string here
+  '|' + ' '*(Ripl.shell.instance_variable_get(:@prompt).size-1) # '|  '
+end
 
 # J-_-L

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ripl-multi_line
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +01:00
+date: 2011-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id001
@@ -43,9 +35,6 @@ extra_rdoc_files:
 - LICENSE.txt
 files: 
 - lib/ripl/multi_line.rb
-- test/test_helper.rb
-- test/shell_test.rb
-- test/runner_test.rb
 - LICENSE.txt
 - README.rdoc
 - CHANGELOG.rdoc
@@ -66,23 +55,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A ripl plugin for multi-line eval.

data/test/runner_test.rb

@@ -1,248 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
-
-describe "Runner" do
-  describe ".start" do
-    before { reset_ripl }
-
-    it "loads riplrc" do
-      mock_riplrc
-      mock_shell
-      Ripl.start
-    end
-
-    it "doesn't load riplrc" do
-      mock_shell
-      dont_allow(Runner).load_rc(anything)
-      Ripl.start :riplrc => false
-    end
-
-    it "sets a shell's variables" do
-      mock_riplrc
-      mock_shell
-      Ripl.start(:name=>'shh')
-      Ripl.shell.name.should == 'shh'
-    end
-
-    it "passes options to Ripl.config" do
-      mock_riplrc
-      mock_shell
-      Ripl.start(:history=>'~/.mah_history')
-      Ripl.config[:history].should == '~/.mah_history'
-    end
-
-    it "overrides config set in riplrc" do
-      mock_riplrc { Ripl.config[:name] = 'blah' }
-      mock_shell
-      Ripl.start(:name=>'dude')
-      Ripl.shell.name.should == 'dude'
-    end
-  end
-
-  describe ".run" do
-    describe "riplrc" do
-      before { reset_ripl }
-
-      it "sets config" do
-        mock_riplrc { Ripl.config[:blah] = true }
-        mock_shell
-        Runner.run([])
-        Ripl.config[:blah].should == true
-      end
-
-      it "catches and prints error" do
-        mock(Runner).load(anything) { raise SyntaxError }
-        mock_shell
-        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading ~/.riplrc:\nSyntaxError:}
-      end
-    end
-
-    describe "with subcommand" do
-      def set_dollar_zero(val)
-        $progname = $0
-        alias $0 $progname
-        $0 = val
-      end
-
-      def mock_exec(*args)
-        mock(Runner).exec('ripl-rails', *args) do
-          set_dollar_zero 'ripl-rails'
-          ARGV.replace(args)
-          Ripl.start
-        end
-      end
-
-      it "gets invoked with arguments" do
-        mock_exec 'blah'
-        ripl("rails", 'blah')
-      end
-
-      it "has -F global option parsed" do
-        mock_exec '-F'
-        dont_allow(Runner).load_rc(anything)
-        ripl("rails", "-F", :riplrc=>false)
-      end
-
-      it "saves arguments passed to it" do
-        mock_exec 'blah', '-F'
-        ripl("rails", "blah", "-F", :riplrc=>false)
-        Ripl::Runner.argv.should == ['blah', '-F']
-      end
-
-      it "has other global option parsed" do
-        mock_exec '-r=blah'
-        mock(Runner).require('blah')
-        ripl("rails", "-r=blah")
-      end
-
-      it "has automatic --help" do
-        mock_exec '--help'
-        mock(Runner).exit
-        ripl("rails", "--help").chomp.should == "ripl rails [OPTIONS] [ARGS]"
-      end
-
-      it "that is invalid aborts" do
-        mock(Runner).abort("`zzz' is not a ripl command.")
-        ripl 'zzz', :riplrc => false, :loop => false
-      end
-      after_all { set_dollar_zero 'ripl' }
-    end
-
-    describe "with -I option" do
-      before { @old_load_path = $:.dup }
-      after { $:.replace @old_load_path }
-
-      it "and equal sign adds to $LOAD_PATH" do
-        ripl("-I=blah")
-        $:[0].should == 'blah'
-      end
-
-      it "and no equal sign adds to $LOAD_PATH" do
-        ripl("-Ispec")
-        $:[0].should == 'spec'
-      end
-
-      it "and whitespace delimited argument adds to $LOAD_PATH" do
-        ripl("-I", "spec")
-        $:[0].should == 'spec'
-      end
-
-      it "containing multiple paths adds to $LOAD_PATH" do
-        ripl("-I=app:lib")
-        $:[0,2].should == ['app', 'lib']
-      end
-
-      it "called more than once adds to $LOAD_PATH" do
-        ripl("-Ilib", "-Ispec")
-        $:[0,2].should == ['spec', 'lib']
-      end
-
-      it "with invalid argument doesn't add to $LOAD_PATH" do
-        previous_size = $:.size
-        ripl("-I")
-        $:.size.should == previous_size
-      end
-    end
-
-    describe "with -r option" do
-      it "and equal sign requires path" do
-        mock(Runner).require('rip')
-        ripl("-r=rip")
-      end
-
-      it "and no equal sign requires path" do
-        mock(Runner).require('rip')
-        ripl("-rrip")
-      end
-
-      it "and whitespace delimited argument requires path" do
-        mock(Runner).require('rip')
-        ripl("-r", "rip")
-      end
-
-      it "called more than once requires paths" do
-        mock(Runner).require('rip')
-        mock(Runner).require('dude')
-        ripl("-rrip", "-rdude")
-      end
-
-      it "with invalid argument requires blank" do
-        mock(Runner).require('')
-        ripl('-r')
-      end
-    end
-
-    it "with -f option doesn't load irbrc" do
-      reset_ripl
-      reset_config
-      stub(Kernel).at_exit()
-      mock_shell { |shell|
-        mock(shell).loop_once { throw :ripl_exit }
-        dont_allow(Runner).load_rc(anything)
-      }
-      ripl("-f", :loop => false)
-      Ripl.config[:irbrc] = '~/.irbrc'
-    end
-
-    it "with -F option doesn't load riplrc" do
-      reset_ripl
-      dont_allow(Runner).load_rc(anything)
-      mock_shell { |shell|
-        stub(Kernel).at_exit
-        mock(shell).before_loop
-        mock(shell).loop_once { throw :ripl_exit }
-      }
-      ripl("-F", :riplrc => false, :loop => false)
-    end
-
-    it "with -d option sets $DEBUG" do
-      ripl("-d")
-      $DEBUG.should == true
-      $DEBUG = nil
-    end
-
-    it "with -v option prints version" do
-      mock(Runner).exit
-      ripl("-v").chomp.should == Ripl::VERSION
-    end
-
-    it "with -h option prints help" do
-      mock(Runner).exit
-      actual = ripl("-h")
-      actual.should =~ /^Usage: ripl/
-      actual.should =~ /Options:\n  -f/
-    end
-
-    it "with invalid options prints errors" do
-      capture_stderr {
-        ripl('--blah', '-z')
-      }.chomp.should == "ripl: invalid option `blah'\nripl: invalid option `z'"
-    end
-
-    describe "with plugin" do
-      before_all do
-        Moo = Module.new do
-          def parse_option(option, argv)
-            option == '--moo' ? puts("MOOOO") : super
-          end
-        end
-        Runner.extend Moo
-        Runner.add_options ['--moo', 'just moos']
-      end
-
-      it "parses plugin option" do
-        ripl("--moo").chomp.should == 'MOOOO'
-      end
-
-      it "displays plugin option in --help" do
-        mock(Runner).exit
-        ripl("--help").should =~ /--moo\s*just moos/
-      end
-
-      it "handles invalid option" do
-        capture_stderr {
-          ripl('--blah')
-        }.chomp.should == "ripl: invalid option `blah'"
-      end
-    end
-  end
-end

data/test/shell_test.rb

@@ -1,113 +0,0 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
-require 'ripl/multi_line' # TODO relative
-
-describe "Shell" do
-  before { reset_ripl }
-
-  def shell(options={})
-    Ripl.shell(options)
-  end
-
-  describe "#loop" do
-    before { mock(shell).before_loop }
-    it "exits with exit" do
-      mock(shell).get_input { 'exit' }
-      dont_allow(shell).eval_input
-      shell.loop
-    end
-
-    it "exits with quit" do
-      mock(shell).get_input { 'quit' }
-      dont_allow(shell).eval_input
-      shell.loop
-    end
-
-    it "exits with Control-D" do
-      mock(shell).get_input { nil }
-      dont_allow(shell).eval_input
-      shell.loop
-    end
-  end
-
-  it "#loop_once handles Control-C" do
-    mock(shell).get_input { raise Interrupt }
-    dont_allow(shell).eval_input
-    capture_stdout { shell.loop_once }.should == "\n"
-  end
-
-  describe "#prompt" do
-    it "should be set to config[:multi_line_prompt]" do
-      mock(shell).get_input { '[' }
-      shell.loop_once
-      shell.prompt.should == Ripl.config[:multi_line_prompt]
-    end
-  end
-
-  describe "#before_loop" do
-    before_all { Ripl::Commands.send(:define_method, :ping) { 'pong' } }
-    before { reset_config }
-    it "adds commands to main from Commands" do
-      stub(Ripl::Runner).load_rc
-      stub(Kernel).at_exit
-      Ripl.shell.before_loop
-      Ripl.shell.loop_eval("ping").should == 'pong'
-    end
-
-    it "adds commands to fixnum from Commands" do
-      stub(Ripl::Runner).load_rc
-      Ripl.shell.binding = 1.send(:binding)
-      stub(Kernel).at_exit
-      Ripl.shell.before_loop
-      Ripl.shell.loop_eval("ping").should == 'pong'
-    end
-  end
-
-  describe "#eval_input" do
-    before { @line = shell.line; shell.eval_input("10 ** 2") }
-
-    describe "normally" do
-      it "sets result" do
-        shell.result.should == 100
-      end
-
-      it "sets _" do
-        shell.eval_input('_')
-        shell.result.should == 100
-      end
-
-      it "increments line" do
-        shell.line.should == @line + 1
-      end
-    end
-
-    describe "with error" do
-      before {
-        @line = shell.line
-        @stderr = capture_stderr { shell.eval_input('{') }
-      }
-
-      it "prints it" do
-        @stderr.should =~ /^(?:SyntaxError: compile error|SyntaxError: \(ripl\):\d+: syntax error)/
-      end
-
-      it "sets @error_raised" do
-        shell.instance_variable_get("@error_raised").should == true
-      end
-
-      it "increments line" do
-        shell.line.should == @line + 1
-      end
-    end
-  end
-
-  describe "API#" do
-    Shell::API.instance_methods.delete_if {|e| e[/=$/]}.each do |meth|
-      it "#{meth} is accessible to plugins" do
-        mod = Object.const_set "Ping_#{meth}", Module.new
-        mod.send(:define_method, meth) { "pong_#{meth}" }
-        Shell.send :include, mod
-        shell.send(meth).should == "pong_#{meth}"
-      end
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,60 +0,0 @@
-require 'bacon'
-require 'bacon/bits'
-require 'rr'
-require 'bacon/rr'
-require 'stringio'
-require 'ripl'
-include Ripl
-
-module Helpers
-  def ripl(*args)
-    options = args[-1].is_a?(Hash) ? args.pop : {}
-    mock_riplrc unless options[:riplrc] == false
-    mock(Ripl.shell).loop unless options[:loop] == false
-    capture_stdout { Ripl::Runner.run(args) }
-  end
-
-  def mock_riplrc(&block)
-    mock(Runner).load_rc(Ripl.config[:riplrc], &block)
-  end
-
-  def mock_shell(&block)
-    mock(Shell).create(anything) {|e|
-      shell = Shell.new(e)
-      block ? block.call(shell) : mock(shell).loop
-      shell
-    }
-  end
-
-  def reset_ripl
-    Ripl.instance_eval "@config = @shell = @riplrc = nil"
-  end
-
-  def reset_config
-    Ripl.config.merge! :history => '~/.irb_history', :completion => {}
-  end
-
-  def capture_stdout(&block)
-    original_stdout = $stdout
-    $stdout = fake = StringIO.new
-    begin
-      yield
-    ensure
-      $stdout = original_stdout
-    end
-    fake.string
-  end
-
-  def capture_stderr(&block)
-    original_stderr = $stderr
-    $stderr = fake = StringIO.new
-    begin
-      yield
-    ensure
-      $stderr = original_stderr
-    end
-    fake.string
-  end
-end
-
-Bacon::Context.send :include, Helpers