rib 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e9907e98417b88befb05f1493f23737418dd34
-  data.tar.gz: a3b24ca77822b8f6aa5877a173303cde0b329127
+  metadata.gz: 727360f1321ba8190d0b2316745c26d5b1e26897
+  data.tar.gz: 1ae6ffef657e408088ee7778cd764e85a90f7697
 SHA512:
-  metadata.gz: 9bc4ead99bd2d24251849fabd4c03005fbd2ddb71dd704710dc6ebdbe22e867677c39ee665d18e27bae8f07b224bbcfee9fdb1b681a7121a17a90b3ca7692e59
-  data.tar.gz: 66c7f94e4549d4f63509ab8848f9227cd32660f31b98bc3ce380ff9b9431cbf6ea28c56b50a6fec9052fbf07f7f1643a161cc8a81d4ce97130fa69250e18fd16
+  metadata.gz: 50beef0233c1d1ef514f19f660be5a3941bf564041f69fa740c2e4663cda721e09c7310d59732dacb5d4c12f0f475160f1ebb84b36aaaa5aceb91d39078792db
+  data.tar.gz: 1c68d1f84c0d2c5b26e6302b75fac4aebcdc4a549b8037feab9dda1e38d0d8bf2e0e1dbd8d03b56bca5664a8d212e86b5f1229945fc512ae2d13c4bf6481ac23

data/.gitignore

@@ -1,2 +1 @@
-pkg
-*.rbc
+/pkg/

data/.travis.yml

@@ -1,11 +1,13 @@
 before_install: 'git submodule update --init'
 script: 'ruby -r bundler/setup -S rake test'
 
-env:
-  - 'RBXOPT=-X19'
-
 rvm:
   - 1.9.3
   - 2.0.0
-  - rbx-head
-  - jruby-head
+  - 2.1.0
+  - rbx
+  - jruby
+
+matrix:
+  allow_failures:
+    - rvm: jruby

data/CHANGES.md

@@ -1,5 +1,15 @@
 # CHANGES
 
+## Rib 1.2.0 -- 2014-01-17
+
+* We no longer really eval on TOPLEVEL_BINDING, but a private binding
+  derived from TOPLEVEL_BINDING. This is due to RubyGems bin stub would
+  actually pollute TOPLEVEL_BINDING, leaving `str` and `version` as
+  local variables. I would like to avoid them, thus introducing this change.
+  Please let me know if this breaks anything, thanks!
+
+* [core/multiline] Fixed a multiline detection for Rubinius.
+
 ## Rib 1.1.6 -- 2013-08-14
 
 * [more/color] Fixed inspecting recursive array and hash.

data/Gemfile

@@ -10,6 +10,11 @@ gem 'muack'
 gem 'bond'
 gem 'hirb'
 
-platforms(:ruby) do
+platforms :ruby do
   gem 'readline_buffer'
 end
+
+platforms :rbx do
+  gem 'rubysl-singleton' # used in rake
+  gem 'rubysl-readline'  # we need readline extension
+end

data/README.md

@@ -228,7 +228,7 @@ simple, simpler than rib-rails.
 
 Apache License 2.0
 
-Copyright (c) 2011-2012, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2014, 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.

data/Rakefile

@@ -1,18 +1,14 @@
 
-require "#{dir = File.dirname(__FILE__)}/task/gemgem"
-Gemgem.dir = dir
-
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib")).uniq!
-
-desc 'Generate gemspec'
-task 'gem:spec' do
-  Gemgem.spec = Gemgem.create do |s|
-    require 'rib/version'
-    s.name    = 'rib'
-    s.version = Rib::VERSION
-
-    %w[].each{ |g| s.add_runtime_dependency(g) }
-  end
+begin
+  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+rescue LoadError
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
+end
 
-  Gemgem.write
+Gemgem.init(dir) do |s|
+  require 'rib/version'
+  s.name    = 'rib'
+  s.version = Rib::VERSION
+  %w[].each{ |g| s.add_runtime_dependency(g) }
 end

data/lib/rib/app/rack.rb

@@ -15,7 +15,7 @@ module Rib::Rack
     Rib.abort("Error: Cannot find config.ru") unless rack?
     app, _ = Rack::Builder.parse_file('config.ru')
     self.app = app
-    Rib.shell.config[:binding].eval('def app; Rib::Rack.app; end')
+    Rib.shell.eval_binding.eval('def app; Rib::Rack.app; end')
     Rib.say("Access your app via :app method")
   end
 

data/lib/rib/app/rails.rb

@@ -101,7 +101,7 @@ module Rib::Rails
 
     # rails 3.2
     if ::Rails.const_defined?(:ConsoleMethods)
-      Rib.shell.config[:binding].eval('extend ::Rails::ConsoleMethods')
+      Rib.shell.eval_binding.eval('extend ::Rails::ConsoleMethods')
     end
   end
 

data/lib/rib/core/multiline.rb

@@ -48,6 +48,7 @@ module Rib::Multiline
                       # mri and rubinius
                       "syntax error, unexpected \\$end"    ,
                       # rubinius
+                      "expecting keyword_end"              ,
                       "expecting \\$end"                   ,
                       "expecting '.+'( or '.+')*"          ,
                       "missing '.+' for '.+' started on line \\d+"].join('|'))

data/lib/rib/core/readline.rb

@@ -19,3 +19,9 @@ module Rib::Readline
     ::Readline.readline(prompt, true)
   end
 end
+
+unless ::Readline::HISTORY.respond_to?(:last)
+  def (::Readline::HISTORY).last
+    self[-1]
+  end
+end

data/lib/rib/core/squeeze_history.rb

@@ -11,7 +11,6 @@ module Rib::SqueezeHistory
   def loop_once
     return super if SqueezeHistory.disabled?
     begin
-      # TODO: history[-1] is MRI 1.9+
       input, last_input = history[-1], history[-2]
     rescue IndexError # EditLine is really broken, to_a is needed for it
       array = history.to_a
@@ -35,7 +34,6 @@ module Rib::SqueezeHistory
 
   private
   def squeezed_history
-    # TODO: history.inject is MRI 1.9+
     history.to_a.inject([]){ |result, item|
       if result.last == item || item.strip == ''
         result

data/lib/rib/more/anchor.rb

@@ -7,12 +7,12 @@ module Rib::Anchor
 
   # --------------- Rib API ---------------
 
-  def loop_eval str
+  def loop_eval input
     return super if Rib::Anchor.disabled?
     if eval_binding.kind_of?(Binding)
       super
     else
-      eval_binding.instance_eval(str, "(#{name})", line)
+      eval_binding.instance_eval(input, "(#{name})", line)
     end
   end
 
@@ -53,6 +53,18 @@ module Rib::Anchor
   end
 
   module Imp
+    # Enter an interactive Rib shell based on a particular context.
+    #
+    # @api public
+    # @param obj_or_binding [Object, Binding] The context of the shell.
+    # @param opts [Hash] The config hash passed to the newly created shell.
+    #   See {Rib::Shell#initialize} for all possible options.
+    # @return [Rib::Skip] This is the mark telling Rib do not print anything.
+    #   It's only used internally in Rib.
+    # @see Rib::Shell#initialize
+    # @example
+    #   Rib.anchor binding
+    #   Rib.anchor 123
     def anchor obj_or_binding, opts={}
       return if Rib::Anchor.disabled?
 

data/lib/rib/runner.rb

@@ -66,7 +66,7 @@ module Rib::Runner
 
   def run argv=ARGV
     (@running_commands ||= []) << Rib.config[:name]
-    unused = parse(argv)
+    unused, e = parse(argv)
     # if it's running a Rib command, the loop would be inside Rib itself
     # so here we only parse args for the command
     return if @running_commands.pop != 'rib'
@@ -74,12 +74,13 @@ module Rib::Runner
     # not any other Rib command
     Rib.warn("Unused arguments: #{unused.inspect}") unless unused.empty?
     require 'rib/core' if Rib.config.delete(:mimic_irb)
+    Rib.shell.eval_binding.eval(e, __FILE__, __LINE__)
     loop
   end
 
   def loop retry_times=5
     Rib.shell.loop
-  rescue Exception => e
+  rescue => e
     if retry_times <= 0
       Rib.warn("Error: #{e}. Too many retries, give up.")
     elsif Rib.shells.last.running?
@@ -96,19 +97,19 @@ module Rib::Runner
   end
 
   def parse argv
-    unused = []
+    unused, e = [], ''
     until argv.empty?
       case arg = argv.shift
       when /^-e=?(.+)?/, /^--eval=?(.+)?/
-        eval($1 || argv.shift, TOPLEVEL_BINDING, __FILE__, __LINE__)
+        e = $1 || argv.shift || ''
 
       when /^-d/, '--debug'
         $DEBUG = true
-        argv.unshift("-#{arg[2..-1]}") if arg.size > 2
+        parse_next(argv, arg)
 
       when /^-w/, '--warn'
         $-w, $VERBOSE = true, true
-        argv.unshift("-#{arg[2..-1]}") if arg.size > 2
+        parse_next(argv, arg)
 
       when /^-I=?(.+)?/, /^--include=?(.+)?/
         paths = ($1 || argv.shift).split(':')
@@ -122,7 +123,7 @@ module Rib::Runner
 
       when /^-n/, '--no-config'
         Rib.config.delete(:config)
-        argv.unshift("-#{arg[2..-1]}") if arg.size > 2
+        parse_next(argv, arg)
 
       when /^-h/, '--help'
         puts(help)
@@ -140,12 +141,17 @@ module Rib::Runner
         unused << arg
       end
     end
-    unused
+    [unused, e]
+  end
+
+  def parse_next argv, arg
+    argv.unshift("-#{arg[2..-1]}") if arg.size > 2
   end
 
   def help
-    maxn = options.transpose.first.map(&:size).max
-    maxd = options.transpose.last .map(&:size).max
+    optt = options.transpose
+    maxn = optt.first.map(&:size).max
+    maxd = optt.last .map(&:size).max
     "Usage: #{Rib.config[:name]}"                    \
     " [ruby OPTIONS] [rib OPTIONS] [rib COMMANDS]\n" +
     options.map{ |(name, desc)|

data/lib/rib/shell.rb

@@ -11,13 +11,36 @@ class Rib::Shell
   end
 
   attr_reader :config
+
+  # Create a new shell.
+  #
+  # @api public
+  # @param config [Hash] The config of the shell.
+  # @option config [String] :config ('~/.rib/config.rb')
+  #   The path to Rib config file.
+  # @option config [String] :name ('rib')
+  #   The name of the shell. Used for Rib application.
+  # @option config [String] :result_prompt ('=> ')
+  # @option config [String] :prompt ('>> ')
+  # @option config [Binding, Object] :binding (new_private_binding)
+  #   The context of the shell. Could be an Object.
+  # @option config [Array<String>] :exit ([nil])
+  #   The keywords to exit the shell. `nil` means EOF (ctrl+d).
+  # @option config [Fixnum] :line (1) The beginning of line number.
+  # @option config [String] :history_file ('~/.rib/config/history.rb')
+  #   (Only if {Rib::History} plugin is used) The path to history file.
+  # @option config [Fixnum] :history_size (500)
+  #   (Only if {Rib::History} plugin is used) Maximum numbers of history.
+  # @option config [Hash<Class, Symbol>] :color (...)
+  #   (Only if {Rib::Color} plugin is used) Data type colors mapping.
+  # @option config [String] :autoindent_spaces ('  ')
+  #   (Only if {Rib::Autoindent} plugin is used) The indented string.
   def initialize(config={})
-    self.config = {
-      :result_prompt => '=> '           ,
-      :prompt        => '>> '           ,
-      :binding       => TOPLEVEL_BINDING,
-      :exit          => [nil]           ,
-      :line          => 1               }.merge(config)
+    config[:binding] ||= new_private_binding
+    self.config = {:result_prompt => '=> ',
+                   :prompt        => '>> ',
+                   :exit          => [nil],
+                   :line          => 1    }.merge(config)
     @running = false
   end
 
@@ -41,4 +64,16 @@ class Rib::Shell
 
   protected
   attr_writer :config
+
+  private
+  # Avoid namespace pollution from rubygems bin stub.
+  # To be specific, version and str.
+  def new_private_binding
+    TOPLEVEL_BINDING.eval <<-RUBY
+    def main; binding; end # anyway to define <main> method?
+    ret = main
+    Object.send(:remove_method, 'main') # never pollute anything
+    ret
+    RUBY
+  end
 end

data/lib/rib/test.rb

@@ -66,18 +66,9 @@ shared :rib do
 
   def stub_readline
     stub(::Readline).readline(is_a(String), true){
-      (::Readline::HISTORY << str.chomp)[-1]
+      (::Readline::HISTORY << str.chomp).last
     }
   end
-
-  # TODO: history.clear is MRI 1.9+
-  def clear_history history
-    if history.respond_to?(:clear)
-      history.clear
-    else
-      history.pop until history.empty?
-    end
-  end
 end
 
 module Kernel
@@ -89,4 +80,5 @@ end
 Rib::Blackhole = Object.new
 b = Rib::Blackhole.singleton_class
 b.instance_methods(true).each{ |m|
-  b.send(:undef_method, m) unless [:object_id, :__send__].include?(m) }
+  b.send(:undef_method, m) unless
+    [:object_id, :__send__, :__id__].include?(m) }

data/lib/rib/test/multiline.rb

@@ -3,8 +3,8 @@ shared :setup_multiline do
   def setup_shell
     @shell = Rib::Shell.new(
       :binding => Object.new.instance_eval{binding}).before_loop
-    stub(@shell).print.with_any_args
-    stub(@shell).puts .with_any_args
+    stub(@shell).print{}.with_any_args
+    stub(@shell).puts{} .with_any_args
   end
 
   def setup_input str
@@ -19,15 +19,15 @@ shared :setup_multiline do
 
   def input str
     setup_input(str)
-    mock(@shell).throw(:rib_multiline).proxy
+    mock(@shell).throw(:rib_multiline)
   end
 
   def input_done str, err=nil
     setup_input(str)
     if err
-      mock(@shell).print_eval_error(is_a(err))
+      mock(@shell).print_eval_error(is_a(err)){}
     else
-      mock(@shell).print_result(is_a(Object))
+      mock(@shell).print_result(is_a(Object)){}
     end
     @shell.loop_once
     true.should.eq true

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.1.6'
+  VERSION = '1.2.0'
 end

data/rib.gemspec

@@ -1,12 +1,14 @@
 # -*- encoding: utf-8 -*-
+# stub: rib 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.1.6"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-08-14"
+  s.date = "2014-01-17"
   s.description = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell\n\nRib is based on the design of [ripl][] and the work of [ripl-rc][], some of\nthe features are also inspired by [pry][]. The aim of Rib is to be fully\nfeatured and yet very easy to opt-out or opt-in other features. It shall\nbe simple, lightweight and modular so that everyone could customize Rib.\n\n[ripl]: https://github.com/cldwalker/ripl\n[ripl-rc]: https://github.com/godfat/ripl-rc\n[pry]: https://github.com/pry/pry"
   s.email = ["godfat (XD) godfat.org"]
   s.executables = [
@@ -69,7 +71,7 @@ Gem::Specification.new do |s|
   "lib/rib/version.rb",
   "rib.gemspec",
   "screenshot.png",
-  "task/.gitignore",
+  "task/README.md",
   "task/gemgem.rb",
   "test/core/test_completion.rb",
   "test/core/test_history.rb",
@@ -81,11 +83,11 @@ Gem::Specification.new do |s|
   "test/more/test_multiline_history.rb",
   "test/test_api.rb",
   "test/test_plugin.rb",
+  "test/test_runner.rb",
   "test/test_shell.rb"]
   s.homepage = "https://github.com/godfat/rib"
   s.licenses = ["Apache License 2.0"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.2.1"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",
@@ -98,5 +100,6 @@ Gem::Specification.new do |s|
   "test/more/test_multiline_history.rb",
   "test/test_api.rb",
   "test/test_plugin.rb",
+  "test/test_runner.rb",
   "test/test_shell.rb"]
 end

data/task/README.md

@@ -0,0 +1,54 @@
+# Gemgem
+
+## DESCRIPTION:
+
+Provided tasks:
+
+    rake clean        # Remove ignored files
+    rake gem:build    # Build gem
+    rake gem:install  # Install gem
+    rake gem:release  # Release gem
+    rake gem:spec     # Generate gemspec
+    rake test         # Run tests in memory
+
+## REQUIREMENTS:
+
+* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+
+## INSTALLATION:
+
+    git submodule add git://github.com/godfat/gemgem.git task
+
+And in Rakefile:
+
+``` ruby
+begin
+  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+rescue LoadError
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
+end
+
+Gemgem.init(dir) do |s|
+  s.name    = 'your-gem'
+  s.version = '0.1.0'
+end
+```
+
+## LICENSE:
+
+Apache License 2.0
+
+Copyright (c) 2011-2013, 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.

data/task/gemgem.rb

@@ -1,14 +1,26 @@
 
-require 'pathname'
-
 module Gemgem
   class << self
-    attr_accessor :dir, :spec
+    attr_accessor :dir, :spec, :spec_create
   end
 
   module_function
+  def gem_tag    ; "#{spec.name}-#{spec.version}"     ; end
+  def gem_path   ; "#{pkg_dir}/#{gem_tag}.gem"        ; end
+  def spec_path  ; "#{dir}/#{spec.name}.gemspec"      ; end
+  def pkg_dir    ; "#{dir}/pkg"                       ; end
+  def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
+
+  def init dir, &block
+    self.dir = dir
+    $LOAD_PATH.unshift("#{dir}/lib")
+    ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
+    ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.spec_create = block
+  end
+
   def create
-    yield(spec = Gem::Specification.new{ |s|
+    spec = Gem::Specification.new do |s|
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
@@ -16,163 +28,144 @@ module Gemgem
       s.summary     = description.first
       s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
 
-      s.rubygems_version = Gem::VERSION
-      s.date             = Time.now.strftime('%Y-%m-%d')
-      s.files            = gem_files
-      s.test_files       = gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
-      s.executables      = Dir['bin/*'].map{ |f| File.basename(f) }
-      s.require_paths    = %w[lib]
-    })
-    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
-    spec
+      s.date        = Time.now.strftime('%Y-%m-%d')
+      s.files       = gem_files
+      s.test_files  = test_files
+      s.executables = bin_files
+    end
+    spec_create.call(spec)
+    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    self.spec = spec
   end
 
-  def readme
-    path = %w[README.md README].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @readme ||=
-      if path
-        ps = "##{File.read(path)}".
-             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
-        ps.inject('HEADER' => ps.first){ |r, s, i|
-          r[s[/\w+/]] = s
-          r
-        }
+  def write
+    File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
+  end
+
+  def split_lines ruby
+    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
+      if $2.index(',')
+        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
       else
-        {}
+        s
       end
+    }
   end
 
-  def description
-    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines
+  def strip_path path
+    strip_home_path(strip_cwd_path(path))
   end
 
-  def changes
-    path = %w[CHANGES.md CHANGES].find{ |name|
-      File.exist?("#{Gemgem.dir}/#{name}")
-    }
-    @changes ||=
-      if path
-        date = '\d+{4}\-\d+{2}\-\d{2}'
-        File.read(path).match(
-          /([^\n]+#{date}\n\n(.+?))(?=\n\n[^\n]+#{date}\n|\Z)/m)[1]
-      else
-        ''
-      end
+  def strip_home_path path
+    path.sub(ENV['HOME'], '~')
   end
 
-  def ann_md
-     "#{readme['HEADER'].sub(/([\w\-]+)/, "[\\1](#{spec.homepage})")}\n\n" \
-    "##{readme['DESCRIPTION'][/[^\n]+\n\n[^\n]+/]}\n\n"                    \
-    "### CHANGES:\n\n"                                                     \
-    "###{changes}\n\n"                                                     \
-    "##{readme['INSTALLATION']}\n\n"                                       +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS'][/[^\n]+\n\n[^\n]+/]}"
-    else '' end
+  def strip_cwd_path path
+    path.sub(Dir.pwd, '.')
   end
 
-  def ann_html
-    gem 'nokogiri'
-    gem 'kramdown'
-
-    IO.popen('kramdown', 'r+') do |md|
-      md.puts Gemgem.ann_md
-      md.close_write
-      require 'nokogiri'
-      html = Nokogiri::XML.parse("<gemgem>#{md.read}</gemgem>")
-      html.css('*').each{ |n| n.delete('id') }
-      html.root.children.to_html
-    end
+  def git *args
+    `git --git-dir=#{dir}/.git #{args.join(' ')}`
   end
 
-  def ann_email
-    "#{readme['HEADER'].sub(/([\w\-]+)/, "\\1 <#{spec.homepage}>")}\n\n" \
-    "#{readme['DESCRIPTION']}\n\n"                                       \
-    "#{readme['INSTALLATION']}\n\n"                                      +
-    if readme['SYNOPSIS'] then "##{readme['SYNOPSIS']}\n\n" else '' end  +
-    "## CHANGES:\n\n"                                                    \
-    "##{changes}\n\n"
+  def sh_git *args
+    Rake.sh('git', "--git-dir=#{dir}/.git", *args)
   end
 
-  def gem_tag
-    "#{spec.name}-#{spec.version}"
+  def sh_gem *args
+    Rake.sh(Gem.ruby, '-S', 'gem', *args)
   end
 
-  def write
-    File.open("#{dir}/#{spec.name}.gemspec", 'w'){ |f|
-      f << split_lines(spec.to_ruby) }
+  def glob path=dir
+    Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
   end
 
-  def split_lines ruby
-    ruby.gsub(/(.+?)\s*=\s*\[(.+?)\]/){ |s|
-      if $2.index(',')
-        "#{$1} = [\n  #{$2.split(',').map(&:strip).join(",\n  ")}]"
+  def readme
+    @readme ||=
+      if (path = "#{Gemgem.dir}/README.md") && File.exist?(path)
+        ps = "##{File.read(path)}".
+             scan(/((#+)[^\n]+\n\n.+?(?=(\n\n\2[^#\n]+\n)|\Z))/m).map(&:first)
+        ps.inject('HEADER' => ps.first){ |r, s, i|
+          r[s[/\w+/]] = s
+          r
+        }
       else
-        s
+        {}
       end
-    }
+  end
+
+  def description
+    # JRuby String#lines is returning an enumerator
+    @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
   def all_files
-    @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/|\.git$}
-        nil
+    @all_files ||= fold_files(glob).sort
+  end
+
+  def fold_files files
+    files.inject([]){ |r, path|
+      if File.file?(path) && path !~ %r{/\.git(/|$)}  &&
+         (rpath = path[%r{^#{escaped_dir}/(.*$)}, 1])
+        r << rpath
+      elsif File.symlink?(path) # walk into symlinks...
+        r.concat(fold_files(glob(File.expand_path(path,
+                                                  File.readlink(path)))))
       else
-        file.to_s
+        r
       end
-    }.compact.sort
+    }
   end
 
   def gem_files
-    @gem_files ||= all_files - ignored_files
+    @gem_files ||= all_files.reject{ |f|
+      f =~ ignored_pattern && !git_files.include?(f)
+    }
   end
 
-  def ignored_files
-    @ignored_file ||= all_files.select{ |path| ignore_patterns.find{ |ignore|
-      path =~ ignore && !git_files.include?(path)}}
+  def test_files
+    @test_files ||= gem_files.grep(%r{^test/(.+?/)*test_.+?\.rb$})
+  end
+
+  def bin_files
+    @bin_files ||= gem_files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   end
 
   def git_files
     @git_files ||= if File.exist?("#{dir}/.git")
-                     `git ls-files`.split("\n")
+                     git('ls-files').split("\n")
                    else
                      []
                    end
   end
 
-  # protected
-  def find_files path
-    path.children.select(&:file?).map{|file| file.to_s[(dir.size+1)..-1]} +
-    path.children.select(&:directory?).map{|dir| find_files(dir)}.flatten
+  def ignored_files
+    @ignored_files ||= all_files.grep(ignored_pattern)
   end
 
-  def ignore_patterns
-    @ignore_files ||= expand_patterns(
-      gitignore.split("\n").reject{ |pattern|
-        pattern.strip == ''
-      }).map{ |pattern| %r{^([^/]+/)*?#{Regexp.escape(pattern)}(/[^/]+)*?$} }
+  def ignored_pattern
+    @ignored_pattern ||= if gitignore.empty?
+                           /^$/
+                         else
+                           Regexp.new(expand_patterns(gitignore).join('|'))
+                         end
   end
 
   def expand_patterns pathes
-    pathes.map{ |path|
-      if path !~ /\*/
-        path
-      else
-        expand_patterns(
-          Dir[path] +
-          Pathname.new(File.dirname(path)).children.select(&:directory?).
-            map{ |prefix| "#{prefix}/#{File.basename(path)}" })
-      end
-    }.flatten
+    # http://git-scm.com/docs/gitignore
+    pathes.flat_map{ |path|
+      # we didn't implement negative pattern for now
+      Regexp.escape(path).sub(%r{^/}, '^').gsub(/\\\*/, '[^/]*')
+    }
   end
 
   def gitignore
-    if File.exist?(path = "#{dir}/.gitignore")
-      File.read(path)
-    else
-      ''
-    end
+    @gitignore ||= if File.exist?(path = "#{dir}/.gitignore")
+                     File.read(path).lines.
+                       reject{ |l| l == /^\s*(#|\s+$)/ }.map(&:strip)
+                   else
+                     []
+                   end
   end
 end
 
@@ -180,22 +173,37 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  sh("#{Gem.ruby} -S gem install pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.sh_gem('install', Gemgem.gem_path)
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  sh("#{Gem.ruby} -S gem build #{Gemgem.spec.name}.gemspec")
-  sh("mkdir -p pkg")
-  sh("mv #{Gemgem.gem_tag}.gem pkg/")
+  require 'fileutils'
+  require 'rubygems/package'
+  gem = nil
+  Dir.chdir(Gemgem.dir) do
+    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
+    FileUtils.mkdir_p(Gemgem.pkg_dir)
+    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
+  end
+  puts "\e[35mGem built: \e[33m" \
+       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+end
+
+desc 'Generate gemspec'
+task :spec do
+  Gemgem.create
+  Gemgem.write
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  sh("git tag #{Gemgem.gem_tag}")
-  sh("git push")
-  sh("git push --tags")
-  sh("#{Gem.ruby} -S gem push pkg/#{Gemgem.gem_tag}.gem")
+  Gemgem.module_eval do
+    sh_git('tag', Gemgem.gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', Gemgem.gem_path)
+  end
 end
 
 task :check do
@@ -216,53 +224,39 @@ end
 
 end # of gem namespace
 
-desc 'Run tests in memory'
+desc 'Run tests'
 task :test do
+  next if Gemgem.test_files.empty?
+
   require 'bacon'
   Bacon.extend(Bacon::TestUnitOutput)
   Bacon.summary_on_exit
-  $LOAD_PATH.unshift('lib')
-  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
+  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
 end
 
-desc 'Run tests with shell'
-task 'test:shell', :RUBY_OPTS do |t, args|
-  files = Dir['test/**/test_*.rb'].join(' ')
-
-  cmd = [Gem.ruby, args[:RUBY_OPTS],
-         '-I', 'lib', '-S', 'bacon', '--quiet', files]
-
-  sh(cmd.compact.join(' '))
-end
+desc 'Trash ignored files'
+task :clean => ['gem:spec'] do
+  next if Gemgem.ignored_files.empty?
 
-desc 'Generate ann markdown'
-task 'ann:md' => ['gem:spec'] do
-  puts Gemgem.ann_md
-end
+  require 'fileutils'
+  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
+  puts "Move the following files into:" \
+       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
 
-desc 'Generate ann html'
-task 'ann:html' => ['gem:spec'] do
-  puts Gemgem.ann_html
-end
+  Gemgem.ignored_files.each do |file|
+    from = "#{Gemgem.dir}/#{file}"
+    to   = "#{trash}/#{File.dirname(file)}"
+    puts Gemgem.strip_path(from)
 
-desc 'Generate ann email'
-task 'ann:email' => ['gem:spec'] do
-  puts Gemgem.ann_email
-end
-
-desc 'Generate rdoc'
-task :doc => ['gem:spec'] do
-  sh("yardoc -o rdoc --main README.md" \
-     " --files #{Gemgem.spec.extra_rdoc_files.join(',')}")
-end
+    FileUtils.mkdir_p(to)
+    FileUtils.mv(from, to)
+  end
 
-desc 'Remove ignored files'
-task :clean => ['gem:spec'] do
-  trash = "~/.Trash/#{Gemgem.spec.name}/"
-  sh "mkdir -p #{trash}" unless File.exist?(File.expand_path(trash))
-  Gemgem.ignored_files.each{ |file| sh "mv #{file} #{trash}" }
+  print "\e[0m"
 end
 
 task :default do
-  puts `#{Gem.ruby} -S #{$PROGRAM_NAME} -T`
+  # Is there a reliable way to do this in the current process?
+  # It failed miserably before between Rake versions...
+  exec "#{Gem.ruby} -S #{$PROGRAM_NAME} -f #{Rake.application.rakefile} -T"
 end

data/test/core/test_history.rb

@@ -5,8 +5,7 @@ require 'rib/core/history'
 shared :history do
   should '#after_loop save history' do
     inputs = %w[blih blah]
-    # TODO: history.replace(input) is MRI 1.9+
-    clear_history(@shell.history)
+    @shell.history.clear
     @shell.history.push(*inputs)
 
     @shell.after_loop
@@ -52,7 +51,7 @@ describe Rib::History do
 
   before do
     if readline?
-      clear_history(::Readline::HISTORY)
+      ::Readline::HISTORY.clear
       stub_readline
     end
     @history_file = "/tmp/test_rib_#{rand}"

data/test/core/test_squeeze_history.rb

@@ -11,21 +11,21 @@ shared :squeeze_history do
 
   should 'loop_once squeeze history' do
     times = @input.size
-    stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'")[-1] }
-    stub(@shell).print_result.with_any_args
+    stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'").last }
+    stub(@shell).print_result{}.with_any_args
     times.times{ @shell.loop_once }
     @shell.history.to_a.should.eq %w[foo bar foo bar].map{ |i| "'#{i}'" }
   end
 
   should 'be disabled if disabled' do
-    Rib::SqueezeHistory.disable
-    times = @input.size
-    input = @input.dup
-    stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'")[-1] }
-    stub(@shell).print_result.with_any_args
-    times.times{ @shell.loop_once }
-    @shell.history.to_a.should.eq input.map{ |i| "'#{i}'" }
-    Rib::SqueezeHistory.enable
+    Rib::SqueezeHistory.disable do
+      times = @input.size
+      input = @input.dup
+      stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'").last }
+      stub(@shell).print_result{}.with_any_args
+      times.times{ @shell.loop_once }
+      @shell.history.to_a.should.eq input.map{ |i| "'#{i}'" }
+    end
   end
 end
 
@@ -36,7 +36,7 @@ describe Rib::SqueezeHistory do
     @history = "/tmp/test_rib_#{rand}"
     @shell   = Rib::Shell.new(:history_file => @history).before_loop
     @input   = %w[foo bar bar foo bar]
-    clear_history(@shell.history)
+    @shell.history.clear
   end
 
   after do

data/test/core/test_underscore.rb

@@ -29,7 +29,7 @@ shared :underscore do
 
   should 'set __' do
     setup
-    stub(@shell).puts.with_any_args
+    stub(@shell).puts{}.with_any_args
     mock(@shell).get_input{'XD'}
     mock(@shell).get_input{'__'}
     @shell.loop_once
@@ -43,7 +43,7 @@ describe Rib::Underscore do
   def setup bound=Object.new
     @shell = Rib::Shell.new(
       :binding => bound.instance_eval{binding}).before_loop
-    stub(@shell).puts(is_a(String))
+    stub(@shell).puts(is_a(String)){}
   end
 
   test_for Rib::Underscore do

data/test/more/test_multiline_history.rb

@@ -8,12 +8,12 @@ describe Rib::MultilineHistory do
   behaves_like :setup_multiline
 
   def check str, err=nil
-    clear_history(@shell.history)
+    @shell.history.clear
     with_history(str, err)
 
     setup_shell
 
-    clear_history(@shell.history)
+    @shell.history.clear
     @shell.history << 'old history'
     with_history(str, err, 'old history')
   end

data/test/test_runner.rb

@@ -0,0 +1,35 @@
+
+require 'rib/test'
+require 'rib/runner'
+
+describe Rib::Runner do
+  behaves_like :rib
+
+  before do
+    Rib.disable_plugins
+    @shell = Rib::Shell.new
+    mock(Rib).shell{ @shell }.times(2)
+  end
+
+  def input *args
+    args.each{ |item| mock(@shell).get_input{ item } }
+    mock(@shell).get_input{}
+  end
+
+  def output *args
+    args.each{ |item| mock(@shell).puts("=> #{item}"){} }
+    mock(@shell).puts{}
+  end
+
+  should '-e' do
+     input('a')
+    output('1')
+    Rib::Runner.run(%w[-ea=1]).should.eq @shell
+  end
+
+  should '-e nothing' do
+     input
+    output
+    Rib::Runner.run(%w[-e]).should.eq @shell
+  end
+end

data/test/test_shell.rb

@@ -18,7 +18,7 @@ describe Rib::Shell do
     end
     should 'exit'      do                               input('exit' ) end
     should 'also exit' do                               input(' exit') end
-    should 'ctrl+d'    do mock(@shell).puts           ; input(nil)     end
+    should 'ctrl+d'    do mock(@shell).puts{}         ; input(nil)     end
     should ':q'        do @shell.config[:exit] << ':q'; input(':q')    end
     should '\q'        do @shell.config[:exit] << '\q'; input('\q')    end
   end
@@ -35,27 +35,27 @@ describe Rib::Shell do
     end
 
     should 'handles ctrl+c' do
-      mock(@shell).handle_interrupt
+      mock(@shell).handle_interrupt{}
       input{ raise Interrupt }
     end
 
     should 'prints result' do
-      mock(@shell).puts('=> "mm"')
+      mock(@shell).puts('=> "mm"'){}
       input('"m" * 2')
     end
 
     should 'error in print_result' do
-      mock(Rib).warn(match(/Error while printing result.*BOOM/m))
+      mock(Rib).warn(match(/Error while printing result.*BOOM/m)){}
       input('obj = Object.new; def obj.inspect; raise "BOOM"; end; obj')
     end
 
     should 'not crash if user input is a blackhole' do
-      mock(Rib).warn(match(/Error while printing result/))
+      mock(Rib).warn(match(/Error while printing result/)){}
       input('Rib::Blackhole')
     end
 
     should 'print error from eval' do
-      mock(@shell).puts(match(/RuntimeError/))
+      mock(@shell).puts(match(/RuntimeError/)){}
       input('raise "blah"')
     end
   end
@@ -87,8 +87,12 @@ describe Rib::Shell do
 
   should 'call after_loop even if in_loop raises' do
     mock(@shell).loop_once{ raise 'boom' }
-    mock(Rib).warn(is_a(String))
-    mock(@shell).after_loop
+    mock(Rib).warn(is_a(String)){}
+    mock(@shell).after_loop{}
     lambda{@shell.loop}.should.raise(RuntimeError)
   end
+
+  should 'have empty binding' do
+    @shell.eval_input('local_variables').first.should.empty
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -34,9 +34,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -85,7 +85,7 @@ files:
 - lib/rib/version.rb
 - rib.gemspec
 - screenshot.png
-- task/.gitignore
+- task/README.md
 - task/gemgem.rb
 - test/core/test_completion.rb
 - test/core/test_history.rb
@@ -97,6 +97,7 @@ files:
 - test/more/test_multiline_history.rb
 - test/test_api.rb
 - test/test_plugin.rb
+- test/test_runner.rb
 - test/test_shell.rb
 homepage: https://github.com/godfat/rib
 licenses:
@@ -108,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -133,4 +134,5 @@ test_files:
 - test/more/test_multiline_history.rb
 - test/test_api.rb
 - test/test_plugin.rb
+- test/test_runner.rb
 - test/test_shell.rb

data/task/.gitignore

@@ -1 +0,0 @@
-*.rbc