ripl-multi_line 0.3.0 → 0.3.1

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.3.1
+* Ruby 2.0 compatibility
+
 == 0.3.0
 * comes with five different multi-line implementations: live_error, error_check, irb, ripper and ruby_parser
   * can be changed with config[:multi_line_engine], default is :live_error

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT LICENSE
 
-Copyright (c) 2010 Jan Lelis
+Copyright (c) 2010, 2011, 2013 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -56,7 +56,8 @@ None of the above solutions is perfect, so... maybe it's time to roll your own ;
   Ripl::MultiLine.engine = Ripl::MultiLine::LiveError
   Ripl::Shell.include Ripl::MultiLine.engine
 
-== Credits
-Contributions & influences by cldwalker and godfat.
+== TODO
+* Write thousands of test cases
 
-J-_-L
+== J-_-L
+Contributions & influences by cldwalker and godfat.

data/Rakefile

@@ -1,20 +1,22 @@
 require 'rake'
 require 'fileutils'
 
+GEMSPEC_NAME = Dir['*.gemspec'].first
+
 def gemspec
-  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
+  @gemspec ||= eval(File.read(GEMSPEC_NAME), binding, GEMSPEC_NAME)
 end
 
 desc "Build the gem"
 task :gem => :gemspec do
-  sh "gem build .gemspec"
+  sh "gem build #{GEMSPEC_NAME}"
   FileUtils.mkdir_p 'pkg'
   FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
 end
 
 desc "Install the gem locally"
 task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version} --no-rdoc --no-ri}
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-rdoc --no-ri}
 end
 
 desc "Generate the gemspec"

data/lib/ripl/multi_line.rb

@@ -1,9 +1,8 @@
 require 'ripl'
+require 'ripl/multi_line/version'
 
 module Ripl
   module MultiLine
-    VERSION = '0.3.0'
-
     class << self
       attr_accessor :engine
     end

data/lib/ripl/multi_line/error_check.rb

@@ -5,15 +5,12 @@ require 'ripl/multi_line'
 require 'ripl/multi_line/live_error'
 
 # # # #
-# This multi-line implementation uses IRB's RubyLex parser
-#   works on:         1.9  1.8  jruby  rbx
+# This multi-line implementation uses catches the syntax errors that are yielded by unfinsihed statements
+#   works on:         2.0 1.9  1.8  jruby  rbx
 #   analyze features: see live_error.rb
 #   known issues:     see live_error.rb
 module Ripl::MultiLine::ErrorCheck
-  VERSION = '0.1.0'
-
-  ruby_engine = defined?(RUBY_ENGINE) && RUBY_ENGINE.downcase.to_sym
-  ruby_engine = :ruby if !Ripl::MultiLine::LiveError::ERROR_MESSAGES.keys.include?(ruby_engine)
+  VERSION = '0.2.0'
 
   define_method(:multiline?) do |string|
     break [:forced] if string =~ /;\s*\Z/ # force multi line with ;
@@ -21,7 +18,7 @@ module Ripl::MultiLine::ErrorCheck
     begin
       eval "if nil; #{string}; end"
     rescue SyntaxError => e
