dietrb 0.4.7 → 0.5.0

data/spec/regression/context_spec.rb

@@ -11,6 +11,6 @@ describe "IRB::Context, when evaluating source" do
   
   it "does not assign the result to the `_' variable in one go, so it doesn't show up in a syntax error" do
     @context.evaluate("'banana;")
-    @context.printed.should.not.include "_ = ('banana;)"
+    @context.printed.should_not include("_ = ('banana;)")
   end
 end

data/spec/source_spec.rb

@@ -1,9 +1,5 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-class Should
-  alias have be
-end
-
 describe "IRB::Source" do
   before do
     @source = IRB::Source.new
@@ -51,7 +47,7 @@ describe "IRB::Source" do
       ["def foo", "p :ok", "end"],
       ["class A; def", "foo(x); p x", "end; end"]
     ].each do |buffer|
-      IRB::Source.new(buffer).should.be.code_block
+      IRB::Source.new(buffer).code_block?.should == true
     end
   end
   
@@ -60,16 +56,16 @@ describe "IRB::Source" do
       ["def foo", "p :ok"],
       ["class A; def", "foo(x); p x", "end"]
     ].each do |buffer|
-      IRB::Source.new(buffer).should.not.be.code_block
+      IRB::Source.new(buffer).code_block?.should == false
     end
   end
   
   it "returns whether or not the accumulated source contains a syntax error" do
-    @source.should.not.have.syntax_error
+    @source.syntax_error?.should == false
     @source << "def foo"
-    @source.should.not.have.syntax_error
+    @source.syntax_error?.should == false
     @source << "  def;"
-    @source.should.have.syntax_error
+    @source.syntax_error?.should == true
   end
   
   it "returns the current code block indentation level" do
@@ -102,7 +98,7 @@ describe "IRB::Source" do
     @source << "end"
     @source.level
     new_reflection = @source.reflect
-    new_reflection.should.not == reflection
+    new_reflection.should_not == reflection
     @source.code_block?
     @source.reflect.should == new_reflection
     
@@ -111,7 +107,7 @@ describe "IRB::Source" do
     @source.pop
     @source.level
     new_reflection = @source.reflect
-    new_reflection.should.not == reflection
+    new_reflection.should_not == reflection
     @source.syntax_error?
     @source.reflect.should == new_reflection
   end
@@ -123,32 +119,32 @@ describe "IRB::Source::Reflector" do
   end
   
   it "returns whether or not the source is a valid code block" do
-    reflect("def foo").should.not.be.code_block
-    reflect("def foo; p :ok").should.not.be.code_block
-    reflect("def foo; p :ok; end").should.be.code_block
+    reflect("def foo").code_block?.should == false
+    reflect("def foo; p :ok").code_block?.should == false
+    reflect("def foo; p :ok; end").code_block?.should == true
     
-    reflect("if true").should.not.be.code_block
-    reflect("p :ok if true").should.be.code_block
+    reflect("if true").code_block?.should == false
+    reflect("p :ok if true").code_block?.should == true
   end
 
   it "returns whether or not the current session should be terminated" do
-    reflect("exit").should.terminate
-    reflect("quit").should.terminate
-    reflect("def foo; end; exit").should.terminate
-    reflect("def foo; end; quit").should.terminate
+    reflect("exit").terminate?.should == true
+    reflect("quit").terminate?.should == true
+    reflect("def foo; end; exit").terminate?.should == true
+    reflect("def foo; end; quit").terminate?.should == true
 
-    reflect("def foo; exit; end").should.not.terminate
-    reflect("def foo; quit; end").should.not.terminate
+    reflect("def foo; exit; end").terminate?.should == false
+    reflect("def foo; quit; end").terminate?.should == false
   end
   
   it "returns whether or not the source contains a syntax error, except a code block not ending" do
