Pickaxe 0.4.4 → 0.5.1

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.4"
+	VERSION = "0.5.1"
 	
 	class PickaxeError < StandardError
 		attr_reader :status_code

data/lib/pickaxe/cli.rb

@@ -1,6 +1,6 @@
 require 'optparse'
 
-options = {}
+options = { :extension => "txt" }
 OptionParser.new do |opts|
   opts.banner = <<END_OF_BANNER
 Usage: 
@@ -10,7 +10,8 @@ Uses given paths (files or directories) to generate a test from *.txt files.
 END_OF_BANNER
   
   opts.separator ""
-  opts.on("-e", "--ext [EXTENSION]", "Use files with given EXTENSION (default 'txt')") do |extension|
+  opts.on("-e", "--ext [EXTENSION]", "Use files with given EXTENSION " +
+  	"(default 'txt')") do |extension|
     options[:extension] = extension
   end
   

data/lib/pickaxe/color.rb

@@ -1,5 +1,6 @@
 module Pickaxe 
-  # Extracted from https://github.com/wycats/thor/blob/master/lib/thor/shell/color.rb
+  # Extracted from 
+  # https://github.com/wycats/thor/blob/master/lib/thor/shell/color.rb
 	module Color
 		# Embed in a String to clear all previous ANSI sequences.
 		CLEAR = "\e[0m"

data/lib/pickaxe/extensions.rb

@@ -7,7 +7,11 @@ class String
 		options.reverse_merge!(:line_width => Pickaxe::Shell.dynamic_width || 80)
 
 		self.split("\n").collect do |line|
