rib 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c0da1c91b42793b8e4383b923c4a10f127d11a
-  data.tar.gz: 9bc65bd697acdd2bd8639a490a059d46a7099c1b
+  metadata.gz: 43ddc0849b3347414bbcfbc53aff7a503bae5e02
+  data.tar.gz: d95887a92dd06ad68e42bd0d035eb1b4bed1d155
 SHA512:
-  metadata.gz: 1246de926465360d9179a61d703c8b53d2ff4df11d9ba9bbd1b6df4457d62c670b4af3ef3b6b4492e565c89b0e66a071e3f38005bdc37b6c59cb9512ba072161
-  data.tar.gz: d2ba9ba0d7b1944fd82558b574655687af2137ce261845e69d8e1130cadf2bc897e0313673376fe9e6810089c8f67ccb3336deeaa38ebdc059968a840d06d438
+  metadata.gz: d51943449c9303867341e4ce231b93f23f933813740761da232c4eeb9619bac28ddf1fae3fcba8d24cb539e35b53bf5febf98d2e5baea9fe03a75afedc11ef83
+  data.tar.gz: f1db5967d2549ddddd5d522dded9c93cd092583300bc1bc2221c1be4c3b4f0840d499c055616ff6eefd4191ee384def6971809a60e2e2cf8a14ca209018db949

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## Rib 1.1.4 -- 2013-07-11
+
+* Further fixed a bug for displaying a BasicObject. Rib should never crash.
+* Added `rib-rack` executable which could load the app in config.ru,
+  accessible from calling `app` in the console. Also works for `rib-auto`
+
 ## Rib 1.1.3 -- 2013-05-08
 
 * Fixed a bug where if user input doesn't respond to `==` would crash rib.

data/Gemfile

@@ -1,11 +1,11 @@
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
 gem 'rake'
 gem 'bacon'
-gem 'rr'
+gem 'muack'
 
 gem 'bond'
 gem 'hirb'

data/README.md

@@ -1,4 +1,4 @@
-# Rib
+# Rib [![Build Status](https://secure.travis-ci.org/godfat/rib.png?branch=master)](http://travis-ci.org/godfat/rib)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -23,7 +23,7 @@ be simple, lightweight and modular so that everyone could customize Rib.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.2, 1.9.3, Rubinius and JRuby.
+* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
 * All gem dependencies are optional, but it's highly recommended to use
   Rib with [bond][] for tab completion.
 
@@ -59,8 +59,12 @@ As Ramaze console
 
     rib ramaze
 
+As Rack console
+
+    rib rack
+
 As a console for whichever the app in the current path
-it should be (for now, it's either Rails or Ramaze)
+it should be (for now, it's either Rails, Ramaze or Rack)
 
     rib auto
 

data/bin/rib-rack

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'rib/runner'
+# create the shell before app to prvent your bundler (if any) kicks in
+Rib.shell
+# we need to require anything before loading the app,
+# and both `rib auto` (true) and `rib-auto` (nil) should work
+require 'rib/core' if Rib.config.delete(:mimic_irb) != false
+require 'rib/app/rack'
+# load the app
+Rib::Rack.load
+Rib::Runner.run(ARGV)

data/lib/rib/api.rb

@@ -41,10 +41,10 @@ module Rib::API
     result, err = eval_input(input)
     if err
       print_eval_error(err)
-    elsif input.strip != ''
+    elsif input.strip != '' && !equal_rib_skip(result)
       print_result(result)
     else
-      # print nothing for blank input
+      # print nothing for blank input or Rib::Skip
     end
     [result, err]
   rescue Interrupt
@@ -79,7 +79,7 @@ module Rib::API
 
   # Print result using #format_result
   def print_result result
-    puts(format_result(result)) if result != Rib::Skip
+    puts(format_result(result))
   rescue StandardError, SyntaxError => e
     Rib.warn("Error while printing result:\n  #{format_error(e)}")
   end
@@ -100,4 +100,11 @@ module Rib::API
   def format_error err
     "#{err.class}: #{err.message}\n    #{err.backtrace.join("\n    ")}"
   end
+
+  private
+  def equal_rib_skip result
+    result == Rib::Skip
+  rescue Exception
+    # do nothing, it cannot respond to == correctly, it can't be Rib::Skip
+  end
 end

data/lib/rib/app/auto.rb

@@ -3,7 +3,7 @@ module Rib; end
 module Rib::Auto
   module_function
   def load
-    app, name = %w[ramaze rails].find{ |name|
+    app, name = %w[ramaze rails rack].find{ |name|
       require "rib/app/#{name}"
       app = Rib.const_get(name.capitalize)
       if app.send("#{name}?")

data/lib/rib/app/rack.rb

@@ -0,0 +1,25 @@
+
+module Rib; end
+module Rib::Rack
+  singleton_class.module_eval{ attr_accessor :app }
+
+  module_function
+  def load
+    load_rack
+  rescue LoadError => e
+    Rib.abort("Error: #{e}", "Is this a Rack app?")
+  end
+
+  def load_rack
+    require '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.say("Access your app via :app method")
+  end
+
+  def rack?
+    File.exist?('config.ru')
+  end
+end

data/lib/rib/test.rb

@@ -1,9 +1,9 @@
 
 require 'bacon'
-require 'rr'
+require 'muack'
 require 'fileutils'
 Bacon.summary_on_exit
-include RR::Adapters::RRMethods
+include Muack::API
 
 require 'rib'
 
@@ -12,7 +12,7 @@ shared :rib do
   end
 
   after do
-    RR.verify
+    Muack.verify
   end
 
   def test_for *plugins, &block

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
-    stub(@shell).puts
+    stub(@shell).print.with_any_args
+    stub(@shell).puts .with_any_args
   end
 
   def setup_input str
@@ -19,7 +19,7 @@ shared :setup_multiline do
 
   def input str
     setup_input(str)
-    mock.proxy(@shell).throw(:rib_multiline)
+    mock(@shell).throw(:rib_multiline).proxy
   end
 
   def input_done str, err=nil

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/rib.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-05-08"
+  s.date = "2013-07-11"
   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 = [
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   "rib-all",
   "rib-auto",
   "rib-min",
+  "rib-rack",
   "rib-rails",
   "rib-ramaze"]
   s.files = [
@@ -30,12 +31,14 @@ Gem::Specification.new do |s|
   "bin/rib-all",
   "bin/rib-auto",
   "bin/rib-min",
+  "bin/rib-rack",
   "bin/rib-rails",
   "bin/rib-ramaze",
   "lib/rib.rb",
   "lib/rib/all.rb",
   "lib/rib/api.rb",
   "lib/rib/app/auto.rb",
+  "lib/rib/app/rack.rb",
   "lib/rib/app/rails.rb",
   "lib/rib/app/ramaze.rb",
   "lib/rib/config.rb",
@@ -82,7 +85,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/godfat/rib"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.0.4"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",

data/test/core/test_squeeze_history.rb

@@ -12,7 +12,7 @@ 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
+    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
@@ -22,7 +22,7 @@ shared :squeeze_history do
     times = @input.size
     input = @input.dup
     stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'")[-1] }
-    stub(@shell).print_result
+    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

data/test/core/test_underscore.rb

@@ -29,7 +29,7 @@ shared :underscore do
 
   should 'set __' do
     setup
-    stub(@shell).puts
+    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
+    stub(@shell).puts(is_a(String))
   end
 
   test_for Rib::Underscore do

data/test/test_shell.rb

@@ -45,17 +45,17 @@ describe Rib::Shell do
     end
 
     should 'error in print_result' do
-      mock(Rib).warn(/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(/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(/RuntimeError/)
+      mock(@shell).puts(match(/RuntimeError/))
       input('raise "blah"')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -28,6 +28,7 @@ executables:
 - rib-all
 - rib-auto
 - rib-min
+- rib-rack
 - rib-rails
 - rib-ramaze
 extensions: []
@@ -46,12 +47,14 @@ files:
 - bin/rib-all
 - bin/rib-auto
 - bin/rib-min
+- bin/rib-rack
 - bin/rib-rails
 - bin/rib-ramaze
 - lib/rib.rb
 - lib/rib/all.rb
 - lib/rib/api.rb
 - lib/rib/app/auto.rb
+- lib/rib/app/rack.rb
 - lib/rib/app/rails.rb
 - lib/rib/app/ramaze.rb
 - lib/rib/config.rb
@@ -115,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell