Pickaxe 0.2.1 → 0.3.1

data/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.1)
+    i18n (0.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  i18n

data/bin/pickaxe

@@ -33,15 +33,11 @@ END_OF_BANNER
 	opts.on("--select [NUMBER]", "Select certain number of questions") do |v|
 		options[:select] = Integer(v)
 	end
-	
-	opts.on("-b", "--builtin", "Runs builtin tests") do |v|
-		options[:builtin] = true
+	  
+	opts.on("--full-test", "Checks test after all questions are answered") do |v|
+		options[:full_test] = true
 	end
 	
-	opts.on("--list-builtin", "Lists builtin test names") do |v|
-		options[:list_builtin] = true
-	end
-  
   opts.on_tail("--version", "Show version") do
     puts "pickaxe version #{Pickaxe::VERSION}"
     exit
@@ -53,21 +49,8 @@ END_OF_BANNER
 	end
 end.parse!
 
-if options[:list_builtin]
-	puts(Dir.glob(File.dirname(__FILE__) + "/../tests/*.#{options[:extension] || "txt"}").collect do |file|
-		File.basename(file)
-	end.join(" "))
-	exit
-end
-
-paths = if options[:builtin]
-	File.expand_path(File.dirname(__FILE__) + "/../tests")
-else
-	ARGV
-end
-	
 begin
-	Pickaxe::Main.new(paths, options)
+	Pickaxe::Main.new(ARGV, options)
 rescue Pickaxe::PickaxeError => e
 	$stderr.puts(("! " + e.message).color(:red))
 	exit(e.status_code)

data/lib/pickaxe.rb

@@ -1,12 +1,11 @@
 require "rubygems"
-require "bundler"
+require "bundler/setup"
+Bundler.require(:default)
 
-Bundler.setup(:default)
-
-require 'active_support/all'
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 module Pickaxe
-	VERSION = "0.2.1"
+	VERSION = "0.3.1"
 	
 	class PickaxeError < StandardError
 		attr_reader :status_code

data/lib/pickaxe/main.rb

@@ -2,24 +2,40 @@ module Pickaxe
 	class Main
 		class NoTests < PickaxeError; status_code(1) ; end
 		
+		cattr_accessor :options
+		
+		END_OF_TEST_MESSAGE = <<END_OF_TEST
+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.
+END_OF_TEST
+
 		def initialize(paths, options = {})
 			raise NoTests, "no tests to run" if paths.empty?
-			@test = Test.new(options, *paths)
-			@questions = @test.shuffled_questions
-			@answers = Hash.new([])
 			
+			Main.options = options
+			
+			@test = Test.new(*paths)
+			@questions = @test.shuffled_questions
+			@answers = Hash.new([])					
 			@started_at = Time.now			
 			@current_index = 0
-			while @current_index < @questions.length do
+			
+			while @current_index < @questions.length + (Main.options[:full_test] ? 1 : 0) do
 				@question = @questions[@current_index]
 				
-				puts "#{@current_index+1} / #{@questions.length}\t\tFrom: #{@question.file}\t\tTime spent: #{spent?}"
-				puts @question.answered(@answers[@question])
+				unless @question.nil?
+					puts "#{@current_index+1} / #{@questions.length}\t\tFrom: #{@question.file}\t\tTime spent: #{spent?}"
+					puts @question.answered(@answers[@question])
+				else
+					puts END_OF_TEST_MESSAGE
+				end
 				
 				until (line = prompt?).nil? or command(line)
 					# empty
 				end
-											
+															
 				break if puts or line.nil?
 			end
 			
@@ -28,10 +44,9 @@ module Pickaxe
 		
 		#
 		# Available commands
-		# 	^ question 		jumps to given question
+		# 	@ question 		jumps to given question
 		# 	<+						moves back one question
 		# 	>+						moves forward one question
-		# 	! a [ b ...]  answers the question and forces to show correct answers
 		# 	a [ b ...]    answers the question
 		#   ?							shows help
 		#
@@ -55,10 +70,15 @@ module Pickaxe
 					error "You are at last question"
 				end
 			when "\n" then
-				@current_index += 1
+				if Main.options[:full_test] and @question.nil?
+					Main.options[:full_test] = false
+					Main.options[:force_show_answers] = true
+					
+					@current_index = 0
+				else				
+					@current_index += 1
+				end
 				true
-			when /^\s*!\s*(.+)/ then
-				raise NotImplementedError
 			when /\?/ then
 				puts <<END_OF_HELP
 				
@@ -66,14 +86,14 @@ Available commands (whitespace does not matter):
   @ question   jumps to given question
   <            moves back one question
   >            moves forward one question
-    a [ b ...] answers the question  
-  ! a [ b ...] answers the question and forces reveal correct answers
+  a [ b ...]   answers the question
   ?            shows help
   
 END_OF_HELP
 				false
 			else
 				@answers[@question] = line.split(/\s+/).collect(&:strip)
+				puts @question.check?(@answers[@question]) unless Main.options[:full_test]
 				@current_index += 1
 				true
 			end

data/lib/pickaxe/test.rb

@@ -1,4 +1,9 @@
 module Pickaxe
+
+	class PathError < PickaxeError; status_code(1) ; end
+	class MissingAnswers < PickaxeError; status_code(2) ; end
+	class BadAnswer < PickaxeError; status_code(3) ; end
+		
 	#
 	# Test is a file in which questions are separated by a blank line.
 	# Each question has content (first line), and answers remaining lines.
@@ -20,18 +25,13 @@ module Pickaxe
 		# Ruby-comments and C-comments
 		COMMENTS_RE = /^#.*|^\/\/.*/
 		
-		class PathError < PickaxeError; status_code(1) ; end
-		class MissingAnswers < PickaxeError; status_code(2) ; end
-		class BadAnswer < PickaxeError; status_code(3) ; end
-		
-		def initialize(options, *files)
-			@options = options
+		def initialize(*files)
 			@files = files.collect do |file_or_directory|
 				raise PathError, "file or directory '#{file_or_directory}' does not exist" unless File.exist?(file_or_directory)
 				if File.file?(file_or_directory)
 					file_or_directory
 				else
-					Dir.glob("#{file_or_directory}/*.#{@options[:extension] || "txt"}")
+					Dir.glob("#{file_or_directory}/*.#{Main.options[:extension] || "txt"}")
 				end				
 			end.flatten
 			
@@ -53,14 +53,14 @@ module Pickaxe
 		end
 		
 		def shuffled_questions
-			questions = if @options[:sorted]
+			questions = if Main.options[:sorted]
 				@questions
 			else
 				@questions.shuffle			
 			end
 			
-			@selected = if @options[:select]
-				questions[0...(@options[:select])]
+			@selected = if Main.options[:select]
+				questions[0...(Main.options[:select])]
 			else
 				questions
 			end			
@@ -97,7 +97,8 @@ module Pickaxe
 			"#{self.content.word_wrap}\n\n" + self.answers.collect do |answer|
 				selected = indices.include?(answer.index)
 				line = (selected ? ">> " : "   ") + answer.to_s
-				unless indices.blank?
+				
+				if Main.options[:force_show_answers] or (not indices.blank? and not Main.options[:full_test]) then
 					if selected and answer.correctness
 						line.color(:green)
 					elsif not selected and answer.correctness
@@ -110,7 +111,19 @@ module Pickaxe
 		end
 		
 		def correct?(given)
-			given.sort == answers.select(&:correctness).collect(&:index).sort
+			given.sort == correct_answers
+		end
+		
+		def correct_answers
+			answers.select(&:correctness).collect(&:index).sort
+		end
+		
+		def check?(given)
+			if correct?(given)
+				"Correct!".color(:green)
+			else
+				"Incorrect! Correct was: #{correct_answers.join(", ")}".color(:red)
+			end
 		end
 	end
 	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Pickaxe
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 1
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dawid Fatyga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +01:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 - Gemfile
+- Gemfile.lock
 files: 
 - lib/pickaxe.rb
 - lib/pickaxe/test.rb
@@ -84,6 +85,7 @@ files:
 - bin/pickaxe
 - README.markdown
 - Gemfile
+- Gemfile.lock
 has_rdoc: true
 homepage: https://github.com/dejw/pickaxe
 licenses: []