Pickaxe 0.6.2 → 0.6.3

data/lib/pickaxe.rb

@@ -18,7 +18,7 @@ end
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 module Pickaxe
-	VERSION = "0.6.2"
+	VERSION = "0.6.3"
 	
 	class PickaxeError < StandardError; end
   

data/lib/pickaxe/cli.rb

@@ -1,6 +1,5 @@
 require 'optparse'
 
-options = { :extension => "txt" }
 parser = OptionParser.new do |opts|
   opts.banner = <<END_OF_BANNER
 Usage: 
@@ -12,43 +11,43 @@ END_OF_BANNER
   opts.separator ""
   opts.on("-e", "--ext [EXTENSION]", "Use files with given EXTENSION " +
   	"(default 'txt')") do |extension|
-    options[:extension] = extension
+    Pickaxe::Main.options[:extension] = extension
   end
   
 	opts.on("-s", "--sorted", "Do not shuffle questions") do |v|
-		options[:sorted] = true
+		Pickaxe::Main.options[:sorted] = true
 	end
 	
 	opts.on("--sorted-answers", "Do not shuffle answers") do |v|
-		options[:sorted_answers] = true
+		Pickaxe::Main.options[:sorted_answers] = true
 	end	
 	
 	opts.on("--select [NUMBER]", "Select certain number of questions") do |v|
-		options[:select] = Integer(v)
+		Pickaxe::Main.options[:select] = Integer(v)
 	end
 	  
 	opts.on("--full-test", "Checks test after all questions are answered") do |v|
-		options[:full_test] = true
+		Pickaxe::Main.options[:full_test] = true
 	end
 	
 	opts.on("--repeat-incorrect", "Repeat questions answered incorrectly") do |v|
-		options[:repeat_incorrect] = true
+		Pickaxe::Main.options[:repeat_incorrect] = true
 	end
 	
 	opts.on("--strict", "Quit on syntax error in test file") do |v|
-		options[:strict] = true
+		Pickaxe::Main.options[:strict] = true
 	end
 	
 	opts.on_tail("--syntax-check", "Check syntax only - do not run test") do
-    options[:syntax_check] = true
+    Pickaxe::Main.options[:syntax_check] = true
   end
   
 	opts.on("--clear", "Turn on shell clearing before question") do |v|
-		options[:clear] = true
+		Pickaxe::Main.options[:clear] = true
 	end	
 	
 	opts.on("--no-color", "Turn off colors") do |v|
-		options[:no_colors] = true
+		Pickaxe::Main.options[:no_colors] = true
 	end	
   
   opts.on_tail("--version", "Show version") do
@@ -65,8 +64,6 @@ end
 begin
 	parser.parse!
 	
-	Pickaxe::Main.options = options
-			
 	if Pickaxe::WINDOWS_IT_IS
 		$stderr.puts <<END_OF_MESSAGE
 ! Hi there Windows user.
@@ -81,11 +78,11 @@ END_OF_MESSAGE
 		
 	end
 	
-	if options[:full_test] and options[:repeat_incorrect]
+	if Pickaxe::Main.options[:full_test] and Pickaxe::Main.options[:repeat_incorrect]
 		$stderr.puts(("! --full-test disables the --repeat-incorrect option" ).color(:yellow))
-		options[:repeat_incorrect] = false
+		Pickaxe::Main.options[:repeat_incorrect] = false
 	end
-	Pickaxe::Main.new(ARGV, options)
+	Pickaxe::Main.new(ARGV)
 rescue Pickaxe::PickaxeError, OptionParser::InvalidOption => e
 	$stderr.puts(("! " + e.to_s).color(:red))
 end

data/lib/pickaxe/main.rb

@@ -4,6 +4,7 @@ module Pickaxe
 		class TabTermination < PickaxeError; end
 		
 		cattr_accessor :options
+		self.options = { :extension => "txt" }
 		
 		END_OF_TEST_MESSAGE = <<END_OF_TEST
 This is the end of this test and You can now jump back to
@@ -14,11 +15,11 @@ 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 = {})
+		def initialize(paths)
 			raise NoTests, "no tests to run" if paths.empty?
 			
 			@test = Test.new(*paths)
-			return if options[:syntax_check]
+			return if Main.options[:syntax_check]
 						
 			@logger = Logger.new(File.open('answers.log', 
 				File::WRONLY|File::APPEND|File::CREAT))
@@ -86,7 +87,7 @@ END_OF_TEST
 		def command(line)
 			@last_answer = nil
 			
-			case line
+			case line.strip
 			when /^\s*@\s*(.+)/	then # @ question
 				@current_index = Integer($1) -1
 				true
@@ -106,7 +107,7 @@ END_OF_TEST
 				else
 					error "You are at last question"
 				end
-			when "\n" then
+			when "" then
 				if Main.options[:full_test] and @question.nil?
 					Main.options[:full_test] = false
 					Main.options[:force_show_answers] = true

data/lib/pickaxe/test.rb

@@ -63,19 +63,19 @@ module Pickaxe
 			end
 		end
 		
-		def each(&block)
-			shuffled_questions.each(&block)
+		def each(options = Main.options, &block)
+			shuffled_questions(options).each(&block)
 		end
 		
-		def shuffled_questions
-			questions = if Main.options[:sorted]
+		def shuffled_questions(options = Main.options)
+			questions = if options[:sorted]
 				@questions
 			else
 				@questions.shuffle			
 			end
 			
-			@selected = if Main.options[:select]
-				questions[0...(Main.options[:select])]
+			@selected = if options[:select]
+				questions[0...(options[:select])]
 			else
 				questions
 			end			

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Pickaxe
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Dawid Fatyga