rib 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1076f17c46a51eb9e569ab5f7471f42dd3b1c3cc
-  data.tar.gz: 7d9af36e6f5b15a18a01cde080ebbb4cb93023c8
+  metadata.gz: e2cc6e3966230aac382f90352549a7545c8e27ff
+  data.tar.gz: 6bb97f019cc41dffbc900fa2d5aa1f44024d65a8
 SHA512:
-  metadata.gz: 18c8aba3e10d59143db113e3d2cb95c1a77764ad82f3b420994e3fd5d032998eb6280681a6f34247db699635f2641d1d34d2373600be5d7b7fdda5cc0e9c161e
-  data.tar.gz: 5838f68537399c9981d81540be7deb0bb537ea00ce529e68b114f286dd3094d08b06dbd1fbc8b805e113f32dd7e7fc58c4402a95d3bbe23432ef5bd258c8fb77
+  metadata.gz: 0a0519f630b28351cf2d6f636c976eea2d904b1703fbf63c9ad1824944cb204dd5490f39d7d3ebffa1ffe81e994324135e8c5176eb3f905172d259bb3902a76b
+  data.tar.gz: 87d41ae852dfb60039bd785fcc9b141fd01cc1bfc304f5b2047891d29ab04ccc05d989075cbec8068b6b35c1a2e7c6bf2a0013c489290b4322d9c132ce639e20

data/.travis.yml

@@ -1,8 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
+  - 2.2.5
   - 2.3.1
   - rbx
   - jruby-9

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## Rib 1.3.1 -- 2016-11-03
+
+* [core/strip_backtrace], [more/color] No longer show `./` for current path.
+  This would be more friendly to some editors like Sublime.
+
 ## Rib 1.3.0 -- 2016-06-28
 
 * Now `rib` would accept `-p` or `--prefix` to allow setting where we want to

data/lib/rib/core/history.rb

@@ -45,8 +45,8 @@ module Rib::History
   # Write #history into config[:history_file], handled in history_file plugin
   def write_history
     return super if History.disabled?
-    File.open(history_file_path, 'w'){ |f|
-      f.puts(history.to_a.last(history_size).join("\n")) }
+    history_text = "#{history.to_a.last(history_size).join("\n")}\n"
+    File.write(history_file_path, history_text)
   end
 
 

data/lib/rib/core/strip_backtrace.rb

@@ -22,19 +22,23 @@ module Rib::StripBacktrace
 
   module_function
   def strip_backtrace backtrace
-    strip_home_backtrace(strip_cwd_backtrace(strip_lib_backtrace(backtrace)))
+    strip_home_backtrace(strip_cwd_backtrace(strip_rib_backtrace(backtrace)))
   end
 
   def strip_home_backtrace backtrace
-    backtrace.map{ |path| path.sub(ENV['HOME'], '~') }
+    backtrace.map(&method(:replace_path_prefix).curry[ENV['HOME'], '~/'])
   end
 
   def strip_cwd_backtrace backtrace
-    backtrace.map{ |path| path.sub(Dir.pwd, '.') }
+    backtrace.map(&method(:replace_path_prefix).curry[Dir.pwd, ''])
   end
 
-  def strip_lib_backtrace backtrace
+  def strip_rib_backtrace backtrace
     backtrace[
       0..backtrace.rindex{ |l| l =~ /\(#{name}\):\d+:in `.+?'/ } || -1]
   end
+
+  def replace_path_prefix prefix, substitute, path
+    path.sub(/\A#{Regexp.escape(prefix)}\//, substitute)
+  end
 end

data/lib/rib/more/color.rb

@@ -77,10 +77,10 @@ module Rib::Color
   def colorize_backtrace backtrace
     backtrace.map{ |b|
       path, msgs = b.split(':', 2)
-      dir , file = ::File.split(path)
+      dir, sep, file = path.rpartition('/')
       msg = msgs.sub(/(\d+):/){red{$1}+':'}.sub(/`.+?'/){green{$&}}
 
-      "#{dir+'/'}#{yellow{file}}:#{msg}"
+      "#{dir+sep}#{yellow{file}}:#{msg}"
     }
   end
 

data/lib/rib/test.rb

@@ -1,9 +1,8 @@
 
 require 'pork/auto'
 require 'muack'
-require 'fileutils'
 
-Pork::Executor.__send__(:include, Muack::API)
+Pork::Suite.include(Muack::API)
 
 require 'rib'
 

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.3.0 ruby lib
+# stub: rib 1.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib".freeze
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2016-06-28"
+  s.date = "2016-11-03"
   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".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.executables = [
@@ -78,6 +78,7 @@ Gem::Specification.new do |s|
   "test/core/test_multiline.rb".freeze,
   "test/core/test_readline.rb".freeze,
   "test/core/test_squeeze_history.rb".freeze,
+  "test/core/test_strip_backtrace.rb".freeze,
   "test/core/test_underscore.rb".freeze,
   "test/extra/test_autoindent.rb".freeze,
   "test/more/test_color.rb".freeze,
@@ -88,7 +89,7 @@ Gem::Specification.new do |s|
   "test/test_shell.rb".freeze]
   s.homepage = "https://github.com/godfat/rib".freeze
   s.licenses = ["Apache License 2.0".freeze]
-  s.rubygems_version = "2.6.4".freeze
+  s.rubygems_version = "2.6.7".freeze
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell".freeze
   s.test_files = [
   "test/core/test_completion.rb".freeze,
@@ -96,6 +97,7 @@ Gem::Specification.new do |s|
   "test/core/test_multiline.rb".freeze,
   "test/core/test_readline.rb".freeze,
   "test/core/test_squeeze_history.rb".freeze,
+  "test/core/test_strip_backtrace.rb".freeze,
   "test/core/test_underscore.rb".freeze,
   "test/extra/test_autoindent.rb".freeze,
   "test/more/test_color.rb".freeze,

data/test/core/test_history.rb

@@ -1,6 +1,7 @@
 
 require 'rib/test'
 require 'rib/core/history'
+require 'tempfile'
 
 copy :history do
   would '#after_loop save history' do
@@ -13,7 +14,7 @@ copy :history do
   end
 
   would '#before_loop load previous history' do
-    File.open(@history_file, 'w'){ |f| f.write "check\nthe\nmike" }
+    File.write(@history_file, "check\nthe\nmike")
     @shell.before_loop
     @shell.history.to_a.should.eq %w[check the mike]
   end
@@ -55,13 +56,14 @@ describe Rib::History do
         ::Readline::HISTORY.clear
         stub_readline
       end
-      @history_file = "/tmp/test_rib_#{rand}"
+      @tempfile     = Tempfile.new('rib')
+      @history_file = @tempfile.path
       @shell        = Rib::Shell.new(
         :history_file => @history_file).before_loop
     end
 
     after do
-      FileUtils.rm_f(@history_file)
+      @tempfile.unlink
     end
 
     paste :history

data/test/core/test_squeeze_history.rb

@@ -1,6 +1,7 @@
 
 require 'rib/test'
 require 'rib/core/squeeze_history'
+require 'tempfile'
 
 copy :squeeze_history do
   would 'after_loop saves squeezed history' do
@@ -34,14 +35,15 @@ describe Rib::SqueezeHistory do
 
   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]
+      @tempfile = Tempfile.new('rib')
+      @history  = @tempfile.path
+      @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) if Rib::History.enabled?
+      @tempfile.unlink
     end
 
     paste :squeeze_history

data/test/core/test_strip_backtrace.rb

@@ -0,0 +1,19 @@
+
+require 'rib/test'
+require 'rib/core/strip_backtrace'
+
+describe Rib::StripBacktrace do
+  would 'strip home' do
+    backtrace = ["#{ENV['HOME']}/test", "/prefix/#{ENV['HOME']}/test"]
+
+    expect(Rib::StripBacktrace.strip_home_backtrace(backtrace)).
+      eq ['~/test', "/prefix/#{ENV['HOME']}/test"]
+  end
+
+  would 'strip current working directory' do
+    backtrace = [File.expand_path(__FILE__)]
+
+    expect(Rib::StripBacktrace.strip_cwd_backtrace(backtrace)).
+      eq ['test/core/test_strip_backtrace.rb']
+  end
+end

data/test/more/test_color.rb

@@ -37,18 +37,14 @@ describe Rib::Color do
 
   # regression test
   would "colorize errors with `/' inside" do
-    i = if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-          1
-        else
-          0
-        end
+    error = Class.new(Exception)
 
     begin
-      line = __LINE__; 1/0
-    rescue ZeroDivisionError => e
+      line = __LINE__; raise error
+    rescue error => e
       msg = "test/more/#{Rib::Color.yellow{'test_color.rb'}}:" \
             "#{Rib::Color.red{line}}:in #{Rib::Color.green}"
-      Rib::Color.colorize_backtrace(e.backtrace)[i].should =~ \
+      Rib::Color.colorize_backtrace(e.backtrace).first.should =~ \
         Regexp.new(
           "#{Regexp.escape(msg)}`.+'#{Regexp.escape(Rib::Color.reset)}")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -92,6 +92,7 @@ files:
 - test/core/test_multiline.rb
 - test/core/test_readline.rb
 - test/core/test_squeeze_history.rb
+- test/core/test_strip_backtrace.rb
 - test/core/test_underscore.rb
 - test/extra/test_autoindent.rb
 - test/more/test_color.rb
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -130,6 +131,7 @@ test_files:
 - test/core/test_multiline.rb
 - test/core/test_readline.rb
 - test/core/test_squeeze_history.rb
+- test/core/test_strip_backtrace.rb
 - test/core/test_underscore.rb
 - test/extra/test_autoindent.rb
 - test/more/test_color.rb