ripl-fresh 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.1
+* Be compatible with latest ripls
+* Deactivate rocket prompt
+
 == 0.2.0
 * Better system command error handling
 * Refactored command mode detection, changed configuration settings

data/README.rdoc

@@ -90,7 +90,9 @@ Currently, most {plugins}[http://github.com/cldwalker/ripl-color_error] {enable}
 
 There are lots of things which can get better:
 
+* Refactor a little bit
 * Improve auto-completion
+* RVM support possible?
 * More cool (and colorful?) <tt>:mixed</tt> Ruby commands
   * Respect "..." (single argument) for :mixed commands
 * Add tests

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 desc "Install the gem locally"
 task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version} --no-rdoc --no-ri}
 end
 
 desc "Generate the gemspec"

data/lib/ripl/fresh.rb

@@ -1,9 +1,10 @@
 require 'ripl'
+require 'ripl/multi_line'
 require 'fileutils'
 
 module Ripl
   module Fresh
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
     def before_loop
       @command_mode = :ruby
@@ -92,7 +93,7 @@ module Ripl
                                 raise( SystemCallError.new $?.exitstatus )
                               end;"
         
-        super @input = "(#{ ruby_command_code })"
+        super @input = ruby_command_code
 
       when :mixed # call the ruby method, but with shell style arguments TODO more shell like (e.g. "")
         method_name, *args = *input.split
@@ -116,11 +117,12 @@ module Ripl
   end
 end
 
-# load plugins and hook in (and work around readline loading behaviour)
+# load plugins and hook in (and work around readline loading behaviour) TODO: refactor
+readline = Ripl.config[:readline] == true ? 'readline' : Ripl.config[:readline]
 Ripl.config[:readline] = false
+require readline
 require 'ripl/readline'
-require 'ripl/multi_line'
-Ripl::Shell.send :include, Ripl::Fresh
+Ripl::Shell.include Ripl::Fresh
 
 # load :mixed commands
 require File.dirname(__FILE__) + '/fresh/commands'
@@ -131,4 +133,7 @@ require File.dirname(__FILE__) + '/fresh/config'
 # fresh_prompt management
 require File.dirname(__FILE__) + '/fresh/prompt'
 
+# configure other plugins
+Ripl.config[:rocket_mode] = false
+
 # J-_-L

data/test/deps.rip

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

data/test/runner_test.rb

@@ -0,0 +1,248 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe "Runner" do
+  describe ".start" do
+    before { reset_ripl }
+
+    it "loads riplrc" do
+      mock_riplrc
+      mock_shell
+      Ripl.start
+    end
+
+    it "doesn't load riplrc" do
+      mock_shell
+      dont_allow(Runner).load_rc(anything)
+      Ripl.start :riplrc => false
+    end
+
+    it "sets a shell's variables" do
+      mock_riplrc
+      mock_shell
+      Ripl.start(:name=>'shh')
+      Ripl.shell.name.should == 'shh'
+    end
+
+    it "passes options to Ripl.config" do
+      mock_riplrc
+      mock_shell
+      Ripl.start(:history=>'~/.mah_history')
+      Ripl.config[:history].should == '~/.mah_history'
+    end
+
+    it "overrides config set in riplrc" do
+      mock_riplrc { Ripl.config[:name] = 'blah' }
+      mock_shell
+      Ripl.start(:name=>'dude')
+      Ripl.shell.name.should == 'dude'
+    end
+  end
+
+  describe ".run" do
+    describe "riplrc" do
+      before { reset_ripl }
+
+      it "sets config" do
+        mock_riplrc { Ripl.config[:blah] = true }
+        mock_shell
+        Runner.run([])
+        Ripl.config[:blah].should == true
+      end
+
+      it "catches and prints error" do
+        mock(Runner).load(anything) { raise SyntaxError }
+        mock_shell
+        capture_stderr { Runner.run([]) }.should =~ %r{^ripl: Error while loading ~/.riplrc:\nSyntaxError:}
+      end
+    end
+
+    describe "with subcommand" do
+      def set_dollar_zero(val)
+        $progname = $0
+        alias $0 $progname
+        $0 = val
+      end
+
+      def mock_exec(*args)
+        mock(Runner).exec('ripl-rails', *args) do
+          set_dollar_zero 'ripl-rails'
+          ARGV.replace(args)
+          Ripl.start
+        end
+      end
+
+      it "gets invoked with arguments" do
+        mock_exec 'blah'
+        ripl("rails", 'blah')
+      end
+
+      it "has -F global option parsed" do
+        mock_exec '-F'
+        dont_allow(Runner).load_rc(anything)
+        ripl("rails", "-F", :riplrc=>false)
+      end
+
+      it "saves arguments passed to it" do
+        mock_exec 'blah', '-F'
+        ripl("rails", "blah", "-F", :riplrc=>false)
+        Ripl::Runner.argv.should == ['blah', '-F']
+      end
+
+      it "has other global option parsed" do
+        mock_exec '-r=blah'
+        mock(Runner).require('blah')
+        ripl("rails", "-r=blah")
+      end
+
+      it "has automatic --help" do
+        mock_exec '--help'
+        mock(Runner).exit
+        ripl("rails", "--help").chomp.should == "ripl rails [OPTIONS] [ARGS]"
+      end
+
+      it "that is invalid aborts" do
+        mock(Runner).abort("`zzz' is not a ripl command.")
+        ripl 'zzz', :riplrc => false, :loop => false
+      end
+      after_all { set_dollar_zero 'ripl' }
+    end
+
+    describe "with -I option" do
+      before { @old_load_path = $:.dup }
+      after { $:.replace @old_load_path }
+
+      it "and equal sign adds to $LOAD_PATH" do
+        ripl("-I=blah")
+        $:[0].should == 'blah'
+      end
+
+      it "and no equal sign adds to $LOAD_PATH" do
+        ripl("-Ispec")
+        $:[0].should == 'spec'
+      end
+
+      it "and whitespace delimited argument adds to $LOAD_PATH" do
+        ripl("-I", "spec")
+        $:[0].should == 'spec'
+      end
+
+      it "containing multiple paths adds to $LOAD_PATH" do
+        ripl("-I=app:lib")
+        $:[0,2].should == ['app', 'lib']
+      end
+
+      it "called more than once adds to $LOAD_PATH" do
+        ripl("-Ilib", "-Ispec")
+        $:[0,2].should == ['spec', 'lib']
+      end
+
+      it "with invalid argument doesn't add to $LOAD_PATH" do
+        previous_size = $:.size
+        ripl("-I")
+        $:.size.should == previous_size
+      end
+    end
+
+    describe "with -r option" do
+      it "and equal sign requires path" do
+        mock(Runner).require('rip')
+        ripl("-r=rip")
+      end
+
+      it "and no equal sign requires path" do
+        mock(Runner).require('rip')
+        ripl("-rrip")
+      end
+
+      it "and whitespace delimited argument requires path" do
+        mock(Runner).require('rip')
+        ripl("-r", "rip")
+      end
+
+      it "called more than once requires paths" do
+        mock(Runner).require('rip')
+        mock(Runner).require('dude')
+        ripl("-rrip", "-rdude")
+      end
+
+      it "with invalid argument requires blank" do
+        mock(Runner).require('')
+        ripl('-r')
+      end
+    end
+
+    it "with -f option doesn't load irbrc" do
+      reset_ripl
+      reset_config
+      stub(Kernel).at_exit()
+      mock_shell { |shell|
+        mock(shell).loop_once { throw :ripl_exit }
+        dont_allow(Runner).load_rc(anything)
+      }
+      ripl("-f", :loop => false)
+      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, :loop => false)
+    end
+
+    it "with -d option sets $DEBUG" do
+      ripl("-d")
+      $DEBUG.should == true
+      $DEBUG = nil
+    end
+
+    it "with -v option prints version" do
+      mock(Runner).exit
+      ripl("-v").chomp.should == Ripl::VERSION
+    end
+
+    it "with -h option prints help" do
+      mock(Runner).exit
+      actual = ripl("-h")
+      actual.should =~ /^Usage: ripl/
+      actual.should =~ /Options:\n  -f/
+    end
+
+    it "with invalid options prints errors" do
+      capture_stderr {
+        ripl('--blah', '-z')
+      }.chomp.should == "ripl: invalid option `blah'\nripl: invalid option `z'"
+    end
+
+    describe "with plugin" do
+      before_all do
+        Moo = Module.new do
+          def parse_option(option, argv)
+            option == '--moo' ? puts("MOOOO") : super
+          end
+        end
+        Runner.extend Moo
+        Runner.add_options ['--moo', 'just moos']
+      end
+
+      it "parses plugin option" do
+        ripl("--moo").chomp.should == 'MOOOO'
+      end
+
+      it "displays plugin option in --help" do
+        mock(Runner).exit
+        ripl("--help").should =~ /--moo\s*just moos/
+      end
+
+      it "handles invalid option" do
+        capture_stderr {
+          ripl('--blah')
+        }.chomp.should == "ripl: invalid option `blah'"
+      end
+    end
+  end
+end

data/test/shell_test.rb

@@ -0,0 +1,121 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe "Shell" do
+  before { reset_ripl }
+
+  def shell(options={})
+    Ripl.shell(options)
+  end
+
+  describe "#loop" do
+    before { mock(shell).before_loop }
+    it "exits with exit" do
+      mock(shell).get_input { 'exit' }
+      dont_allow(shell).eval_input
+      shell.loop
+    end
+
+    it "exits with quit" do
+      mock(shell).get_input { 'quit' }
+      dont_allow(shell).eval_input
+      shell.loop
+    end
+
+    it "exits with Control-D" do
+      mock(shell).get_input { nil }
+      dont_allow(shell).eval_input
+      shell.loop
+    end
+  end
+
+  it "#loop_once handles Control-C" do
+    mock(shell).get_input { raise Interrupt }
+    dont_allow(shell).eval_input
+    capture_stdout { shell.loop_once }.should == "\n"
+  end
+
+  describe "#prompt" do
+    it "from a string" do
+      shell(:prompt=>'> ').prompt.should == '> '
+    end
+
+    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' } }
+    before { reset_config }
+    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
+
+    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
+  end
+
+  describe "#eval_input" do
+    before { @line = shell.line; shell.eval_input("10 ** 2") }
+
+    describe "normally" do
+      it "sets result" do
+        shell.result.should == 100
+      end
+
+      it "sets _" do
+        shell.eval_input('_')
+        shell.result.should == 100
+      end
+
+      it "increments line" do
+        shell.line.should == @line + 1
+      end
+    end
+
+    describe "with error" do
+      before {
+        @line = shell.line
+        @stderr = capture_stderr { shell.eval_input('{') }
+      }
+
+      it "prints it" do
+                               # 1.8                      # 1.9
+        @stderr.should =~ /^(?:SyntaxError: compile error|SyntaxError: \(ripl\):\d+: syntax error)/
+      end
+
+      it "sets @error_raised" do
+        shell.instance_variable_get("@error_raised").should == true
+      end
+
+      it "increments line" do
+        shell.line.should == @line + 1
+      end
+    end
+  end
+
+  describe "API#" do
+    Shell::API.instance_methods.delete_if {|e| e[/=$/]}.each do |meth|
+      it "#{meth} is accessible to plugins" do
+        mod = Object.const_set "Ping_#{meth}", Module.new
+        mod.send(:define_method, meth) { "pong_#{meth}" }
+        Shell.send :include, mod
+        shell.send(meth).should == "pong_#{meth}"
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,60 @@
+require 'bacon'
+require 'bacon/bits'
+require 'rr'
+require 'bacon/rr'
+require 'stringio'
+require 'ripl'
+include Ripl
+
+module Helpers
+  def ripl(*args)
+    options = args[-1].is_a?(Hash) ? args.pop : {}
+    mock_riplrc unless options[:riplrc] == false
+    mock(Ripl.shell).loop unless options[:loop] == false
+    capture_stdout { Ripl::Runner.run(args) }
+  end
+
+  def mock_riplrc(&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
+    Ripl.instance_eval "@config = @shell = @riplrc = nil"
+  end
+
+  def reset_config
+    Ripl.config.merge! :history => '~/.irb_history', :completion => {}
+  end
+
+  def capture_stdout(&block)
+    original_stdout = $stdout
+    $stdout = fake = StringIO.new
+    begin
+      yield
+    ensure
+      $stdout = original_stdout
+    end
+    fake.string
+  end
+
+  def capture_stderr(&block)
+    original_stderr = $stderr
+    $stderr = fake = StringIO.new
+    begin
+      yield
+    ensure
+      $stderr = original_stderr
+    end
+    fake.string
+  end
+end
+
+Bacon::Context.send :include, Helpers

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ripl-fresh
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
-default_executable: 
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ripl
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 6
         version: 0.2.6
   type: :runtime
   version_requirements: *id001
@@ -40,10 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
         version: 0.2.0
   type: :runtime
   version_requirements: *id002
@@ -64,15 +51,17 @@ files:
 - lib/ripl/fresh.rb
 - lib/ripl-fresh/bond_workaround.rb
 - lib/bond/completions/ripl-fresh.rb
+- test/test_helper.rb
+- test/shell_test.rb
+- test/runner_test.rb
 - bin/fresh
 - bin/ripl-fresh
 - README.rdoc
 - CHANGELOG.rdoc
-- deps.rip
+- test/deps.rip
 - Rakefile
 - .gemspec
 - LICENSE
-has_rdoc: true
 homepage: http://github.com/janlelis/fresh
 licenses: 
 - MIT
@@ -86,24 +75,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
       version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Fresh Ruby Enhanced SHell

data/deps.rip

@@ -1 +0,0 @@
-ripl >=0.2.5