ripl 0.6.4 → 0.7.0

data/.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = "ripl is a light, modular alternative to irb. Like irb, it loads ~/.irbrc, has autocompletion and keeps history in ~/.irb_history.  Unlike irb, it is highly customizable via plugins and supports commands i.e. ripl-play.  This customizability makes it easy to build custom shells (i.e. for a gem or application) and complex shells (i.e. for the web). In other words, ripl is also a shell framework. Works on ruby 1.8.7 and greater."
   s.required_rubygems_version = ">= 1.3.6"
   s.executables        = %w(ripl)
-  s.add_dependency 'bond', '~> 0.4.0'
+  s.add_dependency 'bond', '~> 0.4.2'
   s.add_development_dependency 'bacon', '>= 1.1.0'
   s.add_development_dependency 'rr', '>= 1.0.4'
   s.add_development_dependency 'bacon-bits'

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.7.0
+* Don't read/write history when history is false
+* Error messages and history file are properly formatted in Windows
+
 == 0.6.4
 * Releasing with latest rubygems to avoid Syck::DefaultKey
 

data/README.rdoc

@@ -155,6 +155,7 @@ see {ripl-rails}[http://github.com/cldwalker/ripl-rails].
 == Credits
 * janlelis and godfat for bug fix and tweaks
 * JoshCheek for bug fixes
+* postmodern for windows fixes and no history support
 
 == Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/ripl/issues].

data/deps.rip

@@ -1 +1 @@
-bond ~>0.4.0
+bond ~>0.4.2

data/lib/ripl/history.rb

@@ -1,6 +1,6 @@
 module Ripl::History
   def history_file
-    @history_file ||= File.expand_path(config[:history])
+    @history_file ||= config[:history] && File.expand_path(config[:history])
   end
 
   def history() @history ||= [] end
@@ -10,12 +10,15 @@ module Ripl::History
   end
 
   def read_history
-    File.exists?(history_file) && history.empty? &&
+    if ((history_file && File.exists?(history_file)) && history.empty?)
       IO.readlines(history_file).each {|e| history << e.chomp }
+    end
   end
 
   def write_history
-    File.open(history_file, 'w') {|f| f.write Array(history).join("\n") }
+    if history_file
+      File.open(history_file, 'w') {|f| f.puts(*Array(history)) }
+    end
   end
   def before_loop() super; read_history end
   def after_loop() super; write_history end

data/lib/ripl/runner.rb

@@ -16,7 +16,7 @@ class Ripl::Runner
     'parse_option' => 'invalid option'
   }
 
-  class <<self; attr_accessor :argv, :app; end
+  class << self; attr_accessor :argv, :app; end
   self.app = 'ripl'
 
   # Adds commandline options for --help
@@ -52,7 +52,7 @@ class Ripl::Runner
   def self.load_rc(file)
     load file if File.exists?(File.expand_path(file))
   rescue StandardError, SyntaxError, LoadError
-    warn "#{app}: #{MESSAGES['load_rc'] % file}:\n"+ format_error($!)
+    $stderr.puts "#{app}: #{MESSAGES['load_rc'] % file}:", format_error($!)
   end
 
   module API
@@ -77,7 +77,7 @@ class Ripl::Runner
       desc_max = OPTIONS.values.map {|e| e[1].length }.max
       m = MESSAGES
       ["%s: #{app} [%s] [%s] [%s]" % ( [m['usage'], m['command'], m['args'],
-        m['options'].upcase] ), "\n#{m['options']}:", OPTIONS_ARR.
+        m['options'].upcase] ), "#{$/}#{m['options']}:", OPTIONS_ARR.
         map {|e| n,d = OPTIONS[e]; "  %-*s  %-*s" % [name_max, n, desc_max, d] }]
     end
 
@@ -87,7 +87,7 @@ class Ripl::Runner
 
     def format_error(err)
       stack = err.backtrace.take_while {|line| line !~ %r{/ripl/\S+\.rb} }
-      "#{err.class}: #{err.message}\n    #{stack.join("\n    ")}"
+      "#{err.class}: #{err.message}#{$/}    #{stack.join("#{$/}    ")}"
     end
   end
   extend API

data/lib/ripl/shell.rb

@@ -10,10 +10,15 @@ class Ripl::Shell
     new(options)
   end
 
-  class <<self; public :include; end
-
-  OPTIONS = {:name => 'ripl', :result_prompt => '=> ', :prompt => '>> ',
-    :binding => TOPLEVEL_BINDING, :irbrc=>'~/.irbrc'}
+  class << self; public :include; end
+
+  OPTIONS = {
+    :name => 'ripl',
+    :result_prompt => '=> ',
+    :prompt => '>> ',
+    :binding => TOPLEVEL_BINDING,
+    :irbrc=>'~/.irbrc'
+  }
   EXIT_WORDS = [nil, 'exit', 'quit']
 
   attr_accessor :line, :binding, :result, :name, :input
@@ -34,8 +39,10 @@ class Ripl::Shell
   def config() Ripl.config end
 
   module API
-    MESSAGES = {'prompt' => 'Error while creating prompt',
-      'print_result' => 'Error while printing result'}
+    MESSAGES = {
+      'prompt' => 'Error while creating prompt',
+      'print_result' => 'Error while printing result'
+    }
 
     attr_accessor :prompt, :result_prompt
     # Sets up shell before looping by loading ~/.irbrc. Can be extended to
@@ -91,7 +98,7 @@ class Ripl::Shell
     def prompt
       @prompt.respond_to?(:call) ? @prompt.call : @prompt
     rescue StandardError, SyntaxError
-      warn "ripl: #{MESSAGES['prompt']}:\n"+ format_error($!)
+      $stderr.puts "ripl: #{MESSAGES['prompt']}:", format_error($!)
       OPTIONS[:prompt]
     end
 
@@ -104,14 +111,14 @@ class Ripl::Shell
     # handle certain exceptions.
     # @param [Exception]
     def print_eval_error(err)
-      warn format_error(err)
+      $stderr.puts format_error(err)
     end
 
     # Prints result using #format_result
     def print_result(result)
       puts(format_result(result)) unless @error_raised
     rescue StandardError, SyntaxError
-      warn "ripl: #{MESSAGES['print_result']}:\n"+ format_error($!)
+      $stderr.puts "ripl: #{MESSAGES['print_result']}:", format_error($!)
     end
 
     # Formats errors raised by eval of user input

data/lib/ripl/version.rb

@@ -1,3 +1,3 @@
 module Ripl
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

data/test/history_test.rb

@@ -8,6 +8,12 @@ describe "History with readline" do
     Ripl.shell(:history => HISTORY_FILE, :readline => false, :completion => false)
   end
 
+  def history_must_equal(history, sh=shell)
+    stub(Ripl::Runner).load_rc
+    sh.before_loop
+    sh.history.to_a.should == history
+  end
+
   before_all { reset_shell }
   before do
     reset_ripl
@@ -18,32 +24,26 @@ describe "History with readline" do
   after { FileUtils.rm_f HISTORY_FILE }
 
   it "#after_loop saves history" do
-    inputs = %w{blih blah}
+    inputs = %w[blih blah]
     shell.instance_variable_set '@history', inputs
     shell.after_loop
-    File.read(HISTORY_FILE).should == inputs.join("\n")
+    File.read(HISTORY_FILE).should == inputs.join($/) + $/
   end
 
   it "#before_loop loads previous history" do
-    File.open(HISTORY_FILE, 'w') {|f| f.write "check\nthe\nmike" }
-    stub(Ripl::Runner).load_rc
-    shell.before_loop
-    shell.history.to_a.should == %w{check the mike}
+    File.open(HISTORY_FILE, 'w') {|f| f.write %w[check the mike].join($/) }
+    history_must_equal %w{check the mike}
   end
 
   it "#before_loop loads previous history only when it's empty" do
-    File.open(HISTORY_FILE, 'w') {|f| f.write "check\nthe\nmike" }
-    stub(Ripl::Runner).load_rc
-    history = %w{already there}
+    File.open(HISTORY_FILE, 'w') {|f| f.write %w[check the mike].join($/) }
+    history = %w[already there]
     shell.instance_variable_set(:@history, history.dup)
-    shell.before_loop
-    shell.history.to_a.should == history
+    history_must_equal history
   end
 
   it "#before_loop has empty history if no history file exists" do
-    stub(Ripl::Runner).load_rc
-    shell.before_loop
-    shell.history.to_a.should == []
+    history_must_equal []
   end
 
   it "#get_input adds to history" do
@@ -56,9 +56,7 @@ describe "History with readline" do
     mod = Object.const_set "Ping_read_history", Module.new
     mod.send(:define_method, 'read_history') { @history = ['pong_read_history'] }
     Shell.send :include, mod
-    stub(Ripl::Runner).load_rc
-    shell.before_loop
-    shell.history.should == ['pong_read_history']
+    history_must_equal ['pong_read_history']
   end
 
   it "#write_history is accessible to plugins in #after_loop" do
@@ -82,4 +80,27 @@ describe "History with readline" do
     sandbox_shell.after_loop
     sandbox_shell.history.should == ['updated_history']
   end
+
+  describe "with no history_file" do
+    def shell
+      Ripl.shell(:history => false)
+    end
+
+    before_all do
+      FileUtils.touch(HISTORY_FILE)
+      reset_shell
+    end
+
+    it "#after_loop does not save history" do
+      inputs = %w{blih blah}
+      shell.instance_variable_set '@history', inputs
+      shell.after_loop
+      File.read(HISTORY_FILE).should == ''
+    end
+
+    it "#before_loop does not load history" do
+      File.open(HISTORY_FILE, 'w') {|f| f.puts 'check', 'the', 'mike' }
+      history_must_equal [], shell
+    end
+  end
 end

data/test/runner_test.rb

@@ -67,13 +67,13 @@ describe "Runner" do
       it "rescues and prints SyntaxError" do
         mock(Runner).load(anything) { raise SyntaxError }
         mock_shell
-        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading .*.riplrc:\nSyntaxError:}
+        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading .*.riplrc:#{$/}SyntaxError:}
       end
 
       it "rescues and prints LoadError" do
         mock(Runner).load(anything) { raise LoadError }
         mock_shell
-        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading .*.riplrc:\nLoadError:}
+        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading .*.riplrc:#{$/}LoadError:}
       end
     end
 
@@ -229,13 +229,16 @@ describe "Runner" do
       mock(Runner).exit
       actual = ripl("-h")
       actual.should =~ /^Usage: ripl/
-      actual.should =~ /Options:\n  -f/
+      actual.should =~ /Options:#{$/}  -f/
     end
 
     it "with invalid options prints errors" do
       capture_stderr {
         ripl('--blah', '-z')
-      }.chomp.should == "ripl: invalid option `blah'\nripl: invalid option `z'"
+      }.chomp.should == [
+        "ripl: invalid option `blah'",
+        "ripl: invalid option `z'"
+      ].join($/)
     end
 
     describe "with plugin" do

data/test/shell_test.rb

@@ -32,12 +32,12 @@ describe "Shell" do
     it "handles Control-C" do
       mock(shell).get_input { raise Interrupt }
       dont_allow(shell).eval_input
-      capture_stdout { shell.loop_once }.should == "\n"
+      capture_stdout { shell.loop_once }.should == $/
     end
 
     it "prints result" do
       mock(shell).get_input { '"m" * 2' }
-      capture_stdout { shell.loop_once }.should == %[=> "mm"\n]
+      capture_stdout { shell.loop_once }.should == '=> "mm"' + $/
     end
 
     it "prints error from a failed result" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripl
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bond
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ruby interactive print loop - A light, modular alternative to irb and a shell