file_templater 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbcda6006b6b3e49308db64982a9a48696d10e3
-  data.tar.gz: 97595b1474ce2db099e98ae523b7452d402b695a
+  metadata.gz: 6d26fcfa5bc5fb8b356afa2803cddad03908ce16
+  data.tar.gz: bfbcc29e18036c6a71d24aafd490854024827d86
 SHA512:
-  metadata.gz: c9e7450d71bdbf09dbe8479b6d0d06486de3698f12a53a51b74863e57a922e1adc89169b78d876d5cee3a01ecb5a2df40bb6a7ada79d4b264896ba3cba6be629
-  data.tar.gz: 51f8a7e76f0f57b45819bff36a04edd0f84a20aea037d814151bc2c5ebc00563bce13baaff7e5388740a2eff4aa13a73a8fffdf07f17c82a9a56ae9ffe4f9cc6
+  metadata.gz: 726515a8ba6d89ed7f1fa06ae0c41ab6e3ee1a877e7ba701fc85c40311087664baaecec67b5dae7805d8c4b16ca73675c98653c1819e11e3d1978d39aadfff0d
+  data.tar.gz: 8f4607d540d012e4dfa3d648e46a855e18a1a76d0a992138f57d2d87ffdf00aaa908e6daf6c50f7bb10952175bd374c26259d930421fdd6d9e55863043a76161

data/lib/file_templater/options_handler.rb

@@ -9,7 +9,7 @@ module FileTemplater
 
 			@actions = []
 
-			parser = OptionParser.new do |o|
+			@parser = OptionParser.new do |o|
 				o.banner = "Usage: template [options] [binding arguments]"
 
 				o.separator ""
@@ -67,7 +67,7 @@ module FileTemplater
 				o.on_tail("-v", "--version", "Display the version") do
 					puts "File Templater (template) version " + VERSION
 					puts
-					puts "Copyright (C) 2015 Sam Craig"
+					puts "Copyright (C) 2015-2016 Sam Craig"
 					puts "Licensed under the GNU General Public License version 3."
 
 					exit
@@ -80,11 +80,22 @@ module FileTemplater
 				end
 			end
 
-			parser.parse!(argv)
-			@arguments = argv
+			if argv.empty?
+				puts @parser
+				exit
+			else
+				@parser.parse!(argv)
+				@arguments = argv
+			end
 		end
 
 		def process_actions
+			if @actions.empty?
+				puts @parser
+				puts "\nNo actions were supplied to the program!  The program will not do anything as a result."
+				exit
+			end
+
 			# All actions should be unique.
 			@actions.uniq!
 

data/lib/file_templater/template.rb

@@ -4,6 +4,7 @@ module FileTemplater
 		# bind: which binding rather than the default to use
 		# nomodify: if the template ERB will be loaded or not
 		def initialize(template, arguments, options = {})
+			@name = template
 			@nomodify = options[:nomodify]
 
 			@template = File.join(HUBS[:template], template)
@@ -23,18 +24,20 @@ module FileTemplater
 		end
 
 		def load(folder = @template)
-			FileUtils.mkdir(File.basename(folder)) unless folder == @template
+			unless folder == @template
+				FileUtils.mkdir(File.join(Dir.pwd, File.basename(folder)))
+				puts "Created folder #{File.join(Dir.pwd, File.basename(folder))}"
+			end
 
 			FileActions.unique_directory_list(folder).each do |f|
-				# We need the whole path to f, but we will keep the short name.
-				short_name = f
 				f = File.join(folder, f)
+				short_path = f.gsub(HUBS[:template] + File::SEPARATOR + @name, "")
 
 				if File.directory?(f)
 					self.load f
 				else
 					if !@nomodify && f.end_with?(".erb")
-						output_file = File.open(File.join(Dir.pwd, transform_file_name(short_name)), "w")
+						output_file = File.open(File.join(Dir.pwd, transform_file_name(short_path)), "w")
 
 						input_file = File.open(f, "r")
 						output_file.print(ERB.new(input_file.read, nil, "<>").result(@bind && @bind.get_binding))
@@ -42,14 +45,15 @@ module FileTemplater
 
 						output_file.close
 					else
-						FileUtils.copy_entry(f, File.join(Dir.pwd, transform_file_name(short_name)))
+						FileUtils.copy_entry(f, File.join(Dir.pwd, transform_file_name(short_path)))
 					end
+
+					puts "Created file #{File.join(Dir.pwd, transform_file_name(short_path))}"
 				end
 			end
 		end
 
 		# Expands the variable-in-file-name notation.
-		# file is expected to be a short name
 		def transform_file_name(file)
 			if @bind
 				variables = file.scan(/{{([^}]*)}}/).flatten
@@ -59,7 +63,7 @@ module FileTemplater
 				end
 			end
 
-			!@nomodify && file.end_with?(".erb") ? File.basename(file, ".*") : file
+			(!@nomodify && file.end_with?(".erb") && !File.directory?(file)) ? File.basename(file, ".*") : file
 		end
 	end
 end

data/lib/file_templater/variables.rb

@@ -1,5 +1,5 @@
 module FileTemplater
-	VERSION = "0.1.2"
+	VERSION = "0.1.3"
 
 	# The hub is where we store our templates and bindings.
 	HUBS = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_templater
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Craig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -39,7 +39,7 @@ files:
 - lib/file_templater/variables.rb
 homepage: https://github.com/Sammidysam/file_templater
 licenses:
-- gpl-3.0
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple system to create files/file structures from ERB templates.