drudje 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f45deea2cb77dcb89ef19833844964c40cd78c
-  data.tar.gz: eb1e91c01cb82d747a054fe34d031c7a2ec893cd
+  metadata.gz: 4d18f1710e19364a61e8fbf2d1b5a63bf7b85617
+  data.tar.gz: e6ed2dcb60ee5894f00fe3af0c479ea30c07b652
 SHA512:
-  metadata.gz: 98bf4b2a2d1a31d69faff0fd36aefab9710a687b47fc6edabe1b11c5cc600a4d1bf04d874e3f7a43e09410224557c922de4d29398bf18cfdd275c403c02329da
-  data.tar.gz: a8446a8b60784c8191e666255ba223e9b76427172e4b07fdaebaa57bb280090a74a619b82541602adba18676551a8be05eaed234cd2cede7160a82c8cece7b00
+  metadata.gz: cfb544a364727d2fed4c1b62b573c83aad27f24c58ea5e10c0b680bff80d47454014f734e3f65d18a9e878e44443ab4798671bd8330634e819812e9eef7ff50f
+  data.tar.gz: c918cd58c6c3613041c9be1fb06dc2365d73ffc6520967dc9ecf86786cb089c5c31493012c8a04f36a85e93ab3af5f1bbc8e538bcaf8cebabdba1c9740fc121f

data/bin/drudje

@@ -1,11 +1,31 @@
 #!/usr/bin/env ruby
-
+require 'optparse'
 require_relative '../lib/drudje.rb'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = 'Usage: drudje [options] source-dir dest-dir'
+
+  opts.on('-l lib-dir', '--lib', 'Use template library') do |l|
+    options[:lib] = l
+  end
+  options[:recursive] = false
+  opts.on('-r', '--recursive', 'Recursive') do |r|
+    options[:recursive] = r
+  end
+  options[:extension] = 'html'
+  opts.on('-e' '--extension', 'File extension to handle') do |e|
+    options[:extension] = e
+  end
+end.parse!
+
+puts options
 src = ARGV[0]
 dest = ARGV[1]
-ext = ARGV[2] || '.html'
 
-puts 'Processing ' + src + '/*' + ext + ' to ' + dest
-d = Drudje.new src, dest, ext
+extension = options[:extension]
+pattern = File.join(src, (options[:recursive] ? '**/*.' : '*.') + extension)
+d = Drudje.new src, dest, extension, options[:lib], pattern
+puts 'Processing ' + pattern + ' to ' + dest
 d.run
 puts 'Done'

data/lib/drudje.rb

@@ -3,12 +3,15 @@ require_relative 'drudje_io.rb'
 class Drudje
 	# TODO: Separate file access to separate object
 	# so that we can test everything
-	attr_accessor :src, :dest, :extension, :io
-	def initialize(src, dest, ext)
+	attr_accessor :src, :dest, :extension, :io, :lib, :pattern
+	def initialize(src, dest, ext, lib, pattern)
+    lib = src if lib == nil
 		@extension = ext
-		@src = src
-		@dest = dest
+    @src = src.end_with?('/') ? src.chomp('/') : src
+    @dest = dest.end_with?('/') ? dest.chomp('/') : dest
 		@io = DrudjeIo.new
+    @lib = lib
+    @pattern = pattern || File.join(src, '*.' + extension)
 	end
 
 	def render(template, args)
@@ -62,12 +65,20 @@ class Drudje
 
 	def template_file(call_str)
 		parts = call_str.strip.partition(/[\s\n\r]+/)
-		File.join self.src, parts[0] + self.extension
+		File.join self.lib, parts[0] + '.' + self.extension
 	end
 
 	def output_file(file)
+    path = File.dirname file
+    if path =~ Regexp.new("\/" + self.src + "\/")
+      destpath = path.gsub Regexp.new("\/" + self.src + "\/"), "/" + self.dest + "/"
+    elsif path =~ Regexp.new("^" + self.src + "\/")
+      destpath = path.gsub Regexp.new("^" + self.src + "\/"), self.dest + "/"
+    else
+      destpath = self.dest
+    end
 		base = File.basename file
-		File.join self.dest, base
+		File.join destpath, base
 	end
 
 	def expand(call_str)
@@ -90,13 +101,14 @@ class Drudje
 	end
 
 	def run
-		pattern = File.join self.src, '*' + self.extension
-		files = Dir.glob(pattern)
+		files = Dir.glob(self.pattern)
+    puts "No files found matching " + self.pattern.to_s if files.length == 0
 		files.each do |file|
-			puts "Processing file " + file
+      outfile = output_file(file)
+			puts 'Processing file ' + file + ' to ' + outfile
 			contents = self.io.read file
 			processed = process contents
-			self.io.write output_file(file), processed
+			self.io.write outfile, processed
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drudje
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brian DeJong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies: []
 description: A simple text file templating tool
 email: brian.dejong@gmail.com