ripl 0.2.4 → 0.2.5

data/.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables        = %w(ripl)
   s.add_dependency 'bond', '~> 0.3.3'
   s.add_development_dependency 'bacon', '>= 1.1.0'
-  s.add_development_dependency 'rr', '= 0.10.10'
+  s.add_development_dependency 'rr', '>= 1.0.0'
   s.add_development_dependency 'bacon-bits'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.files += Dir.glob('man/*')

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.2.5
+* Add -F option
+* Extendable commandline options
+* Rescue failing dynamic prompts
+
 == 0.2.4
 * Add modular console commands with Ripl::Commands
 * Add Shell#result_prompt for plugins

data/README.rdoc

@@ -61,7 +61,7 @@ modifying ~/.irbrc, wrap your irb-specific configuration in a block as follow:
   * 6 common commandline options: -f, -r, -I, -d, -h, -v
   * IRB.conf -> Ripl.config
 * Enhancements over irb
-  * ~230 lines vs irb's 5000+ lines
+  * ~250 lines (doc included) vs irb's 5000+ lines
   * Easily extendable with plugins
   * Tests and documentation!
   * Customizable completion and completion of method arguments (from bond)
@@ -78,7 +78,7 @@ Note: Irb features not in ripl can be implemented as plugins.
 
 == Plugins
 
-A ripl plugin is a module that is included into Ripl::Shell or Ripl::Runner. Being simply modules,
+A ripl plugin is a module that is included into Ripl::Shell or extended into Ripl::Runner. Being simply modules,
 they can be packaged as gems and reused across shells as needed.  ripl highly encourages plugins by
 loading them as early as possible and allowing them to extend most of ripl's functionality.
 
@@ -136,9 +136,11 @@ see {ripl-rails}[http://github.com/cldwalker/ripl-rails].
 
 * {ripl-rails}[http://github.com/cldwalker/ripl-rails] : script/console for ripl
 * {ripl-color_error}[http://github.com/cldwalker/ripl-color_error] : colorize errors
-* {ripl-after_rc}[http://github.com/cldwalker/ripl-after_rc] : provide blocks to run after ~/.irbrc is loaded
 * {ripl-multi_line}[http://github.com/janlelis/ripl-multi_line] : evaluate multiple lines
+* {ripl-after_rc}[http://github.com/cldwalker/ripl-after_rc] : provide blocks to run after ~/.irbrc is loaded
 * {ripl-irb}[http://github.com/cldwalker/ripl-irb] : smooths transition from irb
+* {ripl-commands}[http://github.com/cldwalker/ripl-commands] : adds ripl commands similar to irb's commands
+* {ripl-color_streams}[http://github.com/janlelis/ripl-color_streams] : colorizes stderr + stdout
 * {ripl-color_result}[http://github.com/janlelis/ripl-color_result] : colorizes results
 * {nirvana}[http://github.com/cldwalker/nirvana]: Not a plugin but rather a web shell built on top of ripl
 

data/lib/ripl/history.rb

@@ -12,7 +12,7 @@ module Ripl::History
   def before_loop
     @history = []
     super
-    at_exit { write_history }
+    Kernel.at_exit { write_history }
     File.exists?(history_file) &&
       IO.readlines(history_file).each {|e| history << e.chomp }
   end

data/lib/ripl/runner.rb

@@ -1,12 +1,21 @@
 module Ripl::Runner
-  def self.included(mod)
-    mod.extend(self)
-  end
+  OPTIONS = [
+    ['-f', 'Suppress loading ~/.irbrc'],
+    ['-F', 'Suppress loading ~/.riplrc'],
+    ['-d, --debug', "Set $DEBUG to true (same as `ruby -d')"],
+    ['-I PATH', "Add to front of $LOAD_PATH. Delimit multiple paths with ':'"],
+    ['-r, --require FILE', "Require file (same as `ruby -r')"],
+    ['-v, --version', 'Print ripl version'],
+    ['-h, --help', 'Print help']
+  ]
 
   module API
+    def options; OPTIONS; end
+
     def run(argv=ARGV)
-      load_rc(Ripl.config[:riplrc])
-      @riplrc = true
+      ENV['RIPLRC'] = 'false' if argv.delete('-F')
+      load_rc(Ripl.config[:riplrc]) unless ENV['RIPLRC'] == 'false'
+      @run = true
       parse_options(argv)
       argv[0] ? run_command(argv) : start
     end
@@ -25,13 +34,21 @@ module Ripl::Runner
         when '-f'
           ENV['RIPL_IRBRC'] = 'false'
         when '-h', '--help'
-          puts IO.readlines(__FILE__).grep(/^#/).map {|e| e.sub(/^#\s/,'') }; exit
-        when /^--?([^-]+)/
-          warn "ripl: invalid option `#{$1}'"
+          name_max = options.map {|e| e[0].length }.max
+          desc_max = options.map {|e| e[1].length }.max
+          puts "Usage: ripl [OPTIONS] [COMMAND] [ARGS]", "\nOptions:",
+            options.map {|k,v| "  %-*s  %-*s" % [name_max, k, desc_max, v] }
+          exit
+        when /^(--?[^-]+)/
+          invalid_option($1, argv)
         end
       end
     end
 
+    def invalid_option(option, argv)
+      warn "ripl: invalid option `#{option.sub(/^-+/, '')}'"
+    end
+
     def run_command(argv)
       exec "ripl-#{argv.shift}", *argv
     rescue Errno::ENOENT
@@ -40,7 +57,7 @@ module Ripl::Runner
     end
 
     def start(options={})
-      load_rc(Ripl.config[:riplrc]) unless @riplrc
+      load_rc(Ripl.config[:riplrc]) if !@run && ENV['RIPLRC'] != 'false'
       Ripl.config[:irbrc] = ENV['RIPL_IRBRC'] != 'false' if ENV['RIPL_IRBRC']
       Ripl.shell(options).loop
     end
@@ -48,7 +65,7 @@ module Ripl::Runner
     def load_rc(file)
       load file if File.exists?(File.expand_path(file))
     rescue StandardError, SyntaxError
-      warn "Error while loading #{file}:\n"+ format_error($!)
+      warn "ripl: Error while loading #{file}:\n"+ format_error($!)
     end
 
     def format_error(err)
@@ -57,13 +74,3 @@ module Ripl::Runner
   end
   extend API
 end
-__END__
-# Usage: ripl [OPTIONS] [COMMAND] [ARGS]
-#
-# Options:
-#   -f                  Supress loading ~/.irbrc
-#   -d, --debug         Set $DEBUG to true (same as `ruby -d')
-#   -I PATH             Add to front of $LOAD_PATH. Delimit multiple paths with ':'
-#   -r, --require FILE  Require file (same as `ruby -r')
-#   -v, --version       Print ripl version
-#   -h, --help          Print help

data/lib/ripl/shell.rb

@@ -61,6 +61,8 @@ class Ripl::Shell
       @line += 1
     end
 
+    # When extending this method, ensure your plugin disables readline:
+    # Readline.config[:readline] = false.
     # @return [String, nil] Prints #prompt and returns input given by user
     def get_input
       print prompt
@@ -70,6 +72,9 @@ class Ripl::Shell
     # @return [String]
     def prompt
       @prompt.respond_to?(:call) ? @prompt.call : @prompt
+    rescue StandardError, SyntaxError
+      warn "ripl: Error while creating prompt:\n"+ format_error($!)
+      OPTIONS[:prompt]
     end
 
     # Evals user input using @binding, @name and @line

data/lib/ripl/version.rb

@@ -1,3 +1,3 @@
 module Ripl
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/test/deps.rip

@@ -1,3 +1,3 @@
 bacon >=1.1.0
-rr =0.10.10
+rr >=1.0.0
 bacon-bits >=0

data/test/runner_test.rb

@@ -6,20 +6,20 @@ describe "Runner" do
 
     it "loads riplrc" do
       mock_riplrc
-      mock(Ripl).shell(anything) { shell = Shell.new; mock(shell).loop; shell }
+      mock_shell
       Ripl.start
     end
 
     it "sets a shell's variables" do
       mock_riplrc
-      mock(Shell).create(anything) {|e| shell = Shell.new(e); mock(shell).loop; shell }
+      mock_shell
       Ripl.start(:name=>'shh')
       Ripl.shell.name.should == 'shh'
     end
 
     it "overrides config set in riplrc" do
       mock_riplrc { Ripl.config[:name] = 'blah' }
-      mock(Shell).create(anything) {|e| shell = Shell.new(e); mock(shell).loop; shell }
+      mock_shell
       Ripl.start(:name=>'dude')
       Ripl.shell.name.should == 'dude'
     end
@@ -31,15 +31,15 @@ describe "Runner" do
 
       it "sets config" do
         mock_riplrc { Ripl.config[:blah] = true }
-        mock(Shell).create(anything) {|e| shell = Shell.new(e); mock(shell).loop; shell }
+        mock_shell
         Runner.run([])
         Ripl.config[:blah].should == true
       end
 
       it "catches and prints error" do
         mock(Runner).load(anything) { raise SyntaxError }
-        mock(Ripl).shell(anything) { shell = Shell.new; mock(shell).loop; shell }
-        capture_stderr { Runner.run([]) }.should =~ %r{^Error while loading ~/.riplrc:\nSyntaxError:}
+        mock_shell
+        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading ~/.riplrc:\nSyntaxError:}
       end
     end
 
@@ -49,10 +49,11 @@ describe "Runner" do
         ripl("rails", '--blah')
       end
 
-      it "has global options before it parsed" do
-        mock(Runner).parse_options(anything) {|e| e.shift }
+      it "has global option before it parsed" do
         mock(Runner).exec('ripl-rails')
-        ripl("-f", "rails")
+        dont_allow(Runner).load_rc(anything)
+        ripl("-F", "rails", :riplrc=>false)
+        ENV.delete('RIPLRC')
       end
 
       it "that is invalid aborts" do
@@ -127,16 +128,28 @@ describe "Runner" do
 
     it "with -f option doesn't load irbrc" do
       reset_ripl
-      mock(Shell).create(anything) {|e|
-        shell = Shell.new(e)
+      stub(Kernel).at_exit()
+      mock_shell { |shell|
         mock(shell).loop_once { throw :ripl_exit }
         dont_allow(Runner).load_rc(anything)
-        shell
       }
       ripl("-f")
+      ENV.delete('RIPL_IRBRC')
       Ripl.config[:irbrc] = '~/.irbrc'
     end
 
+    it "with -F option doesn't load riplrc" do
+      reset_ripl
+      dont_allow(Runner).load_rc(anything)
+      mock_shell { |shell|
+        stub(Kernel).at_exit
+        mock(shell).before_loop
+        mock(shell).loop_once { throw :ripl_exit }
+      }
+      ripl("-F", :riplrc => false)
+      ENV.delete('RIPLRC')
+    end
+
     it "with -d option sets $DEBUG" do
       ripl("-d", :start=>true)
       $DEBUG.should == true

data/test/shell_test.rb

@@ -23,19 +23,26 @@ describe "Shell" do
   end
 
   describe "#prompt" do
-    it "as a string" do
+    it "from a string" do
       shell(:prompt=>'> ').prompt.should == '> '
     end
 
-    it "as a lambda" do
+    it "from a lambda" do
       shell(:prompt=>lambda { "#{10 + 10}> " }).prompt.should == '20> '
     end
+
+    it "rescues from a failed lambda" do
+      capture_stderr {
+        shell(:prompt=>lambda { wtf }).prompt.should == Shell::OPTIONS[:prompt]
+      }.should =~ /ripl: Error while creating.*NameError.*`wtf'/m
+    end
   end
 
   describe "#before_loop" do
     before_all { Ripl::Commands.send(:define_method, :ping) { 'pong' } }
     it "adds commands to main from Commands" do
       stub(Ripl::Runner).load_rc
+      stub(Kernel).at_exit
       Ripl.shell.before_loop
       Ripl.shell.loop_eval("ping").should == 'pong'
     end
@@ -43,6 +50,7 @@ describe "Shell" do
     it "adds commands to fixnum from Commands" do
       stub(Ripl::Runner).load_rc
       Ripl.shell.binding = 1.send(:binding)
+      stub(Kernel).at_exit
       Ripl.shell.before_loop
       Ripl.shell.loop_eval("ping").should == 'pong'
     end

data/test/test_helper.rb

@@ -9,13 +9,21 @@ include Ripl
 module Helpers
   def ripl(*args)
     options = args[-1].is_a?(Hash) ? args.pop : {}
-    mock(Runner).load_rc(Ripl.config[:riplrc])
+    mock_riplrc unless options[:riplrc] == false
     mock(Runner).start if options[:start]
     capture_stdout { Ripl::Runner.run(args) }
   end
 
   def mock_riplrc(&block)
-    mock(Runner).load_rc(Ripl.config[:riplrc]) { block.call if block }
+    mock(Runner).load_rc(Ripl.config[:riplrc], &block)
+  end
+
+  def mock_shell(&block)
+    mock(Shell).create(anything) {|e|
+      shell = Shell.new(e)
+      block ? block.call(shell) : mock(shell).loop
+      shell
+    }
   end
 
   def reset_ripl

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ripl
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -05:00
+date: 2010-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,14 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 23
         segments: 
+        - 1
+        - 0
         - 0
-        - 10
-        - 10
-        version: 0.10.10
+        version: 1.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency