Pickaxe 0.5.3 → 0.5.4

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.5.3"
+	VERSION = "0.5.4"
 	
 	class PickaxeError < StandardError; end
   

data/lib/pickaxe/cli.rb

@@ -31,6 +31,10 @@ END_OF_BANNER
 		options[:full_test] = true
 	end
 	
+	opts.on("--repeat-incorrect", "Repeat questions answered incorrectly") do |v|
+		options[:repeat_incorrect] = true
+	end
+	
 	opts.on("--strict", "Quit on syntax error in test file") do |v|
 		options[:strict] = true
 	end
@@ -56,6 +60,10 @@ end
 
 begin
 	parser.parse!
+	if options[:full_test] and options[:repeat_incorrect]
+		$stderr.puts(("! --full-test disables the --repeat-incorrect option" ).color(:yellow))
+		options[:repeat_incorrect] = false
+	end
 	Pickaxe::Main.new(ARGV, options)
 rescue Pickaxe::PickaxeError, OptionParser::InvalidOption => e
 	$stderr.puts(("! " + e.to_s).color(:red))

data/lib/pickaxe/main.rb

@@ -25,7 +25,6 @@ END_OF_TEST
 			@logger.formatter = lambda { |s, t, p, 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
@@ -35,28 +34,30 @@ END_OF_TEST
 				return
 			end
 			
-			puts "! Hit Control-D to end test.\n\n".color(:green)	
-			info = Main.options[:full_test] ? 1 : 0
-			while @current_index < @questions.length + info do
-				@question = @questions[@current_index]
+			begin
+				puts "! Hit Control-D or Control-C to end test.\n\n".color(:green)	
+				while @current_index < @questions.length + (Main.options[:full_test] ? 1 : 0) do
+					@question = @questions[@current_index]
 				
-				unless @question.nil?
-					print "#{@current_index+1} / #{@questions.length}\t\t"
-					puts "From: #{@question.file}\t\tTime spent: #{spent?}"
+					unless @question.nil?
+						print "#{@current_index+1} / #{@questions.length}\t\t"
+						puts "From: #{@question.file}\t\tTime spent: #{spent?}"
 					
-					puts @question.answered(@answers[@question])
-				else
-					puts END_OF_TEST_MESSAGE
-				end
+						puts @question.answered(@answers[@question])
+					else
+						puts END_OF_TEST_MESSAGE
+					end
 				
-				until (line = prompt?).nil? or command(line)
-					# empty
+					until (line = prompt?).nil? or command(line)
+						# empty
+					end															
+					break if puts or line.nil?
 				end
-															
-				break if puts or line.nil?
+			rescue Interrupt
+				# empty
+			ensure						
+				statistics!
 			end
-			
-			statistics!
 		end
 		
 		#
@@ -90,7 +91,7 @@ END_OF_TEST
 				if Main.options[:full_test] and @question.nil?
 					Main.options[:full_test] = false
 					Main.options[:force_show_answers] = true
-					
+					@questions_length ||= @questions.length.to_f
 					@questions = @test.selected.select { |q| not q.correct?(@answers[q]) }
 					@current_index = 0
 				else				
@@ -113,27 +114,41 @@ END_OF_HELP
 				@answers[@question] = line.gsub(/\s+/, "").each_char.collect.to_a.uniq
 				unless Main.options[:full_test]
 					puts @question.check?(@answers[@question])
-				end
-				@current_index += 1
+					if Main.options[:repeat_incorrect] and not @question.correct?(@answers[@question])
+						@answers.delete(@question)
+						@questions.insert(@current_index + 1 + rand(@questions.length - @current_index), @question)
+						@questions.delete_at(@current_index)						
+					else
+						@current_index += 1
+					end
+				else
+					@current_index += 1
+				end				
 				true
 			end
 		end
 		
 		def statistics!
-			@stats = @test.statistics!(@answers)
+			@questions_length ||= @questions.length.to_f
 						
-			@answers.each do |question, answers|
-				@logger << "!" unless question.correct?(answers)
-				@logger << ("#{question.index}: #{answers.join(" ")}\n")
-			end
-			@logger << "\n"
-				
 			puts			
 			puts "Time: #{spent?}"
-			puts "All: #{@questions.length}"
-			stat :correct, :green
-			stat :unanswered, :yellow
-			stat :incorrect, :red
+			unless Main.options[:repeat_incorrect]
+				@stats = @test.statistics!(@answers)
+
+				
+				puts "All: #{@questions.length}"
+				stat :correct, :green
+				stat :unanswered, :yellow
+				stat :incorrect, :red
+				
+				@questions_length ||= @questions.length.to_f
+				@answers.each do |question, answers|
+					@logger << "!" unless question.correct?(answers)
+					@logger << ("#{question.index}: #{answers.join(" ")}\n")
+				end
+				@logger << "\n"
+			end				
 		end
 		
 		def error(msg)

data/lib/pickaxe/test.rb

@@ -15,7 +15,7 @@ module Pickaxe
 		include Enumerable
 		
 		# Ruby-comments and C-comments
-		COMMENTS_RE = /^\s*#.*|^\/\/.*/
+		COMMENTS_RE = /^\s*#.*|^\/\/.*|;.*/
 		
 		def initialize(*files)
 			@files = files.collect do |file_or_directory|
@@ -100,7 +100,7 @@ module Pickaxe
 	class Question < Struct.new(:file, :index, :content, :answers)
 		include Pickaxe::Errors
 		
-		RE = /^\s*(\d+)\.?\s*(.+)$/u
+		RE = /^\s*(\d+)\.?\s*(.+)$/u	
 		
 		def self.parse(file, answers)
 			content = []
@@ -180,7 +180,10 @@ module Pickaxe
 			if correct?(given)
 				"Correct!".color(:green)
 			else
-				"Incorrect! Correct was: #{correct_answers.join(", ")}".color(:red)
+				hit = "OK [#{(given & correct_answers).join}]".color(:green)
+				missed = "Missed [#{(correct_answers - given).join}]".color(:yellow)				
+				incorrect = "Failed [#{(given - correct_answers).join}]".color(:red)				
+				"Incorrect, should be: #{correct_answers.join}! #{hit} #{missed} #{incorrect}" 
 			end
 		end
 	end

metadata

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