mips_tester 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mips_tester (0.1.0)
+    mips_tester (0.1.1)
 
 GEM
   remote: http://rubygems.org/

data/lib/mips_tester.rb

@@ -3,7 +3,7 @@ require 'tempfile' unless defined? Tempfile
 # Main MIPSTester module
 module MIPSTester
   # Library version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   
   # MIPSFileError Exception, raised when test file is not valid or non-existent
   class MIPSFileError < Exception; end
@@ -64,7 +64,8 @@ module MIPSTester
       instance_eval(&block)
     
       asm = Tempfile.new "temp.asm"
-      asm.write(prep_params + File.read(file))
+      asm.write prep_params if block
+      asm.write File.read(file)
       asm.close
     
       cli = `#{["java -jar",
@@ -81,8 +82,7 @@ module MIPSTester
         
         return compare_hashes(@exp, results)
       rescue Exception => ex
-        puts ex.message
-        return false
+        raise MIPSFileError.new ex.message.gsub(asm.path, File.basename(file)).split("\n")[0..1].join("\n")
       ensure
         asm.unlink
       end

data/spec/fixtures/invalid_syntax.asm

@@ -0,0 +1 @@
+add		t0, t1, t2

data/spec/mips_spec.rb

@@ -14,18 +14,25 @@ describe MIPS do
     end
     
     it 'should raise exception if not valid file path is given' do
-      mips = MIPS.new :mars_path => "/Applications/MARS_4_1.jar"
       expect do
-        mips.test fixture_path("non-existing.asm") {}
+        mips.test fixture_path("non-existing.asm")
       end.to raise_error(::MIPSFileError)
     end
     
     it 'should raise exception if no block is given on test method' do
-      mips = MIPS.new :mars_path => "/Applications/MARS_4_1.jar"
       expect do
         mips.test fixture_path("empty.asm")
       end.to raise_error(::MIPSInvalidBlockError)
     end
+    
+    it 'should raise exception if file given isn\'t parsable by MARS' do
+      expect do
+        mips.test fixture_path("invalid_syntax.asm") do
+          set t1: 0, t2: 3
+          expect t1: 0, t2: 3
+        end
+      end.to raise_error(::MIPSFileError)
+    end
   end
   
   

metadata

@@ -2,7 +2,7 @@
 name: mips_tester
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Federico Ravasio
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 Z
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -43,6 +43,7 @@ files:
 - mips_tester.gemspec
 - spec/fixtures/add.asm
 - spec/fixtures/empty.asm
+- spec/fixtures/invalid_syntax.asm
 - spec/mips_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/razielgn/mips_tester
@@ -75,6 +76,7 @@ summary: Class to test MIPS asm files
 test_files: 
 - spec/fixtures/add.asm
 - spec/fixtures/empty.asm
+- spec/fixtures/invalid_syntax.asm
 - spec/mips_spec.rb
 - spec/spec_helper.rb
 has_rdoc: