visualtag 0.0.1 → 1.0.0

data/bin/visualtag

@@ -2,25 +2,20 @@
 require "optparse"
 require "visualtag"
 
-options = { :pattern_dimension => 1800,
-			:border_dimension => 720,
+options = {	:pattern_dimension => 1800,
 			:filename => 'tag.svg',
-			:pattern => [[1,0,1,0,1,0],[0,1,0,1,0,1]]*3}
+			:pattern => [[1,0,1,0,1,0],[0,1,0,1,0,1]]*3,
+			:verbose => false}
 
 ARGV.options do |opts|
-	opts.banner = "Usage:  #{File.basename($PROGRAM_NAME)} [OPTIONS] OTHER_ARGS"
+	opts.banner = "Usage:  #{File.basename($PROGRAM_NAME)} [OPTIONS]"
 	
 	opts.separator ""
 	opts.separator "Specific Options:"
 	
-	opts.on( "-d D", "--pattern-dimension", Integer,
-	         "Dimension of the pattern, in pixels." ) do |opt|
-		options[:pattern_dimension] = opt
-	end
-
-	opts.on( "-b D", "--border-dimension", Integer,
-	         "Dimension of the border, in pixels." ) do |opt|
-		options[:border_dimension] = opt
+	opts.on( "-c C", "--cell-dimension", Integer,
+	         "Dimension of each cell of the pattern, in pixels." ) do |opt|
+		options[:pattern_dimension] = opt*6
 	end
 
 	opts.on( "-f F", "--filename", String,
@@ -30,28 +25,14 @@ ARGV.options do |opts|
 
 	opts.on( "-p P", "--pattern", String,
 	         "The pattern of the tag, matlab (mat2str surrounded with \") or ruby (to_s) representations are allowed" ) do |opt|
-		options[:pattern] = []
-		begin
-			options[:pattern] = eval(opt)
-		rescue Exception => exc
-			puts 'Not a ruby matrix.. maybe its matlab..'
-		end
-
-		begin
-			opt.each_line(';') do |row|
-				rubyrow = []
-				row.scan(/false|true|1|0/) do |match|
-					value = eval(match)
-					rubyrow << (value.class.name == 'Fixnum'? value > 0: value)
-				end
-				options[:pattern] << rubyrow.map { |e| e ? 1 : 0 }
-			end
-		rescue
-			puts 'Not matlab.. its unknown'
-		end
-		puts options[:pattern]
+		options[:pattern] = opt
 	end
 	
+	opts.on( "-v", "--verbose",
+	         "Print some text while executing." ) do |opt|
+		options[:verbose] = opt
+	end
+
 	opts.separator "Common Options:"
 	
 	opts.on( "-h", "--help",
@@ -66,7 +47,59 @@ ARGV.options do |opts|
 		puts opts
 		exit
 	end
+end
 
-	Visualtag::create(options[:pattern], options[:filename], options[:pattern_dimension], options[:border_dimension])
+pattern = []
+if options[:pattern].class.name == 'Array'
+	pattern = options[:pattern]
+	if options[:verbose]
+		puts 'Using default pattern'
+	end
+else
+	begin
+		pattern = eval(options[:pattern])
+		if (pattern.class.name == 'Array' && options[:verbose])
+			puts 'Found a ruby matrix'
+		end
+	rescue Exception => exc
+		begin
+			pattern = []
+			options[:pattern].each_line(';') do |row|
+				rubyrow = []
+				row.scan(/false|true|1|0/) do |match|
+					value = eval(match)
+					rubyrow << (value.class.name == 'Fixnum'? value > 0: value)
+				end
+				pattern << rubyrow.map { |e| e ? 1 : 0 }
+			end
+			if options[:verbose]
+				puts 'Found a matlab matrix'
+			end
+		rescue
+			puts 'Error: Pattern format unknown'
+			Process.exit
+		end
+	end
+end
 
+if pattern.class.name == 'Array'
+	if options[:verbose]
+		puts 'Used pattern:'
+		puts pattern.inspect
+	end
+else
+	puts 'Error: wrong pattern format. It must be an array'
+	Process.exit
+end
+
+begin
+	Visualtag::create(pattern, options[:filename], options[:pattern_dimension], Float(options[:pattern_dimension])/2.0)
+	if options[:verbose]
+		puts "Created file #{options[:filename]}"
+	end
+rescue
+	if options[:verbose]
+		puts "Error in generating the tag file"
+		Process.exit
+	end
 end

data/lib/visualtag.rb

@@ -11,7 +11,13 @@ module Visualtag
 
 		img = Rasem::SVGImage.new(tag_dimension,tag_dimension) do
 			rectangle 0, 0, tag_dimension,tag_dimension, :stroke=>'black', :fill=>'black'
+			if pattern.length != 6
+				raise 'Wrong pattern dimension'
+			end
 			pattern.each.with_index do |row, row_index|
+				if row.length != 6
+					raise 'Wrong pattern dimension'
+				end
 				row.reverse.each.with_index do |cell, column_index|
 					if cell == 0
 						color = 'black'

data/lib/visualtag/version.rb

@@ -1,3 +1,3 @@
 module Visualtag
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualtag
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rasem