-			line.length > options[:line_width] ? line.gsub(/(.{1,#{options[:line_width]}})(\s+|$)/, "\\1\n").strip : line
+			if line.length > options[:line_width]
+			 line.gsub(/(.{1,#{options[:line_width]}})(\s+|$)/, "\\1\n").strip
+			else
+				line
+			end
 		end * "\n"
 	end
 	

data/lib/pickaxe/main.rb

@@ -22,8 +22,9 @@ END_OF_TEST
 			
 			puts "! Hit Control-D to end test.\n\n"
 			
-			@logger = Logger.new(File.open('answers.log', File::WRONLY|File::TRUNC|File::CREAT))
-			@logger.formatter = lambda { |severity, time, progname, msg| msg.to_s + "\n" }
+			@logger = Logger.new(File.open('answers.log', 
+				File::WRONLY|File::TRUNC|File::CREAT))
+			@logger.formatter = lambda { |s, t, p, msg| msg.to_s + "\n" }
 			
 			@questions = @test.shuffled_questions
 			@questions_length = @questions.length.to_f
@@ -31,11 +32,14 @@ END_OF_TEST
 			@started_at = Time.now			
 			@current_index = 0
 			
-			while @current_index < @questions.length + (Main.options[:full_test] ? 1 : 0) do
+			info = Main.options[:full_test] ? 1 : 0
+			while @current_index < @questions.length + info do
 				@question = @questions[@current_index]
 				
 				unless @question.nil?
-					puts "#{@current_index+1} / #{@questions.length}\t\tFrom: #{@question.file}\t\tTime spent: #{spent?}"
+					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
@@ -102,8 +106,10 @@ Available commands (whitespace does not matter):
 END_OF_HELP
 				false
 			else
-				@answers[@question] = line.strip.split(/\s+/).collect(&:strip)				
-				puts @question.check?(@answers[@question]) unless Main.options[:full_test]
+				@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
 				true
 			end
@@ -140,7 +146,8 @@ 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 * 100).color(color)
+			puts format("#{name.to_s.capitalize}: #{value} (%g%%)", 
+				value/@questions_length * 100).color(color)
 		end
 	end
 end

data/lib/pickaxe/shell.rb

@@ -1,6 +1,7 @@
 module Pickaxe
 	module Shell
-		# Extracted from https://github.com/wycats/thor/blob/master/lib/thor/shell/basic.rb
+		# Extracted from 
+		# https://github.com/wycats/thor/blob/master/lib/thor/shell/basic.rb
 		def self.dynamic_width
 		  (dynamic_width_stty.nonzero? || dynamic_width_tput)
 		end

data/lib/pickaxe/test.rb

@@ -1,12 +1,54 @@
 module Pickaxe
 
-	class PathError < PickaxeError; status_code(1) ; end
+	class PathError < PickaxeError
+		def initialize(file_or_directory)
+			super("file or directory '#{file_or_directory}' does not exist")
+		end
+	end
+	
+	class TestSyntaxError < PickaxeError
+		def initialize(file, line, message)
+			super("#{file}: line #{line}: #{message}")
+		end
+	end
+	
+	class MissingContent < TestSyntaxError
+		def initialize(file, line)
+			super(file, line, "no content (check blank lines nearby)")
+		end	
+	end
+	
+	class MissingAnswers < TestSyntaxError
+		def initialize(file, question)
+			super(file, question.index, 
+				BadQuestion.message(question, "has no answers"))
+		end
+	end
+	
+	class BadAnswer < TestSyntaxError
+		def initialize(file, line)
+			super(file, line.index, 
+				"'#{line.truncate(20)}' starts with weird characters")
+		end
+	end
+	
+	class BadQuestion < TestSyntaxError
+		def self.message(question, m)
+			"question '#{question.truncate(20)}' #{m}"
+		end		
+		
+		def initialize(file, question)
+			super(file, question.index, 
+				"'#{question.truncate(20)}' does not look like question")
+		end	
+	end
 	
-	class TestSyntaxError < PickaxeError; status_code(2) ; end
-	class MissingAnswers < TestSyntaxError; status_code(2) ; end
-	class BadAnswer < TestSyntaxError; status_code(3) ; end
-	class BadQuestion < TestSyntaxError; status_code(4) ; end
-	class NoCorrectAnswer < TestSyntaxError; status_code(3) ; end
+	class NoCorrectAnswer < TestSyntaxError
+		def initialize(file, question)
+			super(file, question.content.first.index,
+				BadQuestion.message(question.content.first, "has no correct answers"))
+		end
+	end
 		
 	class TestLine < String
 		attr_accessor :index
@@ -39,19 +81,22 @@ module Pickaxe
 		
 		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)
+				unless File.exist?(file_or_directory)
+					raise PathError.new(file_or_directory) 
+				end
+				
 				if File.file?(file_or_directory)
 					file_or_directory
 				else
-					Dir.glob("#{file_or_directory}/*.#{Main.options[:extension] || "txt"}")
+					Dir.glob("#{file_or_directory}/*.#{Main.options[:extension]}")
 				end				
 			end.flatten.collect { |f| f.squeeze('/') }
 			
 			@questions = []
 			@files.each do |file|
 				File.open(file) do |f|
-					lines = f.readlines.collect(&:strip).enum_with_index.collect do |line, index|
-						TestLine.new(line, index)
+					lines = f.readlines.collect(&:strip).each_with_index.collect do |l, i|
+						TestLine.new(l, i)
 					end
 					
 					lines = lines.reject {|line| line =~ COMMENTS_RE }
@@ -117,25 +162,26 @@ module Pickaxe
 			until answers.first.nil? or Answer::RE.match(answers.first)
 				content << answers.shift
 			end
-			
-			raise MissingAnswers, "#{file}: line #{answers.first.index}: no content (check blank lines nearby)" if content.blank?			
-			raise BadQuestion, "#{file}: line #{content.first.index}: '#{content.first.truncate(20)}' does not look like question" unless m = RE.match(content.first)
+						
+			raise MissingAnswers.new(file, answers.first.index) if content.blank?			
+			unless m = RE.match(content.first)
+				raise BadQuestion.new(file, content.first) 
+			end
+			raise MissingAnswers.new(file, content.first) if answers.blank?
 									
-			error_template = "#{file}: line #{content.first.index}: question '#{content.first.truncate(20)}' %s"
-			raise MissingAnswers, (error_template % "has no answers") if answers.blank?
-			
 			answers = answers.inject([]) do |joined, line|
 				if Answer::RE.match(line)
 					joined << [line]
 				else
-					raise BadAnswer, "#{file}: line #{line.index}: '#{line.truncate(20)}' starts with weird characters" unless Answer::LINE_RE.match(line)
+					raise BadAnswer.new(file, line)unless Answer::LINE_RE.match(line)
 					joined.last << line
 				end
 				joined
 			end
 			
-			Question.new(file, m[1], content, answers.collect {|answer| Answer.parse(file, answer) }).tap do |q|
-				raise NoCorrectAnswer, (error_template % "has no correct answer") if q.correct_answers.blank?
+			answers = answers.collect {|answer| Answer.parse(file, answer) }
+			Question.new(file, m[1], content, answers).tap do |q|
+				raise NoCorrectAnswer.new(file, q) if q.correct_answers.blank?
 			end
 		end
 		
@@ -145,7 +191,8 @@ module Pickaxe
 				selected = indices.include?(answer.index)
 				line = (selected ? ">> " : "   ") + answer.to_s
 				
-				if Main.options[:force_show_answers] or (not indices.blank? and not Main.options[:full_test]) then
+				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
@@ -175,12 +222,13 @@ module Pickaxe
 	end
 	
 	class Answer < Struct.new(:content, :index, :correctness)
-		RE = /^\s*(>+)?\s*(\?\?)?\s*\(?(\w+)\)\s*(.+)$/u
-		LINE_RE = /^\s*(\w+)/u
+		RE = /^\s*(>+)?\s*(\?+)?\s*\(?(\w)\)\s*(.+)$/u
+		LINE_RE = /^\s*([[:alpha:]]|\w+)/u
 		
 		def self.parse(file, lines)
 			m = RE.match(lines.shift)
-			Answer.new(m[4].strip + " " + lines.collect(&:strip).join(" "), m[3].strip, !m[1].nil?)
+			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: 7
+  hash: 9
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Dawid Fatyga