faultinjection 0.0.2 → 0.0.3

data/Manifest.txt

@@ -1,8 +1,3 @@
-#*scratch*#18552Tu2#
-#*scratch*#20064OwE#
-#*scratch*#20109z1E#
-#*scratch*#20389vPF#
-#*scratch*#20789Z7F#
 History.txt
 License.txt
 Manifest.txt

data/lib/fault_injection/parser.rb

@@ -5,20 +5,45 @@
 module FaultInjection
   class Parser
 	def self.compile src
-	  method_pat = '([A-Z][A-Za-z0-9_]*)(?:#|::)([a-z_][a-zA-Z0-9_]*)'
+	  method_pat = /
+        ([A-Z][A-Za-z0-9_]*)  # class name
+        (?: \#|::   )         # '#' or '::', they are treated as same now.
+        ([a-z_][a-zA-Z0-9_]*) # method name
+      /x
+	  method_lineno_pat = /
+        ([A-Z][A-Za-z0-9_]*)  # class name
+        (?: \#|::   )         # '#' or '::', they are treated as same.
+        ([a-z_][a-zA-Z0-9_]*) # method name
+        (?: :(\d+)  )         # line number in method
+      /x
+	  
+	  file_line_pat = /^([A-Za-z0-9_.~-]+):(\d+)$/
 	  src.gsub!(/\s/,'')
 	  
-	  if src =~ /([A-Za-z0-9_.~-]+):(\d+)/
-		return FaultConditionLine.new($1,$2.to_i)
-
+	  if src =~ file_line_pat
+		return FaultConditionLine.new($~[1],$~[2].to_i)
+		
+	  elsif src =~ method_lineno_pat
+		#STDERR.puts("Class=#{$~[1]},method='#{$~[2]}',line='#{$~[3]}'")
+		klass = eval($~[1]) rescue raise(NameError,"No such class:'#{$~[1]}'")
+		method = $~[2]
+		line_in_meth = $~[3].to_i
+		  
+		# Proc#to_s contains file name & line number in which
+		# the method is defined.
+		method_info = klass.new.method(method).to_proc.to_s
+		method_info =~ /@([^:]+):(\d+)>$/
+		#STDERR.puts("file=#{$~[1]},line=#{$~[2]}")
+		return FaultConditionLine.new($~[1], $~[2].to_i + line_in_meth)
+		
 	  else
 		methods = src.split(">")
 		methods.map! do |e|
-		  unless e =~ Regexp.new(method_pat)
+		  unless e =~ method_pat
 			raise ArgumentError,"Invalid method name:'#{e}'"
 		  end
-
-		  [$1.to_sym,$2.to_sym]
+		  		  
+		  [$~[1].to_sym, $~[2].to_sym]
 		end
 
 		c = FaultConditionCall.new

data/lib/fault_injection/version.rb

@@ -2,7 +2,7 @@ module FaultInjection #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/fault_injection_spec.rb

@@ -76,6 +76,20 @@ describe "Method tracing fault-injection" do
   end
 end
 
+describe "'Line number in method' style fault injection" do
+  require 'target_03.rb'
+
+  it "should inject faults properly with Class#method:line format." do
+	Proc.new { T3.new.foo }.should_not raise_error
+	
+	pending "not yet implemented" do
+	  FaultInjection.inject("T3#foo:2",IOError)
+	  
+	  Proc.new { T3.new.foo }.should raise_error(IOError)
+	end
+  end
+end
+
 describe "Specifying Exception class" do
   require 'target_01.rb'
   

data/website/index.html

@@ -16,7 +16,7 @@
 
     <h1>fault_injection.rb</h1>
     <div style="text-align:right;">
-      Last version: <a href="http://rubyforge.org/projects/fault_injection" class="numbers">0.0.2</a>
+      Last version: <a href="http://rubyforge.org/projects/fault_injection" class="numbers">0.0.3</a>
     </div>
     <h2>Overview</h2>
 
@@ -128,7 +128,7 @@ it makes a script much slower.</p>
 
 	<p>(Please remove &#8221;.spam&#8221; from the address for anti-spam, and include &#8216;ruby&#8217; or &#8216;fault_injection&#8217; in the title)</p>
     <p class="coda">
-      <a herf="http://keisukefukuda.rubyforge.org">Keisuke Fukuda</a>, 12th January 2008<br>
+      <a herf="http://keisukefukuda.rubyforge.org">Keisuke Fukuda</a>, 13th January 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faultinjection
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ""
 authors: 
 - FIXME full name
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-12 00:00:00 +09:00
+date: 2008-03-12 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +26,6 @@ extra_rdoc_files:
 - README.txt
 - website/index.txt
 files: 
-- "#*scratch*#18552Tu2#"
-- "#*scratch*#20064OwE#"
-- "#*scratch*#20109z1E#"
-- "#*scratch*#20389vPF#"
-- "#*scratch*#20789Z7F#"
 - History.txt
 - License.txt
 - Manifest.txt