rib 1.0.0 → 1.0.1

data/CHANGES.md

@@ -1,5 +1,25 @@
 # CHANGES
 
+## Rib 1.0.1 -- 2011-12-15
+
+### Incompatible changes
+
+* [rib] Keyword `quit` to exit rib is removed, preferring `exit`.
+
+### Bugs fixes
+
+* [rib] Now you exit rib with ` exit`. Thanks @ayamomiji
+* [rib] Fixed -e, --eval binding. It should be TOPLEVEL_BINDING
+
+### Enhancement
+
+* [core/history, more/color, more/multiline_history_file, extra/autoindent]
+  Make sure values are initialized even if before_loop is called later.
+  This helps us enable plugins on the fly.
+
+* [extra/autoindent] Now it depends on history plugin as well. This is not
+  really needed, but would help to reduce plugins ordering issue.
+
 ## Rib 1.0.0 -- 2011-11-05
 
 ### Bugs fixes

data/README.md

@@ -5,7 +5,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 ## LINKS:
 
 * [github](https://github.com/godfat/rib)
-* [rubygems](http://rubygems.org/gems/rib)
+* [rubygems](https://rubygems.org/gems/rib)
 * [rdoc](http://rdoc.info/github/godfat/rib)
 
 ## DESCRIPTION:
@@ -143,7 +143,7 @@ Rib.config[:name]          | The name of this shell
 Rib.config[:result_prompt] | Default is "=>"
 Rib.config[:prompt]        | Default is ">>"
 Rib.config[:binding]       | Context, default: TOPLEVEL_BINDING
-Rib.config[:exit]          | Commands to exit, default [nil, 'exit', 'quit']
+Rib.config[:exit]          | Commands to exit, default [nil] # control+d
 
 #### Plugin specific configuration
 
@@ -203,6 +203,15 @@ more plugins are lying in `rib/more/*.rb`. You can read `rib/app/ramaze.rb`
 and `bin/rib-ramaze` as a Rib App reference implementation, because it's very
 simple, simpler than rib-rails.
 
+## CONTRIBUTORS:
+
+* Andrew Liu (@eggegg)
+* ayaya (@ayamomiji)
+* Lin Jen-Shin (@godfat)
+* Mr. Big Cat (@miaout17)
+* @bootleq
+* @tka
+
 ## LICENSE:
 
 Apache License 2.0

data/lib/rib/api.rb

@@ -64,6 +64,8 @@ module Rib::API
   # Evaluate the input using #loop_eval and handle it
   def eval_input input
     [loop_eval(input), nil]
+  rescue SystemExit
+    throw(:rib_exit, input)
   rescue Exception => e
     [nil, e]
   ensure

data/lib/rib/core/history.rb

@@ -10,8 +10,8 @@ module Rib::History
 
   def before_loop
     return super if History.disabled?
-    config[:history_file] ||= File.join(Rib.home, 'history.rb')
-    config[:history_size] ||= 500
+    history_file
+    history_size
     FileUtils.mkdir_p(File.dirname(history_file_path))
     read_history
     Rib.say("History read from: #{history_file_path}") if $VERBOSE
@@ -46,13 +46,21 @@ module Rib::History
   def write_history
     return super if History.disabled?
     File.open(history_file_path, 'w'){ |f|
-      f.puts(history.to_a.last(config[:history_size]).join("\n")) }
+      f.puts(history.to_a.last(history_size).join("\n")) }
   end
 
 
 
   private
+  def history_file
+    config[:history_file]      ||= File.join(Rib.home, 'history.rb')
+  end
+
   def history_file_path
-    config[:history_file_path] ||= File.expand_path(config[:history_file])
+    config[:history_file_path] ||= File.expand_path(history_file)
+  end
+
+  def history_size
+    config[:history_size] ||= 500
   end
 end

data/lib/rib/extra/autoindent.rb

@@ -1,4 +1,5 @@
 
+require 'rib/core/history'   # otherwise the order might be wrong
 require 'rib/core/readline'  # dependency
 require 'rib/core/multiline' # dependency
 
@@ -62,7 +63,7 @@ module Rib::Autoindent
 
   def before_loop
     return super if Autoindent.disabled?
-    config[:autoindent_spaces] ||= '  '
+    autoindent_spaces
     super
   end
 
@@ -145,7 +146,11 @@ module Rib::Autoindent
 
   private
   def current_autoindent size=autoindent_stack.size
-    config[:autoindent_spaces] * size
+    autoindent_spaces * size
+  end
+
+  def autoindent_spaces
+    config[:autoindent_spaces] ||= '  '
   end
 
   def autoindent_stack

data/lib/rib/more/color.rb

@@ -8,6 +8,18 @@ module Rib::Color
   # --------------- Rib API ---------------
 
   def before_loop
+    colors
+    super
+  end
+
+  def format_result result
+    return super if Color.disabled?
+    config[:result_prompt] + format_color(result)
+  end
+
+  # --------------- Plugin API ---------------
+
+  def colors
     config[:color] ||= {
       Numeric    => :red    ,
       String     => :green  ,
@@ -18,20 +30,9 @@ module Rib::Color
       TrueClass  => :magenta,
       FalseClass => :magenta,
       Exception  => :magenta,
-      Object     => :yellow
-    }
-    super
-  end
-
-  def format_result result
-    return super if Color.disabled?
-    config[:result_prompt] + format_color(result)
+      Object     => :yellow }
   end
 
-  # --------------- Plugin API ---------------
-
-  def colors; config[:color]; end
-
   def format_color result, display=result.inspect
     case result
       when String ; send(colors[String ]){ display }

data/lib/rib/more/multiline_history_file.rb

@@ -9,7 +9,7 @@ module Rib::MultilineHistoryFile
 
   def before_loop
     return super if MultilineHistoryFile.disabled?
-    config[:multiline_history_file_token] ||= ' '
+    multiline_history_file_token
     super
   end
 
@@ -23,7 +23,7 @@ module Rib::MultilineHistoryFile
         if line.end_with?(
              "#{config[:multiline_history_file_token]}\n")
           buffer << line[0...
-               -config[:multiline_history_file_token].size-1] + "\n"
+                         -multiline_history_file_token.size-1] + "\n"
         else
           history << (buffer.join + line).chomp
           buffer = []
@@ -39,4 +39,11 @@ module Rib::MultilineHistoryFile
     }
     super
   end