-    reflect("def;").should.have.syntax_error
-    reflect("def;").should.have.syntax_error
-    reflect("def foo").should.not.have.syntax_error
-    reflect("class A; }").should.have.syntax_error
-    reflect("class A; {" ).should.not.have.syntax_error
-    reflect("class A def foo").should.have.syntax_error
-    reflect("class A; def foo" ).should.not.have.syntax_error
+    reflect("def;").syntax_error?.should == true
+    reflect("def;").syntax_error?.should == true
+    reflect("def foo").syntax_error?.should == false
+    reflect("class A; }").syntax_error?.should == true
+    reflect("class A; {" ).syntax_error?.should == false
+    reflect("class A def foo").syntax_error?.should == true
+    reflect("class A; def foo" ).syntax_error?.should == false
   end
   
   it "returns the actual syntax error message if one occurs" do

data/spec/spec_helper.rb

@@ -1,11 +1,75 @@
-require 'rubygems'
-require 'bacon'
-
-Bacon.summary_on_exit
+unless defined?(MSpec)
+  require 'rubygems'
+  require 'mspec'
+end
 
 ENV['SPECCING'] = 'true'
 
-ROOT = File.expand_path('../../', __FILE__)
+root = File.expand_path('../../', __FILE__)
+if File.basename(root) == 'spec'
+  # running from the MacRuby repo
+  ROOT = File.expand_path('../../../', __FILE__)
+else
+  ROOT = root
+end
 $:.unshift File.join(ROOT, 'lib')
 
 require 'irb'
+
+module InputStubMixin
+  def stub_input(*input)
+    @input = input
+  end
+  
+  def readline(prompt)
+    # print prompt
+    @input.shift
+  end
+  
+  def gets
+    @input.shift
+  end
+end
+
+class InputStub
+  include InputStubMixin
+end
+
+module OutputStubMixin
+  def printed
+    @printed ||= ''
+  end
+  
+  def write(string)
+    printed << string
+  end
+  
+  def print(string)
+    printed << string
+  end
+  
+  def puts(*args)
+    print "#{args.join("\n")}\n"
+  end
+  
+  def clear_printed!
+    @printed = ''
+  end
+end
+
+class OutputStub
+  include OutputStubMixin
+end
+
+class StubDriver
+  attr_reader :context
+  attr_writer :output
+  
+  def initialize(context = nil)
+    @context = context
+  end
+  
+  def output
+    @output || $stdout
+  end
+end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dietrb
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 7
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +02:00
+date: 2010-07-24 00:00:00 +02:00
 default_executable: dietrb
 dependencies: []
 
@@ -40,6 +34,10 @@ files:
 - lib/irb/completion.rb
 - lib/irb/context.rb
 - lib/irb/deprecated.rb
+- lib/irb/driver.rb
+- lib/irb/driver/readline.rb
+- lib/irb/driver/socket.rb
+- lib/irb/driver/tty.rb
 - lib/irb/ext/colorize.rb
 - lib/irb/ext/completion.rb
 - lib/irb/ext/history.rb
@@ -47,11 +45,14 @@ files:
 - lib/irb/formatter.rb
 - lib/irb/source.rb
 - lib/irb/version.rb
-- spec/colorize_spec.rb
-- spec/completion_spec.rb
 - spec/context_spec.rb
+- spec/driver/readline_spec.rb
+- spec/driver/tty_spec.rb
+- spec/driver_spec.rb
+- spec/ext/colorize_spec.rb
+- spec/ext/completion_spec.rb
+- spec/ext/history_spec.rb
 - spec/formatter_spec.rb
-- spec/history_spec.rb
 - spec/regression/context_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
@@ -65,37 +66,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
-      hash: 29
-      segments: 
-      - 1
-      - 9
       version: "1.9"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: IRB on a diet, for MacRuby / Ruby 1.9
 test_files: 
-- spec/colorize_spec.rb
-- spec/completion_spec.rb
 - spec/context_spec.rb
+- spec/driver/readline_spec.rb
+- spec/driver/tty_spec.rb
+- spec/driver_spec.rb
+- spec/ext/colorize_spec.rb
+- spec/ext/completion_spec.rb
+- spec/ext/history_spec.rb
 - spec/formatter_spec.rb
-- spec/history_spec.rb
 - spec/regression/context_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb