rib 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2150377cb877771f501f288373ccf7750a786be5
-  data.tar.gz: 72a3bc6e08131e09ede6e1b81b16a904e8080244
+  metadata.gz: 4b1e243240afca72f22b64e717397285a0b6f6a1
+  data.tar.gz: 233ea57325b8e3ae24d950e552920685081bc961
 SHA512:
-  metadata.gz: f9a3ac832fc847890ca41e7fbcf4760e0c1a1b46d1f07d71135bf5bc1e117af114be038319cb18a85bd348b074845e86bcf8d300ab260662f10239dca96229ca
-  data.tar.gz: 60f6eeeee1bb056cd56ca103c198c7cf7fcf0cfe1d288dcafe5ac2b8658ea75d96aad163dd735defd59af5065c30abd45b15ebd5e530edb2136d154d1efef21b
+  metadata.gz: 03e4a3bd4e9d4ba2b4cfacc66c2eb8ad1d8a3cf7e5beb9551648ce5a419ab8eaf54d5b7e4b2c94f0aceeecab2213097495811485c2cea60ded54c96aee671085
+  data.tar.gz: 9bbde220dc6b6d69e07c3cc5b8e9faf52369ae2f582eb3880a3d659f71b7b1fa73da3a63ae7022fcf72d3cd5c84d232873fbf9c5c68ff2b803ee3fff91476791

data/.gitignore

@@ -1 +1,2 @@
 /pkg/
+/coverage/

data/.travis.yml

@@ -1,15 +1,11 @@
 
 language: ruby
 rvm:
-  - 1.9
   - 2.0
   - 2.1
+  - 2.2
   - rbx-2
   - jruby
 
-matrix:
-  allow_failures:
-    - rvm: jruby
-
+install: 'bundle install --retry=3'
 script: 'ruby -r bundler/setup -S rake test'
-sudo: false

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## Rib 1.2.7 -- 2015-01-28
+
+* [more/bottomup_backtrace] A new plugin which prints the backtrace bottom-up.
+  Ref: <http://yellerapp.com/posts/2015-01-22-upside-down-stacktraces.html>
+
 ## Rib 1.2.6 -- 2014-11-07
 
 * [extra/autoindent] Now `module_function` would indent correctly.

data/Gemfile

@@ -10,6 +10,9 @@ gem 'muack'
 gem 'bond'
 gem 'hirb'
 
+gem 'simplecov', :require => false if ENV['COV']
+gem 'coveralls', :require => false if ENV['CI']
+
 platforms :ruby do
   gem 'readline_buffer'
 end

data/README.md

@@ -1,4 +1,4 @@
-# Rib [![Build Status](https://secure.travis-ci.org/godfat/rib.png?branch=master)](http://travis-ci.org/godfat/rib)
+# Rib [![Build Status](https://secure.travis-ci.org/godfat/rib.png?branch=master)](http://travis-ci.org/godfat/rib) [![Coverage Status](https://coveralls.io/repos/godfat/rib/badge.png)](https://coveralls.io/r/godfat/rib)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -193,6 +193,10 @@ require 'rib/more' # You get all of the followings:
 
   Not only readline could have multiline history, but also the history file.
 
+* `require 'rib/more/bottomup_backtrace'`
+
+  Show backtrace bottom-up instead of the regular top-down.
+
 * `require 'rib/more/color'`
 
   Class based colorizing.
@@ -324,7 +328,7 @@ simple, simpler than rib-rails.
 
 Apache License 2.0
 
-Copyright (c) 2011-2014, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2015, 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/lib/rib/api.rb

@@ -96,12 +96,19 @@ module Rib::API
     result_prompt + result.inspect
   end
 
-  # Format error raised in #loop_eval
+  # Format error raised in #loop_eval with #get_error
   def format_error err
-    "#{err.class}: #{err.message}\n    #{err.backtrace.join("\n    ")}"
+    message, backtrace = get_error(err)
+    "#{message}\n    #{backtrace.join("\n    ")}"
   end
   module_function :format_error
 
+  # Get error message and backtrace from a particular error
+  def get_error err
+    ["#{err.class}: #{err.message}", err.backtrace]
+  end
+  module_function :get_error
+
   private
   def equal_rib_skip result
     result == Rib::Skip

data/lib/rib/core/strip_backtrace.rb

@@ -7,23 +7,15 @@ module Rib::StripBacktrace
 
   # --------------- Rib API ---------------
 
-  # strip backtrace until rib
   def format_error err
     return super if StripBacktrace.disabled?
-    backtrace = if err.kind_of?(SyntaxError)
-                  []
-                else
-                  err.backtrace
-                end
-    message, backtrace = get_error(err, strip_backtrace(backtrace))
+    message, backtrace = get_error(err)
     "#{message}\n  #{backtrace.join("\n  ")}"
   end
 
-  # --------------- Plugin API ---------------
-
-  def get_error err, backtrace=err.backtrace
+  def get_error err
     return super if StripBacktrace.disabled?
-    ["#{err.class}: #{err.message}", backtrace]
+    ["#{err.class}: #{err.message}", strip_backtrace(err.backtrace)]
   end
 
 

data/lib/rib/more.rb

@@ -3,6 +3,7 @@
 require 'rib/more/multiline_history_file'
 
 # upon formatting output
+require 'rib/more/bottomup_backtrace'
 require 'rib/more/color'
 
 # upon input

data/lib/rib/more/bottomup_backtrace.rb

@@ -0,0 +1,15 @@
+
+require 'rib'
+
+module Rib::BottomupBacktrace
+  extend Rib::Plugin
+  Shell.use(self)
+
+  # --------------- Rib API ---------------
+
+  def format_error err
+    return super if BottomupBacktrace.disabled?
+    message, backtrace = get_error(err)
+    "  #{backtrace.reverse.join("\n  ")}\n#{message}"
+  end
+end

data/lib/rib/more/color.rb

@@ -17,6 +17,12 @@ module Rib::Color
     config[:result_prompt] + format_color(result)
   end
 
+  def get_error err
+    return super if Color.disabled?
+    message, backtrace = super
+    [format_color(err, message), colorize_backtrace(backtrace)]
+  end
+
   # --------------- Plugin API ---------------
 
   def colors
@@ -65,13 +71,6 @@ module Rib::Color
     end
   end
 
-  # override StripBacktrace#get_error
-  def get_error err, backtrace=err.backtrace
-    return super if Color.disabled?
-    [format_color(err, "#{err.class.to_s}: #{err.message}"),
-     colorize_backtrace(backtrace)]
-  end
-
 
 
   module_function

data/lib/rib/test.rb

@@ -19,8 +19,12 @@ copy :rib do
     def test_for *plugins, &block
       require 'rib/all' # exhaustive tests
       rest = Rib.plugins - plugins
-      Rib.enable_plugins(plugins)
-      Rib.disable_plugins(rest)
+
+      before do
+        Rib.enable_plugins(plugins)
+        Rib.disable_plugins(rest)
+      end
+
       yield
 
       case ENV['TEST_LEVEL']

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 end

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.2.6 ruby lib
+# stub: rib 1.2.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   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-11-07"
+  s.date = "2015-01-28"
   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 = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
   "lib/rib/extra/paging.rb",
   "lib/rib/more.rb",
   "lib/rib/more/anchor.rb",
+  "lib/rib/more/bottomup_backtrace.rb",
   "lib/rib/more/color.rb",
   "lib/rib/more/edit.rb",
   "lib/rib/more/multiline_history.rb",
@@ -87,7 +88,7 @@ Gem::Specification.new do |s|
   "test/test_shell.rb"]
   s.homepage = "https://github.com/godfat/rib"
   s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.4.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",

data/task/gemgem.rb

@@ -38,6 +38,99 @@ module Gemgem
     self.spec = spec
   end
 
+  def gem_install
+    require 'rubygems/commands/install_command'
+    # read ~/.gemrc
+    Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
+    Gem::Command.extra_args = Gem.configuration[:gem]
+
+    # setup install options
+    cmd = Gem::Commands::InstallCommand.new
+    cmd.handle_options([])
+
+    # install
+    install = Gem::Installer.new(gem_path, cmd.options)
+    install.install
+    puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
+  end
+
+  def gem_spec
+    create
+    write
+  end
+
+  def gem_build
+    require 'fileutils'
+    require 'rubygems/package'
+    gem = nil
+    Dir.chdir(dir) do
+      gem = Gem::Package.build(Gem::Specification.load(spec_path))
+      FileUtils.mkdir_p(pkg_dir)
+      FileUtils.mv(gem, pkg_dir) # gem is relative path, but might be ok
+    end
+    puts "\e[35mGem built: \e[33m#{strip_path("#{pkg_dir}/#{gem}")}\e[0m"
+  end
+
+  def gem_release
+    sh_git('tag', gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', gem_path)
+  end
+
+  def gem_check
+    ver = spec.version.to_s
+
+    if ENV['VERSION'].nil?
+      puts("\e[35mExpected "                                  \
+           "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
+      exit(1)
+
+    elsif ENV['VERSION'] != ver
+      puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+           "\e[35mbut got\n         "                         \
+           "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
+      exit(2)
+    end
+  end
+
+  def test
+    return if test_files.empty?
+
+    if ENV['COV'] || ENV['CI']
+      require 'simplecov'
+      if ENV['CI']
+        require 'coveralls'
+        SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+      end
+      SimpleCov.start do
+        add_filter('test/')
+        add_filter('test.rb')
+      end
+    end
+
+    test_files.each{ |file| require "#{dir}/#{file[0..-4]}" }
+  end
+
+  def clean
+    return if ignored_files.empty?
+
+    require 'fileutils'
+    trash = File.expand_path("~/.Trash/#{spec.name}")
+    puts "Move the following files into: \e[35m#{strip_path(trash)}\e[33m"
+
+    ignored_files.each do |file|
+      from = "#{dir}/#{file}"
+      to   = "#{trash}/#{File.dirname(file)}"
+      puts strip_path(from)
+
+      FileUtils.mkdir_p(to)
+      FileUtils.mv(from, to)
+    end
+
+    print "\e[0m"
+  end
+
   def write
     File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
   end
@@ -173,82 +266,38 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  Gemgem.sh_gem('install', Gemgem.gem_path)
+  Gemgem.gem_install
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  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"
+  Gemgem.gem_build
 end
 
 desc 'Generate gemspec'
 task :spec do
-  Gemgem.create
-  Gemgem.write
+  Gemgem.gem_spec
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  Gemgem.module_eval do
-    sh_git('tag', Gemgem.gem_tag)
-    sh_git('push')
-    sh_git('push', '--tags')
-    sh_gem('push', Gemgem.gem_path)
-  end
+  Gemgem.gem_release
 end
 
 task :check do
-  ver = Gemgem.spec.version.to_s
-
-  if ENV['VERSION'].nil?
-    puts("\e[35mExpected "                                  \
-         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
-    exit(1)
-
-  elsif ENV['VERSION'] != ver
-    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
-         "\e[35mbut got\n         "                         \
-         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
-    exit(2)
-  end
+  Gemgem.gem_check
 end
 
 end # of gem namespace
 
 desc 'Run tests'
 task :test do
-  next if Gemgem.test_files.empty?
-  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
+  Gemgem.test
 end
 
 desc 'Trash ignored files'
 task :clean => ['gem:spec'] do
-  next if Gemgem.ignored_files.empty?
-
-  require 'fileutils'
-  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
-  puts "Move the following files into:" \
-       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
-
-  Gemgem.ignored_files.each do |file|
-    from = "#{Gemgem.dir}/#{file}"
-    to   = "#{trash}/#{File.dirname(file)}"
-    puts Gemgem.strip_path(from)
-
-    FileUtils.mkdir_p(to)
-    FileUtils.mv(from, to)
-  end
-
-  print "\e[0m"
+  Gemgem.clean
 end
 
 task :default do

data/test/core/test_history.rb

@@ -49,20 +49,21 @@ end
 describe Rib::History do
   paste :rib
 
-  before do
-    if readline?
-      ::Readline::HISTORY.clear
-      stub_readline
+  test_for Rib::History do
+    before do
+      if readline?
+        ::Readline::HISTORY.clear
+        stub_readline
+      end
+      @history_file = "/tmp/test_rib_#{rand}"
+      @shell        = Rib::Shell.new(
+        :history_file => @history_file).before_loop
     end
-    @history_file = "/tmp/test_rib_#{rand}"
-    @shell        = Rib::Shell.new(:history_file => @history_file).before_loop
-  end
 
-  after do
-    FileUtils.rm_f(@history_file)
-  end
+    after do
+      FileUtils.rm_f(@history_file)
+    end
 
-  test_for Rib::History do
     paste :history
   end
 end

data/test/core/test_readline.rb

@@ -16,11 +16,11 @@ end
 describe Rib::Readline do
   paste :rib
 
-  before do
-    @shell = Rib::Shell.new.before_loop
-  end
-
   test_for Rib::Readline do
+    before do
+      @shell = Rib::Shell.new.before_loop
+    end
+
     paste :readline
   end
 end

data/test/core/test_squeeze_history.rb

@@ -32,18 +32,18 @@ end
 describe Rib::SqueezeHistory do
   paste :rib
 
-  before do
-    @history = "/tmp/test_rib_#{rand}"
-    @shell   = Rib::Shell.new(:history_file => @history).before_loop
-    @input   = %w[foo bar bar foo bar]
-    @shell.history.clear
-  end
+  test_for Rib::History, Rib::SqueezeHistory do
+    before do
+      @history = "/tmp/test_rib_#{rand}"
+      @shell   = Rib::Shell.new(:history_file => @history).before_loop
+      @input   = %w[foo bar bar foo bar]
+      @shell.history.clear
+    end
 
-  after do
-    FileUtils.rm_f(@history)
-  end
+    after do
+      FileUtils.rm_f(@history)
+    end
 
-  test_for Rib::History, Rib::SqueezeHistory do
     paste :squeeze_history
   end
 end

data/test/extra/test_autoindent.rb

@@ -5,9 +5,6 @@ require 'rib/extra/autoindent'
 describe Rib::Autoindent do
   paste :rib
 
-  Rib::Multiline.enable
-  Rib::Autoindent.enable
-
   autoindent = Class.new do
     include Rib::Autoindent, Rib::Multiline, Rib::API
     def config
@@ -19,6 +16,8 @@ describe Rib::Autoindent do
   end
 
   before do
+    Rib::Multiline.enable
+    Rib::Autoindent.enable
     @indent = autoindent.new
     mock(@indent).puts(match(/^\e/)).times(0)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -72,6 +72,7 @@ files:
 - lib/rib/extra/paging.rb
 - lib/rib/more.rb
 - lib/rib/more/anchor.rb
+- lib/rib/more/bottomup_backtrace.rb
 - lib/rib/more/color.rb
 - lib/rib/more/edit.rb
 - lib/rib/more/multiline_history.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell