rib 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1a6d608c225a5dc61d4a9b58f6de671d17b7b0
-  data.tar.gz: 07430433a3cee05dd733726a1ef07522a09f585f
+  metadata.gz: e72a119f6305e6c1e85579ae3e1b22564b6b5b56
+  data.tar.gz: 71f3bedf29f8cf9ae94a3fe9cfcf7317d0ef617c
 SHA512:
-  metadata.gz: 1783b25cca7c85a1b79db3581568111ef077bf9e631037d1a0dbf8faeafb0d1514c8c35cdea6e95bdebc4d5e7847a151c101de426449d0555aa62cb158ea9600
-  data.tar.gz: 9fbca213d0d22a3dd45d5a16a9b60c6e26cac2c971ee5fd09aa8983fabf7b43486f445183507272989484e43a1aa53dc957e115e58d8d1a547a8164972e8397c
+  metadata.gz: e5733937ed0bbb20cf9372a68e8fb937c1570d9a734e68e5137175237145ccc7f149bf7a3b9fcd5874aa37a3dd3c957a0487567ef6ee9161af88017dce160693
+  data.tar.gz: 31e66ea9bd8c01276b6c8b4a08e3321af27f47ff64f36295f5a85f52777a4ae47aa9194a61e79de96dd6a09aa22bea7706da4b73ae3d51c35f38ba5659f45372

data/.travis.yml

@@ -4,7 +4,7 @@ script: 'ruby -r bundler/setup -S rake test'
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - ruby
   - rbx
   - jruby
 

data/CHANGES.md

@@ -1,5 +1,14 @@
 # CHANGES
 
+## Rib 1.2.4 -- 2014-03-13
+
+* Fixed a regression introduced in 1.2.0. Now `rib all -e 'p 123'` should
+  work properly. Previously -e is ignored after rib apps.
+* Fixed a long standing Windows issue, where `rib all` did not work because
+  there's no `which` on Windows. Now we fall back to `where`.
+* Warn on removing main method on `TOPLEVEL_BINDING`. Not sure if this
+  would happen, but at least we could have a warning.
+
 ## Rib 1.2.3 -- 2014-02-08
 
 * [extra/paging] Properly disable paging if less or ENV['PAGER'] is not

data/lib/rib/runner.rb

@@ -66,15 +66,14 @@ module Rib::Runner
 
   def run argv=ARGV
     (@running_commands ||= []) << Rib.config[:name]
-    unused, e = parse(argv)
+    unused = 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'
-    # by comming to this line, it means now we're running Rib main loop,
+    # by coming to this line, it means now we're running Rib main loop,
     # 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
 
@@ -97,11 +96,12 @@ module Rib::Runner
   end
 
   def parse argv
-    unused, e = [], ''
+    unused = []
     until argv.empty?
       case arg = argv.shift
       when /^-e=?(.+)?/, /^--eval=?(.+)?/
-        e = $1 || argv.shift || ''
+        Rib.shell.eval_binding.eval(
+          $1 || argv.shift || '', __FILE__, __LINE__)
 
       when /^-d/, '--debug'
         $DEBUG = true
@@ -141,7 +141,7 @@ module Rib::Runner
         unused << arg
       end
     end
-    [unused, e]
+    unused
   end
 
   def parse_next argv, arg
@@ -165,15 +165,21 @@ module Rib::Runner
 
   def load_command command
     bin  = "rib-#{command}"
-    path = `which #{bin}`.strip
+    path = which_bin(bin)
     if path == ''
       Rib.warn(
         "Can't find #{bin} in $PATH. Please make sure it is installed,",
-        "or is there any typo? You can try this to install it:\n"         ,
+        "or is there any typo? You can try this to install it:\n"      ,
         "    gem install #{bin}")
     else
       Rib.config[:name] = bin
       load(path)
     end
   end
+
+  def which_bin bin # handle windows here
+    `which #{bin}`.strip
+  rescue Errno::ENOENT # probably a windows platform, try where
+    `where #{bin}`.lines.first.strip
+  end
 end

data/lib/rib/shell.rb

@@ -69,11 +69,14 @@ class Rib::Shell
   # 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
+    TOPLEVEL_BINDING.instance_eval do
+      singleton_class.module_eval do
+        Rib.warn("Removing existing main...") if method_defined?(:main)
+        def main; binding; end # any way to define <main> method?
+      end
+      ret = main
+      singleton_class.send(:remove_method, 'main') # never pollute anything
+      ret
+    end
   end
 end

data/lib/rib/test.rb

@@ -77,6 +77,10 @@ module Kernel
   end
 end
 
+def main
+  'rib'
+end
+
 Rib::Blackhole = Object.new
 b = Rib::Blackhole.singleton_class
 b.instance_methods(true).each{ |m|

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.2.3 ruby lib
+# stub: rib 1.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   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 = "2014-02-08"
+  s.date = "2014-03-13"
   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 = [

data/test/test_runner.rb

@@ -32,4 +32,23 @@ describe Rib::Runner do
     output
     Rib::Runner.run(%w[-e]).should.eq @shell
   end
+
+  def verify_app_e argv
+     input('a')
+    output('1')
+    conf = {:name => 'rib'}
+    min  = 'rib-min'
+    mock(Rib::Runner).which_bin(min){ min }
+    mock(Rib::Runner).load(min){ Rib::Runner.run(argv) }
+    stub(Rib).config{ conf }
+    Rib::Runner.run(argv).should.eq @shell
+  end
+
+  should 'min -e' do
+    verify_app_e(%w[min -ea=1])
+  end
+
+  should '-e min' do
+    verify_app_e(%w[-ea=1 min])
+  end
 end

data/test/test_shell.rb

@@ -7,40 +7,44 @@ describe Rib::Shell do
 
   before do
     Rib.disable_plugins
-    @shell = Rib::Shell.new
+    @shell = nil
+  end
+
+  def shell
+    @shell ||= Rib::Shell.new
   end
 
   describe '#loop' do
     def input str
-      mock(@shell).get_input{str}
-      @shell.loop
+      mock(shell).get_input{str}
+      shell.loop
       true.should.eq true
     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 ':q'        do @shell.config[:exit] << ':q'; input(':q')    end
-    should '\q'        do @shell.config[:exit] << '\q'; input('\q')    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
 
   describe '#loop_once' do
     def input str=nil
       if block_given?
-        mock(@shell).get_input{ yield }
+        mock(shell).get_input{ yield }
       else
-        mock(@shell).get_input{ str }
+        mock(shell).get_input{ str }
       end
-      @shell.loop_once
+      shell.loop_once
       true.should.eq true
     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
 
@@ -55,44 +59,56 @@ describe Rib::Shell do
     end
 
     should 'print error from eval' do
-      mock(@shell).puts(match(/RuntimeError/)){}
+      mock(shell).puts(match(/RuntimeError/)){}
       input('raise "blah"')
     end
   end
 
   describe '#prompt' do
     should 'be changeable' do
-      @shell.config[:prompt] = '> '
-      @shell.prompt.should.eq  '> '
+      shell.config[:prompt] = '> '
+      shell.prompt.should.eq  '> '
     end
   end
 
   describe '#eval_input' do
     before do
-      @line = @shell.config[:line]
+      @line = shell.config[:line]
     end
 
     should 'line' do
-      @shell.eval_input('10 ** 2')
-      @shell.config[:line].should.eq @line + 1
+      shell.eval_input('10 ** 2')
+      shell.config[:line].should.eq @line + 1
     end
 
     should 'print error and increments line' do
-      result, err = @shell.eval_input('{')
+      result, err = shell.eval_input('{')
       result.should.eq nil
       err.should.kind_of?(SyntaxError)
-      @shell.config[:line].should.eq @line + 1
+      shell.config[:line].should.eq @line + 1
     end
   end
 
   should 'call after_loop even if in_loop raises' do
-    mock(@shell).loop_once{ raise 'boom' }
+    mock(shell).loop_once{ raise 'boom' }
     mock(Rib).warn(is_a(String)){}
-    mock(@shell).after_loop{}
-    lambda{@shell.loop}.should.raise(RuntimeError)
+    mock(shell).after_loop{}
+    lambda{shell.loop}.should.raise(RuntimeError)
   end
 
   should 'have empty binding' do
-    @shell.eval_input('local_variables').first.should.empty
+    shell.eval_input('local_variables').first.should.empty
+  end
+
+  should 'not pollute main' do
+    shell.eval_input('main').first.should.eq 'rib'
+  end
+
+  should 'warn on removing main' do
+    TOPLEVEL_BINDING.singleton_class.module_eval do
+      def main; end
+    end
+    mock(Rib).warn(is_a(String)){}
+    shell.eval_input('main').first.should.eq 'rib'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell