ovec 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf233d8093609535f86f06d12e54d8d53ea44da0
-  data.tar.gz: 61af216b5f2b5bda2dafe0affd86d3991ac9b957
+  metadata.gz: 3e5e4d58f8170a737c81c93d9ee01a5749a4c700
+  data.tar.gz: d6f4e332980e2f449cced3995ce6af5fd7039142
 SHA512:
-  metadata.gz: ae3384bf00f9d20dd2ab7cc398a70959a44454ed953c1f0ec9cbddb485fc06adeace43e1313baf8fdcea80f1bb7b45fa2459d7ec3437b65f7f981dc384858ddf
-  data.tar.gz: 11ffb6b266c098c33047a48962f461de4c602b77e5c9737739157f59816dc00632e12ac81b1a184016ea8b52876ce2e40893e8e809df9ac75455c51acab6643a
+  metadata.gz: 0bdc65af08ee00e49957231e1c810b60c1593ccf48aec384b4926074a574d4c8cae00885e9a2d4fe98d2825a1644e26f518405ce782dfd1a38770900e8134115
+  data.tar.gz: e5e61c00f0603d7ec7cb1bc2c872f76db56f139212915ee5c6974a273e27545239d3d14032a9bc0cfbda1451a3b6baf0aa6adf99e9770f1fb43a2dab34bf849f

data/bin/ovec

@@ -1,10 +1,61 @@
 #!/usr/bin/env ruby
 
 require 'ovec'
+require 'optparse'
 
-content = ARGF.read
+options = {}
 
-parser = Ovec::Parser.new
+opts_parser = OptionParser.new do |opts|
+	opts.banner = "Usage: ovec [options]"
+
+	opts.on("-i", "--input FILENAME", "Input filename or - for stdin (required)") do |filename|
+		options[:input] = filename
+	end
+
+	opts.on("-o", "--output FILENAME", "Output filename or - for stdout (required)") do |filename|
+		options[:output] = filename
+	end
+
+	opts.on("-d", "--[no-]debug", "Show debugging messages (on STDERR)") do |v|
+		options[:debug] = v
+	end
+
+	opts.on_tail("-h", "--help", "Show this message") do
+		puts opts
+		exit
+	end
+
+	opts.on_tail("-v", "--version", "Show version") do
+		puts Ovec::NAME_WITH_VERSION
+		exit
+	end
+end
+
+input_file = nil
+output_file = nil
+
+begin
+	opts_parser.parse!
+	unless options.key?(:input) && options.key?(:output)
+		$stderr.puts "You must specify both an input file and an output file."
+		$stderr.puts opts_parser.help
+		exit 1
+	end
+
+	input_file = (options[:input] == '-') ? STDIN : File.open(options[:input], "r")
+	output_file = (options[:output] == '-') ? STDOUT : File.open(options[:output], "w")
+rescue OptionParser::ParseError => ex
+	$stderr.puts "Invalid options: #{ex.message}"
+	$stderr.puts opts_parser.help
+	exit 1
+rescue StandardError => ex
+	$stderr.puts ex.message
+	exit 1
+end
+
+content = input_file.read
+
+parser = Ovec::Parser.new(debug: options[:debug])
 tree = parser.parse(content)
 
 tm = Ovec::TexManipulator.new
@@ -14,4 +65,7 @@ tier = Ovec::Tier.new
 
 tm.run_text_manipulator(tier)
 
-puts tree.to_tex
+output_file.puts tree.to_tex
+
+input_file.close
+output_file.close

data/lib/ovec/parser.rb

@@ -7,7 +7,7 @@ module Ovec
 	class Parser
 		NORMAL_REGEX = /\A([^\\$%])+/
 		# TODO: more escapes: there are probably 10x more...
-		COMMAND_REGEX = /\A\\([a-zA-Z0-9]+|[%:,\\])/
+		COMMAND_REGEX = /\A\\([a-zA-Z0-9]+|[~%:,^$&\\ ])/
 		COMMENT_REGEX = /\A%.*$/
 
 		TEXT_COMMANDS = %w(textit textbf textsc title author)
@@ -19,7 +19,9 @@ module Ovec
 
 		private
 		def debug(*args)
-			$stderr.puts(*args)
+			if @debug
+				$stderr.puts(*args)
+			end
 		end
 
 		def find_other_side(string, start, left = '{', right = '}')
@@ -38,6 +40,10 @@ module Ovec
 		end
 
 		public
+		def initialize(debug: false)
+			@debug = debug
+		end
+
 		def self.delimiter_right_side(left)
 			{
 				'{' => '}', '[' => ']', '(' => ')', '<' => '>'

data/lib/ovec/version.rb

@@ -1,3 +1,4 @@
 module Ovec
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
+	NAME_WITH_VERSION = "Ovec #{VERSION}"
 end

data/test/lib/ovec/parser.rb

@@ -73,5 +73,11 @@ module Ovec
 			result = @parser.parse(text)
 			assert_equal text, result.to_tex
 		end
+
+		def test_weird_commands_parsed
+			text = '\%\ \\\ \ahoj\~\^\,\:\$\&'
+			result = @parser.parse(text)
+			assert_equal text, result.to_tex
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michal Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Ovec inserts nonbreakable spaces into your Czech language TeX files.