Pickaxe 0.4.2 → 0.4.3

data/lib/pickaxe.rb

@@ -5,7 +5,7 @@ require "active_support/all"
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 module Pickaxe
-	VERSION = "0.4.2"
+	VERSION = "0.4.3"
 	
 	class PickaxeError < StandardError
 		attr_reader :status_code

data/lib/pickaxe/main.rb

@@ -8,7 +8,9 @@ module Pickaxe
 This is the end of this test and You can now jump back to
 any question and check (or change) Your answers.
 
-Hit [ENTER] to rate the test.
+If You do not know how to jump back type `?' and press [ENTER].
+
+Hit [ENTER] to rate the test and see Your incorrect answers.
 END_OF_TEST
 
 		def initialize(paths, options = {})
@@ -24,6 +26,7 @@ END_OF_TEST
 			@logger.formatter = lambda { |severity, time, progname, msg| msg.to_s + "\n" }
 			
 			@questions = @test.shuffled_questions
+			@questions_length = @questions.length.to_f
 			@answers = Hash.new([])					
 			@started_at = Time.now			
 			@current_index = 0
@@ -79,7 +82,8 @@ END_OF_TEST
 				if Main.options[:full_test] and @question.nil?
 					Main.options[:full_test] = false
 					Main.options[:force_show_answers] = true
-								
+					
+					@questions = @test.selected.select { |q| not q.correct?(@answers[q]) }
 					@current_index = 0
 				else				
 					@current_index += 1
@@ -136,7 +140,7 @@ END_OF_HELP
 	protected
 		def stat(name, color)
 			value = @stats[name.to_s.downcase.to_sym]
-			puts format("#{name.to_s.capitalize}: #{value} (%g%%)", value/@questions.length.to_f * 100).color(color)
+			puts format("#{name.to_s.capitalize}: #{value} (%g%%)", value/@questions_length * 100).color(color)
 		end
 	end
 end

data/lib/pickaxe/test.rb

@@ -175,12 +175,12 @@ module Pickaxe
 	end
 	
 	class Answer < Struct.new(:content, :index, :correctness)
-		RE = /^\s*(>>)?\s*(\?\?)?\s*\((\w+)\)\s*(.+)$/
+		RE = /^\s*(>+)?\s*(\?\?)?\s*\(?(\w+)\)\s*(.+)$/
 		LINE_RE = /^\s*(\w+)/
 		
 		def self.parse(file, lines)
 			m = RE.match(lines.shift)
-			Answer.new(m[m.size-1].strip + " " + lines.collect(&:strip).join(" "), m[m.size-2].strip, m[1] == ">>")
+			Answer.new(m[4].strip + " " + lines.collect(&:strip).join(" "), m[3].strip, !m[1].nil?)
 		end
 		
 		def to_s

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Pickaxe
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Dawid Fatyga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: bin/pickaxe
 dependencies: 
 - !ruby/object:Gem::Dependency