Pickaxe 0.5.5 → 0.6.0

data/Gemfile

@@ -3,4 +3,5 @@ source "http://rubygems.org"
 
 gem 'activesupport', "3.0.1", :require => 'active_support/all'
 gem 'i18n', "0.4.2"
+gem 'unidecoder', '1.1.1'
 

data/Gemfile.lock

@@ -3,10 +3,13 @@ GEM
   specs:
     activesupport (3.0.1)
     i18n (0.4.2)
+    unidecoder (1.1.1)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   activesupport (= 3.0.1)
   i18n (= 0.4.2)
+  unidecoder (= 1.1.1)

data/README.markdown

@@ -5,8 +5,8 @@ Pickaxe provides a simple way to load, solve and rate tests
 
 Documentation can be read [here](http://dejw.github.com/pickaxe/).
 
-**Note:** pickaxe was not tested on Windows yet (and it will not work there 
-since `Pickaxe::Shell` executes some terminal related code).
+**Note:** if You are Windows user please read 
+[Windows section](http://dejw.github.com/pickaxe/#WINDOWS) in manual.
 
 ## instalation
 

data/lib/pickaxe.rb

@@ -1,16 +1,20 @@
 require "rubygems"
 require "bundler/setup"
 require "active_support/all"
+require "rbconfig"
+require "unidecoder"
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 module Pickaxe
-	VERSION = "0.5.5"
+	VERSION = "0.6.0"
 	
 	class PickaxeError < StandardError; end
   
-  autoload :Shell, 'pickaxe/shell'
-  autoload :Color, 'pickaxe/color'
+	WINDOWS_IT_IS = Config::CONFIG['host_os'] =~ /mswin|mingw/
+
+	autoload :Shell, 'pickaxe/shell'
+	autoload :Color, 'pickaxe/color'
 	autoload :Main, 'pickaxe/main'
 	autoload :Test, 'pickaxe/test'
 	autoload :Errors, 'pickaxe/errors'

data/lib/pickaxe/cli.rb

@@ -60,6 +60,20 @@ end
 
 begin
 	parser.parse!
+	
+	Pickaxe::Main.options = options
+			
+	if Pickaxe::WINDOWS_IT_IS
+		$stderr.puts <<END_OF_MESSAGE
+! 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.
+END_OF_MESSAGE
+		
+	end
+	
 	if options[:full_test] and options[:repeat_incorrect]
 		$stderr.puts(("! --full-test disables the --repeat-incorrect option" ).color(:yellow))
 		options[:repeat_incorrect] = false

data/lib/pickaxe/color.rb

@@ -47,7 +47,9 @@ module Pickaxe
 		# of the returned String.
 		#
 		def self.set_color(string, color, bold=false)
-			unless (Main.options || {})[:no_colors]
+			if Pickaxe::WINDOWS_IT_IS
+				string
+			elsif not (Main.options || {})[:no_colors]
 				color = self.const_get(color.to_s.upcase) if color.is_a?(Symbol)
 				bold = bold ? BOLD : ""
 				"#{bold}#{color}#{string}#{CLEAR}"

data/lib/pickaxe/main.rb

@@ -16,7 +16,6 @@ END_OF_TEST
 		def initialize(paths, options = {})
 			raise NoTests, "no tests to run" if paths.empty?
 			
-			Main.options = options			
 			@test = Test.new(*paths)
 			return if options[:syntax_check]
 						
@@ -35,7 +34,12 @@ END_OF_TEST
 			end
 			
 			begin
-				puts "! Hit Control-D or Control-C to end test.\n\n".color(:green)	
+				if Pickaxe::WINDOWS_IT_IS
+					puts "! Hit Control-Z + [Enter] to end test\n\n"
+				else
+					puts "! Hit Control-D or Control-C to end test.\n\n".color(:green)	
+				end
+				
 				while @current_index < @questions.length + (Main.options[:full_test] ? 1 : 0) do
 					@question = @questions[@current_index]
 				

data/lib/pickaxe/shell.rb

@@ -2,10 +2,16 @@ module Pickaxe
 	module Shell
 		# Extracted from 
 		# https://github.com/wycats/thor/blob/master/lib/thor/shell/basic.rb
+		#
+		# This is turned off on Windows and returns always 80
 		def self.dynamic_width
-		  (dynamic_width_stty.nonzero? || dynamic_width_tput)
+			if Pickaxe::WINDOWS_IT_IS
+				80
+			else
+				(dynamic_width_stty.nonzero? || dynamic_width_tput)
+			end
 		end
-
+	private
 		def self.dynamic_width_stty
 		  %x{stty size 2>/dev/null}.split[1].to_i
 		end

data/lib/pickaxe/test.rb

@@ -1,9 +1,13 @@
 module Pickaxe
 	class TestLine < String
 		attr_accessor :index
-		def initialize(itself, index)
-			super(itself)
+		def initialize(itself, index)			
 			self.index = index + 1
+			if Pickaxe::WINDOWS_IT_IS
+				replace(itself.to_ascii)
+			else
+				replace(itself)
+			end
 		end
 	end
 		
@@ -15,7 +19,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|
@@ -26,13 +30,13 @@ module Pickaxe
 				if File.file?(file_or_directory)
 					file_or_directory
 				else
-					Dir.glob("#{file_or_directory}/*.#{Main.options[:extension]}")
+					Dir.glob("#{file_or_directory.gsub("\\", "/")}/*.#{Main.options[:extension]}")
 				end				
 			end.flatten.collect { |f| f.squeeze('/') }
 			
 			@questions = []
 			@files.inject(nil) do |last, file|				
-				File.open(file) do |f|
+				File.open(file, "r:UTF-8") do |f|
 					lines = f.readlines.collect(&:strip).each_with_index.collect do |l, i|
 						TestLine.new(l, i)
 					end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Pickaxe
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Dawid Fatyga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: bin/pickaxe
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,22 @@ dependencies:
   name: i18n
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
+  requirement: *id004
+  name: unidecoder
+  prerelease: false
+  type: :runtime
 description: |
   Pickaxe provides a simple way to load, solve and rate tests (bundle of questions)
   written in simple text format.