rib 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c625bc0da2b14df1f4856299b5f5c44d79915a
-  data.tar.gz: 30688e5296926f1e38a67c3695181c796a0bbb7d
+  metadata.gz: ddd655c34f6696f9ee88606efcf30acbd726ad54
+  data.tar.gz: 46ad8ec8b715f478c0677a1a49c0190473df42df
 SHA512:
-  metadata.gz: 41a078427da34028fbbed7f377c9e906e5b6e2a8cc53c2f30d0ac7fa5c888667fc1ab0aa0ef2f5c6927306c35887a81db0b6ba50eabb6ef2af147d0d6b84797d
-  data.tar.gz: 1c600c0587d555cf031130be807e46a29057ae99538e239f7b0d4ab5a23eaf1c9d169504fb928930f8296ff04fbad92126df705e8bd1928ec28336dae542469a
+  metadata.gz: ba6586bba0c20fb2cfdb1a731d67824a1f43f9fe1d240b7764ab8de50394e0c4c595799cad527cdd80ecc1201203c4f3acd286736aac2e87dda1c71659b6363e
+  data.tar.gz: '080e885ebd7e6a8e5be217e985ff5efa40631b4847a15b887aea158f43ef1b1a66d43b96538d36abb642f69537045f2704b71899b37eb43ffa2bfd005caff6ca'

data/.travis.yml

@@ -12,7 +12,7 @@ matrix:
   include:
     - rvm: 2.2.5
     - rvm: 2.3.2
-    - rvm: 2.4.0
+    - rvm: 2.4.1
     - rvm: jruby-9
       env: JRUBY_OPTS=--debug
     - rvm: rbx

data/CHANGES.md

@@ -1,5 +1,37 @@
 # CHANGES
 
+## Rib 1.5.2 -- 2017-05-01
+
+* We now `require 'rib/version'` from the beginning, avoid loading error
+  under bundler.
+* Introduced `API#started_at` which is `config[:started_at]` for accessing
+  when Rib started.
+* Introduced `API#inspect_result` which would inspect the result. The default
+  behaviour would just inspect the result, but if the result is not a string,
+  emit a warning. https://github.com/godfat/rib/issues/14
+* Now all warnings would be printed after the result was printed. This would
+  make it easier to spot warnings.
+* [more/color] It would now paint warnings.
+* [more/anchor] Introduced `Rib.stop_anchors` to stop all nested anchors.
+  https://github.com/godfat/rib/issues/13
+* Fixed Rib app detection for newer RubyGems
+
+### Breaking changes
+
+* Extending `Rib::Plugin` would no longer automatically also include `Rib`.
+  For compatibility concern, a `const_missing` is now defined in `Rib::Plugin`
+  so that using `Shell` would still refer to `Rib::Shell` for you, considering
+  that this might be a common pattern:
+
+      extend Rib::Plugin
+      Shell.use(self)
+
+  Note that this would be removed in the future, so please take this chance to
+  change it to:
+
+      extend Rib::Plugin
+      Rib::Shell.use(self)
+
 ## Rib 1.5.1 -- 2017-03-09
 
 * [more/beep] This plugin would beep via `print "\a"` when the application

data/README.md

@@ -190,11 +190,11 @@ rib options:
   -h, --help             Print this message
   -v, --version          Print the version
 rib commands:
-  min                    Run the minimum essence
-  auto                   Run as Rails or Rack console (auto-detect)
   all                    Load all recommended plugins
-  rails                  Run as Rails console
+  auto                   Run as Rails or Rack console (auto-detect)
+  min                    Run the minimum essence
   rack                   Run as Rack console
+  rails                  Run as Rails console
 ```
 
 #### Basic configuration
@@ -455,11 +455,12 @@ simple, simpler than rib-rails.
 * Lin Jen-Shin (@godfat)
 * Mr. Big Cat (@miaout17)
 * @bootleq
+* @lulalala
 * @tka
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
 Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
 

data/TODO.md

@@ -1,5 +1,7 @@
 # TODO
 
+* cleanup the tests. it's so messy right now
+
 * Runner tests
 * Documentation
 * Implement exception_spy

data/lib/rib.rb

@@ -1,8 +1,8 @@
 
 require 'rib/shell'
+require 'rib/version'
 
 module Rib
-  autoload :VERSION, 'rib/version'
   Skip = Object.new
 
   module_function

data/lib/rib/api.rb

@@ -1,6 +1,5 @@
 
-module Rib; end
-module Rib::API
+module Rib; module API
   # Called before shell starts looping
   def before_loop
     self
@@ -23,18 +22,22 @@ module Rib::API
   def eval_binding ; config[:binding]       ; end
   # The line number for next evaluation
   def line         ; config[:line]          ; end
+  # When the application loaded
+  def started_at   ; config[:started_at]    ; end
 
   # Main loop
   def in_loop
-    input = catch(:rib_exit){ loop_once while true }
-    puts if input == nil
+    input = catch(:rib_exit){ loop_once while running? }
+    puts if input == nil && running?
   end
 
   # Loop iteration: REPL
   def loop_once
     input, result, err = get_input, nil, nil
     throw(:rib_exit, input) if config[:exit].include?(input)
+
     result, err = eval_input(input)
+
     if err
       print_eval_error(err)
     elsif input.strip != '' && !equal_rib_skip(result)
@@ -42,6 +45,9 @@ module Rib::API
     else
       # print nothing for blank input or Rib::Skip
     end
+
+    flush_warnings
+
     [result, err]
   rescue Interrupt
     handle_interrupt
@@ -81,23 +87,34 @@ module Rib::API
   def print_result result
     puts(format_result(result))
   rescue StandardError, SyntaxError => e
-    Rib.warn("Error while printing result:\n  #{format_error(e)}")
+    warn("Error while printing result:\n  #{format_error(e)}")
   end
 
   # Print evaluated error using #format_error
   def print_eval_error err
     puts(format_error(err))
   rescue StandardError, SyntaxError => e
-    Rib.warn("Error while printing error:\n  #{format_error(e)}")
+    warn("Error while printing error:\n  #{format_error(e)}")
   end
 
   def puts str
     super
   end
 
+  def warn message
+    warnings << message
+  end
+
   # Format result using #result_prompt
   def format_result result
-    result_prompt + result.inspect
+    "#{result_prompt}#{inspect_result(result)}"
+  end
+
+  def inspect_result result
+    string = result.inspect
+    warn("#{result.class}#inspect is not returning a string") unless
+      string.kind_of?(String)
+    string
   end
 
   # Format error raised in #loop_eval with #get_error
@@ -123,4 +140,8 @@ module Rib::API
   rescue
     # do nothing, it cannot respond to == correctly, it can't be Rib::Skip
   end
-end
+
+  def flush_warnings
+    Rib.warn(warnings.shift) until warnings.empty?
+  end
+end; end

data/lib/rib/app/auto.rb

@@ -1,6 +1,5 @@
 
-module Rib; end
-module Rib::Auto
+module Rib; module Auto
   module_function
   def load
     app, name = %w[rails rack].find{ |n|
@@ -20,4 +19,4 @@ module Rib::Auto
       Rib.warn("No app found")
     end
   end
-end
+end; end

data/lib/rib/app/rack.rb

@@ -1,6 +1,5 @@
 
-module Rib; end
-module Rib::Rack
+module Rib; module Rack
   singleton_class.module_eval{ attr_accessor :app }
 
   module_function
@@ -26,4 +25,4 @@ module Rib::Rack
   def configru_path
     "#{Rib.config[:prefix]}/config.ru"
   end
-end
+end; end

data/lib/rib/app/rails.rb

@@ -1,6 +1,5 @@
 
-module Rib; end
-module Rib::Rails
+module Rib; module Rails
   module_function
   def load
     load_rails
@@ -113,4 +112,4 @@ module Rib::Rails
   def path_for file
     File.expand_path("#{Rib.config[:prefix]}/config/#{file}")
   end
-end
+end; end

data/lib/rib/core/completion.rb

@@ -1,28 +1,21 @@
 
 require 'rib'
 
-module Rib::Completion
-  extend Rib::Plugin
+module Rib; module Completion
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
 
   def before_loop
     return super if Completion.disabled?
-     config[:completion]                ||= {}
-     config[:completion][:eval_binding] ||= method(:eval_binding).to_proc
-    (config[:completion][:gems]         ||= []).concat(ripl_plugins)
+    config[:completion]                ||= {}
+    config[:completion][:gems]         ||= []
+    config[:completion][:eval_binding] ||= method(:eval_binding).to_proc
     Rib.silence{Bond.start(config[:completion]) unless Bond.started?}
     super
   end
-
-
-
-  private
-  def ripl_plugins
-    $LOADED_FEATURES.map{ |e| e[/ripl\/[^\/]+$/] }.compact
-  end
-end
+end; end
 
 begin
   Rib.silence{require 'bond'}

data/lib/rib/core/history.rb

@@ -2,8 +2,8 @@
 require 'rib'
 require 'fileutils'
 
-module Rib::History
-  extend Rib::Plugin
+module Rib; module History
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -63,4 +63,4 @@ module Rib::History
   def history_size
     config[:history_size] ||= 500
   end
-end
+end; end

data/lib/rib/core/last_value.rb

@@ -1,8 +1,8 @@
 
 require 'rib'
 
-module Rib::LastValue
-  extend Rib::Plugin
+module Rib; module LastValue
+  extend Plugin
   Shell.use(self)
 
   attr_reader :last_value, :last_exception
@@ -32,4 +32,4 @@ module Rib::LastValue
   end
 
   Rib.extend(Imp)
-end
+end; end

data/lib/rib/core/multiline.rb

@@ -2,8 +2,8 @@
 require 'rib'
 
 # from https://github.com/janlelis/ripl-multi_line
-module Rib::Multiline
-  extend Rib::Plugin
+module Rib; module Multiline
+  extend Plugin
   Shell.use(self)
 
   engine = if Object.const_defined?(:RUBY_ENGINE)
@@ -129,4 +129,4 @@ module Rib::Multiline
   def multiline_buffer
     @multiline_buffer ||= []
   end
-end
+end; end

data/lib/rib/core/readline.rb

@@ -2,8 +2,8 @@
 require 'rib'
 require 'readline'
 
-module Rib::Readline
-  extend Rib::Plugin
+module Rib; module Readline
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -24,4 +24,4 @@ unless ::Readline::HISTORY.respond_to?(:last)
   def (::Readline::HISTORY).last
     self[-1]
   end
-end
+end; end

data/lib/rib/core/squeeze_history.rb

@@ -1,8 +1,8 @@
 
 require 'rib/core/history' # dependency
 
-module Rib::SqueezeHistory
-  extend Rib::Plugin
+module Rib; module SqueezeHistory
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -42,4 +42,4 @@ module Rib::SqueezeHistory
       end
     }
   end
-end
+end; end

data/lib/rib/core/strip_backtrace.rb

@@ -1,8 +1,8 @@
 
 require 'rib'
 
-module Rib::StripBacktrace
-  extend Rib::Plugin
+module Rib; module StripBacktrace
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -42,4 +42,4 @@ module Rib::StripBacktrace
   def replace_path_prefix prefix, substitute, path
     path.sub(/\A#{Regexp.escape(prefix)}\//, substitute)
   end
-end
+end; end

data/lib/rib/extra/autoindent.rb

@@ -3,8 +3,8 @@ require 'rib/core/history'   # otherwise the order might be wrong
 require 'rib/core/readline'  # dependency
 require 'rib/core/multiline' # dependency
 
-module Rib::Autoindent
-  extend Rib::Plugin
+module Rib; module Autoindent
+  extend Plugin
   Shell.use(self)
 
   # begin block could be simpler, because it should also trigger
@@ -153,7 +153,7 @@ module Rib::Autoindent
   def autoindent_stack
     @autoindent_stack ||= []
   end
-end
+end; end
 
 begin
   require 'readline_buffer'

data/lib/rib/extra/hirb.rb

@@ -1,8 +1,8 @@
 
 require 'rib'
 
-module Rib::Hirb
-  extend Rib::Plugin
+module Rib; module Hirb
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -24,4 +24,4 @@ rescue LoadError => e
            "    gem install hirb\n"                   ,
            "Or add hirb to Gemfile if that's the case")
   Rib::Hirb.disable
-end
+end; end

data/lib/rib/extra/paging.rb

@@ -1,8 +1,8 @@
 
 require 'rib'
 
-module Rib::Paging
-  extend Rib::Plugin
+module Rib; module Paging
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
@@ -36,7 +36,7 @@ module Rib::Paging
   def pager
     ENV['PAGER'] || 'less -R'
   end
-end
+end; end
 
 pager = ENV['PAGER'] || 'less'
 

data/lib/rib/more/anchor.rb

@@ -1,15 +1,15 @@
 
 require 'rib'
 
-module Rib::Anchor
-  extend Rib::Plugin
+module Rib; module Anchor
+  extend Plugin
   Shell.use(self)
 
   # --------------- Rib API ---------------
 
   def prompt
     return super if Rib::Anchor.disabled?
-    return super unless config[:prompt_anchor]
+    return super unless anchor?
 
     level = "(#{Rib.shells.size - 1})"
     if Rib.const_defined?(:Color) &&
@@ -22,6 +22,10 @@ module Rib::Anchor
     end
   end
 
+  def anchor?
+    !!config[:prompt_anchor]
+  end
+
 
 
   private
@@ -67,7 +71,12 @@ module Rib::Anchor
     ensure
       Rib.shells.pop
     end
+
+    def stop_anchors
+      Rib.shells.select(&:anchor?).each(&:stop)
+      Rib::Skip
+    end
   end
 
   Rib.extend(Imp)
-end
+end; end