rib 1.0.5 → 1.1.0

data/.travis.yml

@@ -1,9 +1,8 @@
-script: 'git submodule update --init; bundle exec rake test'
+before_install: 'git submodule update --init'
+script: 'ruby -r bundler/setup -S rake test'
+
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-18mode
   - rbx-19mode
-  - jruby-18mode
   - jruby-19mode

data/CHANGES.md

@@ -1,5 +1,15 @@
 # CHANGES
 
+## Rib 1.1.0 -- 2012-07-18
+
+* Support for Ruby 1.8 is dropped.
+* Now `Rib::Plugin` should be extended to the module, instead of included.
+  This fits more naturally with Ruby, but not really compatible with Ruby 1.8?
+* [more/anchor] Fixed a bug where you run rib in top level while anchor in
+  the other source, exit from the inner shell would break from the original
+  call. Now you can safely exit from the inner shell and keep doing the
+  original work.
+
 ## Rib 1.0.5 -- 2012-05-15
 
 * [app/rails] Fixed SystemStackError issue. It's because ConsoleMethods

data/README.md

@@ -23,7 +23,7 @@ be simple, lightweight and modular so that everyone could customize Rib.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.8.7, 1.9.2, 1.9.3, Rubinius and JRuby
+* Tested with MRI (official CRuby) 1.9.2, 1.9.3, Rubinius and JRuby.
 * All gem dependencies are optional, but it's highly recommended to use
   Rib with [bond][] for tab completion.
 

data/lib/rib.rb

@@ -3,6 +3,7 @@ require 'rib/shell'
 
 module Rib
   autoload :VERSION, 'rib/version'
+  Skip = Object.new
 
   module_function
   # All default Rib configs, would be passed to Shell.new in Rib.shell,
@@ -45,7 +46,7 @@ module Rib
   # All plugins which have been loaded into the memory regardless
   # it's enabled or not.
   def plugins
-    Shell.ancestors[1..-1].select{ |a| a < Plugin }
+    Shell.ancestors[1..-1].select{ |a| a.singleton_class < Plugin }
   end
 
   # Convenient way to disable all plugins in the memory.

data/lib/rib/api.rb

@@ -36,15 +36,13 @@ module Rib::API
   def loop_once
     input, result, err = get_input, nil, nil
     throw(:rib_exit, input) if config[:exit].include?(input)
-    catch(:rib_skip) do
-      result, err = eval_input(input)
-      if err
-        print_eval_error(err)
-      elsif input.strip != ''
-        print_result(result)
-      else
-        # print nothing for blank input
-      end
+    result, err = eval_input(input)
+    if err
+      print_eval_error(err)
+    elsif input.strip != '' && result != Rib::Skip
+      print_result(result)
+    else
+      # print nothing for blank input
     end
     [result, err]
   rescue Interrupt

data/lib/rib/core/completion.rb

@@ -2,7 +2,7 @@
 require 'rib'
 
 module Rib::Completion
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/core/history.rb

@@ -3,7 +3,7 @@ require 'rib'
 require 'fileutils'
 
 module Rib::History
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/core/multiline.rb

@@ -3,7 +3,7 @@ require 'rib'
 
 # from https://github.com/janlelis/ripl-multi_line
 module Rib::Multiline
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   engine = if Object.const_defined?(:RUBY_ENGINE)

data/lib/rib/core/readline.rb

@@ -3,7 +3,7 @@ require 'rib'
 require 'readline'
 
 module Rib::Readline
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/core/squeeze_history.rb

@@ -2,7 +2,7 @@
 require 'rib/core/history' # dependency
 
 module Rib::SqueezeHistory
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/core/strip_backtrace.rb

@@ -2,7 +2,7 @@
 require 'rib'
 
 module Rib::StripBacktrace
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/core/underscore.rb

@@ -2,7 +2,7 @@
 require 'rib'
 
 module Rib::Underscore
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   IVAR = {:_  => :@__rib_result__,

data/lib/rib/extra/autoindent.rb

@@ -4,7 +4,7 @@ require 'rib/core/readline'  # dependency
 require 'rib/core/multiline' # dependency
 
 module Rib::Autoindent
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # begin block could be simpler, because it should also trigger

data/lib/rib/extra/hirb.rb

@@ -2,7 +2,7 @@
 require 'rib'
 
 module Rib::Hirb
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/more/anchor.rb

@@ -2,7 +2,7 @@
 require 'rib'
 
 module Rib::Anchor
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -68,18 +68,10 @@ module Rib::Anchor
       end
 
       Rib.shell.loop
+      Rib::Skip
 
-    # we can't use ensure block here because we need to do something
-    # (i.e. throw :rib_skip) if there's no exception. this can't be
-    # done via ensure because then we don't know if there's an
-    # exception or not, and ensure block is always executed last
-    rescue
+    ensure
       Rib.shells.pop
-      raise
-    else
-      # only skip printing anchor result while there's another shell running
-      Rib.shells.pop
-      throw :rib_skip if Rib.shell.running?
     end
   end
 

data/lib/rib/more/color.rb

@@ -2,7 +2,7 @@
 require 'rib'
 
 module Rib::Color
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -80,7 +80,7 @@ module Rib::Color
   end
 
   def find_color colors, value
-    (colors.sort{ |(k1, v1), (k2, v2)|
+    (colors.sort{ |(k1, _), (k2, _)|
       # Class <=> Class
       if    k1 < k2 then -1
       elsif k1 > k2 then  1

data/lib/rib/more/edit.rb

@@ -3,7 +3,7 @@ require 'rib'
 require 'tempfile'
 
 module Rib::Edit
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   module Imp

data/lib/rib/more/multiline_history.rb

@@ -3,7 +3,7 @@ require 'rib/core/history'   # dependency
 require 'rib/core/multiline' # dependency
 
 module Rib::MultilineHistory
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/more/multiline_history_file.rb

@@ -2,7 +2,7 @@
 require 'rib/more/multiline_history'
 
 module Rib::MultilineHistoryFile
-  include Rib::Plugin
+  extend Rib::Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------

data/lib/rib/plugin.rb

@@ -1,30 +1,32 @@
 
 module Rib; end
 module Rib::Plugin
-  def self.included mod
-    mod.send(:include, Rib)
+  attr_accessor :disabled
 
-    class << mod
-      attr_accessor :disabled
+  def enable
+    self.disabled = false
+    if block_given? then yield else enabled? end
+  ensure
+    self.disabled = true if block_given?
+  end
 
-      def enable
-        self.disabled = false
-        if block_given? then yield else enabled? end
-      end
+  def disable
+    self.disabled = true
+    if block_given? then yield else enabled? end
+  ensure
+    self.disabled = false if block_given?
+  end
 
-      def disable
-        self.disabled = true
-        if block_given? then yield else enabled? end
-      end
+  def enabled?
+    !disabled
+  end
 
-      def enabled?
-        !disabled
-      end
+  def disabled?
+    !!disabled
+  end
 
-      def disabled?
-        !!disabled
-      end
-    end
+  def self.extended mod
+    mod.send(:include, Rib)
 
     snake_name = mod.name.sub(/(\w+::)+?(\w+)$/, '\2').
       gsub(/([A-Z][a-z]*)/, '\\1_').downcase[0..-2]
@@ -43,12 +45,6 @@ module Rib::Plugin
       RUBY
     }).join("\n")
 
-    meta_rib = if respond_to?(:singleton_class)
-                 Rib.singleton_class
-               else
-                 class << Rib; self; end
-               end
-
-    meta_rib.module_eval(code, __FILE__, __LINE__)
+    Rib.singleton_class.module_eval(code, __FILE__, __LINE__)
   end
 end

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

data/rib.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.0.5"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-05-15"
+  s.date = "2012-07-18"
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Ruby-Interactive-ruBy -- Yet another interactive Ruby shell