+
+
+
+  private
+  def multiline_history_file_token
+    config[:multiline_history_file_token] ||= ' '
+  end
 end

data/lib/rib/runner.rb

@@ -81,7 +81,7 @@ module Rib::Runner
     until argv.empty?
       case arg = argv.shift
       when /^-e=?(.+)?/, /^--eval=?(.+)?/
-        eval($1 || argv.shift, binding, __FILE__, __LINE__)
+        eval($1 || argv.shift, TOPLEVEL_BINDING, __FILE__, __LINE__)
 
       when /^-d/, '--debug'
         $DEBUG = true

data/lib/rib/shell.rb

@@ -13,12 +13,11 @@ class Rib::Shell
   attr_reader :config
   def initialize(config={})
     self.config = {
-      :result_prompt => '=> '                ,
-      :prompt        => '>> '                ,
-      :binding       => TOPLEVEL_BINDING     ,
-      :exit          => [nil, 'exit', 'quit'],
-      :line          => 1
-    }.merge(config)
+      :result_prompt => '=> '           ,
+      :prompt        => '>> '           ,
+      :binding       => TOPLEVEL_BINDING,
+      :exit          => [nil]           ,
+      :line          => 1               }.merge(config)
     @running = false
   end
 

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/rib.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2011-11-05"
+  s.date = "2011-12-15"
   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 = [
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   ".gitmodules",
   ".travis.yml",
   "CHANGES.md",
-  "CONTRIBUTORS",
   "Gemfile",
   "LICENSE",
   "README.md",
@@ -81,7 +80,7 @@ Gem::Specification.new do |s|
   "test/test_shell.rb"]
   s.homepage = "https://github.com/godfat/rib"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.12"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",

data/test/more/test_color.rb

@@ -26,12 +26,20 @@ describe Rib::Color do
 
   # regression test
   should "colorize errors with `/' inside" do
+    i = if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+          1
+        else
+          0
+        end
+
     begin
       line = __LINE__; 1/0
     rescue ZeroDivisionError => e
-      Rib::Color.colorize_backtrace(e.backtrace).first.should.end_with? \
-        "test/more/#{Rib::Color.yellow{'test_color.rb'}}:" \
-        "#{Rib::Color.red{line}}:in #{Rib::Color.green{"`/'"}}"
+      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 =~ \
+        Regexp.new(
+          "#{Regexp.escape(msg)}`.+'#{Regexp.escape(Rib::Color.reset)}")
     end
   end
 end

data/test/test_shell.rb

@@ -16,9 +16,11 @@ describe Rib::Shell do
       @shell.loop
       true.should.eq true
     end
-    should 'exit'   do                    input('exit') end
-    should 'quit'   do                    input('quit') end
-    should 'ctrl+d' do mock(@shell).puts; input(nil)    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
   end
 
   describe '#loop_once' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-12-15 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
 
@@ -44,7 +44,6 @@ files:
 - .gitmodules
 - .travis.yml
 - CHANGES.md
-- CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README.md
@@ -122,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell

data/CONTRIBUTORS

@@ -1,2 +0,0 @@
-Lin Jen-Shin (godfat)
-miaout17 (miaout17)