-      Ripl::MultiLine::LiveError::ERROR_MESSAGES[ruby_engine].each{ |type, message|
+      Ripl::MultiLine::LiveError::ERROR_MESSAGES[Ripl::MultiLine::LiveError.ruby_engine].each{ |type, message|
         break type if message === e.message
       }
     end

data/lib/ripl/multi_line/irb.rb

@@ -7,7 +7,7 @@ require 'ripl/multi_line'
 
 # # # #
 # This multi-line implementation uses IRB's RubyLex parser
-#   works on:         1.9  1.8  jruby  rbx
+#   works on:         2.0  1.9  1.8  jruby  rbx
 #   analyze features: none
 module Ripl::MultiLine::Irb
   VERSION = '0.1.0'

data/lib/ripl/multi_line/live_error.rb

@@ -4,8 +4,8 @@ Ripl.config[:multi_line_engine] ||= :live_error
 require 'ripl/multi_line'
 
 # # # #
-# This multi-line implementation uses IRB's RubyLex parser
-#   works on:         1.9  1.8  jruby  rbx
+# This multi-line implementation uses catches the syntax errors that are yielded by unfinsihed statements
+#   works on:         2.0  1.9  1.8  jruby  rbx
 #   analyze features: [:literal, :string]
 #                     [:literal, :regexp]
 #                     [:literal, :array]   (mri only)
@@ -13,59 +13,74 @@ require 'ripl/multi_line'
 #                     [:statement]
 #                     [:forced]
 #   notes:            rbx support buggy (depends on rubinius error messages)
-module Ripl::MultiLine::LiveError
-  VERSION = "0.1.0"
+module Ripl::MultiLine
+  module LiveError
+    VERSION = "0.2.0"
 
-  ERROR_MESSAGES = {
-    :ruby => [
-      [[:literal, :string], /unterminated string meets end of file/],
-      [[:literal, :regexp], /unterminated regexp meets end of file/],
-      [[:literal, :array],  /syntax error, unexpected \$end, expecting '\]'/],
-      [[:literal, :hash],   /syntax error, unexpected \$end, expecting '\}'/], # does not work for ranges or {5=>
-      [[:statement],        /syntax error, unexpected \$end/],
-    ],
-    :jruby => [
-      [[:literal, :string], /unterminated string meets end of file/],
-      [[:literal, :regexp], /unterminated regexp meets end of file/], # array or hash cannot be detected
-      [[:statement],        /syntax error, unexpected end-of-file/],
-    ],
-    :rbx => [
-      [[:literal, :string], /unterminated [a-z]+ meets end of file/], # no extra message for regexes
-      [[:literal],          /expecting '\\n' or ';'/], # TODO: better rbx regexes or rbx bug report
-      [[:literal, :hash],   /expecting '\}'/],
-      # [:literal,          /expecting '\]'/],
-      # [:literal,          /expecting '\)'/],
-      [[:statement],        /syntax error, unexpected \$end/],
-      [[:statement],        /missing 'end'/], # for i in [2,3,4] do;
-    ],
-  }
-  ruby_engine = defined?(RUBY_ENGINE) && RUBY_ENGINE.downcase.to_sym
-  ruby_engine = :ruby if !ERROR_MESSAGES.keys.include?(ruby_engine)
+    def self.ruby_engine
+      return @ruby_engine if defined? @ruby_engine
+      @ruby_engine = defined?(RUBY_ENGINE) && RUBY_ENGINE.downcase.to_sym
+      @ruby_engine = :ruby   if !ERROR_MESSAGES.keys.include?(ruby_engine) # 1.8 is same as 1.9
+      @ruby_engine = :ruby19 if ruby_engine == :ruby && RUBY_VERSION <= "2.0"
+      @ruby_engine
+    end
 
-  define_method(:print_eval_error) do |e|
-    if e.is_a? SyntaxError
-      ERROR_MESSAGES[ruby_engine].each{ |type, message|
-        handle_multiline(type) if message === e.message
-      }
+    ERROR_MESSAGES = {
+      :ruby => [
+        [[:literal, :string], /unterminated string meets end of file/],
+        [[:literal, :regexp], /unterminated regexp meets end of file/],
+        [[:literal, :array],  /syntax error, unexpected end-of-input, expecting '\]'/],
+        [[:literal, :hash],   /syntax error, unexpected end-of-input, expecting '\}'/], # does not work for ranges or {5=>
+        [[:statement],        /syntax error, unexpected end-of-input/],
+      ],
+      :ruby19 => [
+        [[:literal, :string], /unterminated string meets end of file/],
+        [[:literal, :regexp], /unterminated regexp meets end of file/],
+        [[:literal, :array],  /syntax error, unexpected \$end, expecting '\]'/],
+        [[:literal, :hash],   /syntax error, unexpected \$end, expecting '\}'/], # does not work for ranges or {5=>
+        [[:statement],        /syntax error, unexpected \$end/],
+      ],
+      :jruby => [
+        [[:literal, :string], /unterminated string meets end of file/],
+        [[:literal, :regexp], /unterminated regexp meets end of file/], # array or hash cannot be detected
+        [[:statement],        /syntax error, unexpected end-of-file/],
+      ],
+      :rbx => [
+        [[:literal, :string], /unterminated [a-z]+ meets end of file/], # no extra message for regexes
+        [[:literal],          /expecting '\\n' or ';'/], # TODO: better rbx regexes or rbx bug report
+        [[:literal, :hash],   /expecting '\}'/],
+        # [:literal,          /expecting '\]'/],
+        # [:literal,          /expecting '\)'/],
+        [[:statement],        /syntax error, unexpected \$end/],
+        [[:statement],        /missing 'end'/], # for i in [2,3,4] do;
+      ],
+    }
+ 
+    define_method(:print_eval_error) do |e|
+      if e.is_a? SyntaxError
+        ERROR_MESSAGES[LiveError.ruby_engine].each{ |type, message|
+          handle_multiline(type) if message === e.message
+        }
+      end
+      super(e)
     end
-    super(e)
-  end
 
-  def eval_input(input)
-    if input =~ /;\s*\Z/ # force multi line with ;
-      handle_multiline(:forced)
-    elsif input =~ /^=begin(\s.*)?$/ && !@buffer
-      @ignore_mode = true # MAYBE: change prompt
-    elsif !@ignore_mode
-      super
+    def eval_input(input)
+      if input =~ /;\s*\Z/ # force multi line with ;
+        handle_multiline(:forced)
+      elsif input =~ /^=begin(\s.*)?$/ && !@buffer
+        @ignore_mode = true # MAYBE: change prompt
+      elsif !@ignore_mode
+        super
+      end
     end
-  end
 
-  def print_result(result)
-    if @ignore_mode && @input == '=end'
-      @ignore_mode = false
-    elsif !@ignore_mode
-      super
+    def print_result(result)
+      if @ignore_mode && @input == '=end'
+        @ignore_mode = false
+      elsif !@ignore_mode
+        super
+      end
     end
   end
 end

data/lib/ripl/multi_line/ripper.rb

@@ -6,8 +6,8 @@ Ripl.config[:multi_line_engine] ||= :ripper
 require 'ripl/multi_line'
 
 # # # #
-# This multi-line implementation uses IRB's RubyLex parser
-#   works on:         1.9  1.8(gem)
+# This multi-line implementation uses Ripper
+#   works on:         2.0  1.9  1.8(gem)
 #   analyze features: [:literal, :string]
 #                     [:literal, :regexp]
 #                     [:literal, :array]   (mri only)

data/lib/ripl/multi_line/version.rb

@@ -0,0 +1,6 @@
+module Ripl
+  module MultiLine
+    VERSION = '0.3.1'
+  end
+end
+

data/{.gemspec → ripl-multi_line.gemspec}

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'rubygems' unless defined? Gem
-require File.dirname(__FILE__) + "/lib/ripl/multi_line"
+require File.dirname(__FILE__) + "/lib/ripl/multi_line/version"
  
 Gem::Specification.new do |s|
   s.name        = "ripl-multi_line"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bacon-bits'
   s.add_development_dependency 'bacon-rr'
   s.add_development_dependency 'rr'
-  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip Rakefile *.gemspec])
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.license = 'MIT'
 end

data/test/shell_test.rb

@@ -8,24 +8,29 @@ describe "Shell" do
   end
 
   describe "multi-line behaviour" do
-    should_eval %| "m" * 2 |
-    should_eval %| "8989" |
-    should_eval %| "zzz" |
-
-    should_not_eval %| "m" *  |
-
-    should_not_eval %| " |
-    should_not_eval %| ' |
-    should_not_eval %| / |
-
-    should_not_eval %| [ |
-    should_not_eval %| { |
-    should_not_eval %| ( |
-
-    should_not_eval %| def hey |
-    should_not_eval %| def hey; 89 |
-    should_not_eval %| begin |
-    should_eval %| for x in [2,3,4];7;end |
+    %w[live_error error_check ripper irb].each { |engine|
+      describe "[#{engine}]" do
+        should_eval %| "m" * 2 |
+        should_eval %| "8989" |
+        should_eval %| "zzz" |
+
+        should_not_eval %| "m" *  |
+
+        should_not_eval %| " |
+        should_not_eval %| ' |
+        should_not_eval %| / |
+
+        should_not_eval %| [ |
+        should_not_eval %| { |
+        should_not_eval %| ( |
+
+        should_not_eval %| def hey |
+        should_not_eval %| def hey; 89 |
+        should_not_eval %| begin |
+        should_not_eval %| module Foo |
+        should_eval %| for x in [2,3,4];7;end |
+      end
+    }
   end
 
   # TODO add misc real tests for everything

metadata

@@ -1,122 +1,141 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ripl-multi_line
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ripl
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon-bits
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: bacon-bits
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bacon-rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bacon-rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This ripl plugin allows you to evaluate multiple lines of Ruby code.
 email: mail@janlelis.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
-files: 
-- lib/ripl/multi_line.rb
+files:
 - lib/ripl/multi_line/live_error.rb
-- lib/ripl/multi_line/error_check.rb
+- lib/ripl/multi_line/irb.rb
+- lib/ripl/multi_line/version.rb
 - lib/ripl/multi_line/ripper.rb
 - lib/ripl/multi_line/ruby_parser.rb
-- lib/ripl/multi_line/irb.rb
-- test/test_helper.rb
+- lib/ripl/multi_line/error_check.rb
+- lib/ripl/multi_line.rb
 - test/shell_test.rb
+- test/test_helper.rb
 - LICENSE.txt
 - README.rdoc
 - CHANGELOG.rdoc
-- deps.rip
 - Rakefile
-- .gemspec
+- ripl-multi_line.gemspec
 homepage: http://github.com/janlelis/ripl-multi_line
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A ripl plugin for multi-line eval.
 test_files: []
-

data/deps.rip

@@ -1 +0,0 @@
-ripl >=0.3.0