Pickaxe 0.6.0 → 0.6.1

data/lib/pickaxe.rb

@@ -3,11 +3,22 @@ require "bundler/setup"
 require "active_support/all"
 require "rbconfig"
 require "unidecoder"
+begin
+	require 'readline'
+rescue LoadError
+	class Readline
+		def self.completion_proc=(value); end
+		def self.readline(prompt)
+			print prompt
+			$stdin.gets
+		end
+	end
+end
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 module Pickaxe
-	VERSION = "0.6.0"
+	VERSION = "0.6.1"
 	
 	class PickaxeError < StandardError; end
   

data/lib/pickaxe/cli.rb

@@ -43,6 +43,10 @@ END_OF_BANNER
     options[:syntax_check] = true
   end
   
+	opts.on("--no-clear", "Turn off shell clearing") do |v|
+		options[:no_clear] = true
+	end	
+	
 	opts.on("--no-color", "Turn off colors") do |v|
 		options[:no_colors] = true
 	end	
@@ -68,8 +72,11 @@ begin
 ! Hi there Windows user.
 
   You will not be able to see colors, all diacritics
-  will be transliterated and dynamic console width
-  is not available. Sorry for the inconvenience.
+  will be transliterated, dynamic console width
+  is not available, You cannot answer using the [TAB]
+  and the console will not be cleared on new question.
+  
+  Sorry for the inconvenience.
 END_OF_MESSAGE
 		
 	end

data/lib/pickaxe/main.rb

@@ -1,6 +1,7 @@
 module Pickaxe
 	class Main
 		class NoTests < PickaxeError; end
+		class TabTermination < PickaxeError; end
 		
 		cattr_accessor :options
 		
@@ -40,18 +41,26 @@ END_OF_TEST
 					puts "! Hit Control-D or Control-C to end test.\n\n".color(:green)	
 				end
 				
+				Readline.completion_proc = Proc.new do |line|
+					@line = line
+					raise TabTermination
+				end
+
 				while @current_index < @questions.length + (Main.options[:full_test] ? 1 : 0) do
 					@question = @questions[@current_index]
 				
 					unless @question.nil?
+						Shell.clear
+						
+						puts "#{@last_answer}\n\n"
 						print "#{@current_index+1} / #{@questions.length}\t\t"
-						puts "From: #{@question.file}\t\tTime spent: #{spent?}"
+						puts "From: #{@question.file}\t\tTime spent: #{spent?}\n\n"
 					
 						puts @question.answered(@answers[@question])
 					else
 						puts END_OF_TEST_MESSAGE
 					end
-				
+					
 					until (line = prompt?).nil? or command(line)
 						# empty
 					end															
@@ -70,13 +79,18 @@ END_OF_TEST
 		# 	<+						moves back one question
 		# 	>+						moves forward one question
 		# 	a [ b ...]    answers the question
+		#   .             shows current question again
 		#   ?							shows help
 		#
 		def command(line)
+			@last_answer = nil
+			
 			case line
 			when /^\s*@\s*(.+)/	then # @ question
 				@current_index = Integer($1) -1
 				true
+			when /\./ then
+				true
 			when /<+/ then
 				if @current_index > 0
 					@current_index -= 1 
@@ -110,18 +124,25 @@ Available commands (whitespace does not matter):
   <            moves back one question
   >            moves forward one question
   a [ b ...]   answers the question
+  .            shows current question again
   ?            shows help
   
 END_OF_HELP
 				false
 			else
-				@answers[@question] = line.gsub(/\s+/, "").each_char.collect.to_a.uniq
+				@answers[@question] = convert_answers(line)
 				unless Main.options[:full_test]
-					puts @question.check?(@answers[@question])
+					@last_answer = @question.check?(@answers[@question])
+					
+					if @current_index == (@questions.length-1)
+						puts @last_answer
+					end
+					
 					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)						
+						@questions.delete_at(@current_index)
+						@question.reset!
 					else
 						@current_index += 1
 					end
@@ -132,6 +153,17 @@ END_OF_HELP
 			end
 		end
 		
+		ANSWER_CONVERTION_HASH = ('a'..'z').to_a[0,10].each_with_index.inject({}) do |m, p| 
+			m[((p.last + 1) % 10).to_s] =  p.first
+			m
+		end
+		
+		def convert_answers(line)			
+			line.gsub(/\s+/, "").downcase.each_char.collect do |c|
+				ANSWER_CONVERTION_HASH[c] || c
+			end.to_a.uniq
+		end
+		
 		def statistics!
 			@questions_length ||= @questions.length.to_f
 						
@@ -161,8 +193,16 @@ END_OF_HELP
 		end
 		
 		def prompt?(p = "? ")
-			print p
-			$stdin.gets
+			unless Pickaxe::WINDOWS_IT_IS
+			begin
+				Readline.readline(p)
+			rescue TabTermination
+				puts
+				@line + "\n"
+			end else
+				print p
+				$stdin.gets
+			end
 		end
 		
 		def spent?

data/lib/pickaxe/shell.rb

@@ -11,6 +11,13 @@ module Pickaxe
 				(dynamic_width_stty.nonzero? || dynamic_width_tput)
 			end
 		end
+		
+		def self.clear
+			unless Pickaxe::WINDOWS_IT_IS or Main.options[:no_clear]
+				print "\e[H\e[2J"
+			end
+		end
+		
 	private
 		def self.dynamic_width_stty
 		  %x{stty size 2>/dev/null}.split[1].to_i

data/lib/pickaxe/test.rb

@@ -134,6 +134,10 @@ module Pickaxe
 			end
 		end
 		
+		def reset!
+			@shuffled_answers = nil
+		end
+		
 		def shuffled_answers
 			if @shuffled_answers.nil?
 				unless Main.options[:sorted_answers]
@@ -184,10 +188,19 @@ module Pickaxe
 			if correct?(given)
 				"Correct!".color(:green)
 			else
-				hit = "#{(given & correct_answers).join}".color(:green)
-				missed = "#{(correct_answers - given).join}".color(:yellow)				
-				incorrect = "#{(given - correct_answers).join}".color(:red)				
-				"Incorrect, should be: #{correct_answers.join}! #{hit} #{missed} #{incorrect}" 
+				missed = (correct_answers - given)
+				missed =  unless missed.empty?
+					"Missed: #{missed.join}".color(:yellow)
+				else
+					""
+				end
+				incorrect = (given - correct_answers)
+				incorrect = unless incorrect.empty?
+					"Wrong: #{incorrect.join}".color(:red)
+				else
+					""
+				end
+				"Incorrect, should be:".color(:red) + " #{correct_answers.join}! #{[missed, incorrect].join(" ")}" 
 			end
 		end
 	end

metadata

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