mjollnir 0.1.0 → 0.1.1

data/README.md

@@ -4,32 +4,33 @@ A gem for prepending and appending text to rails generated files.
 
 ## Usage
 
-add "gem 'mjollnir'" to your Gemfile
+add `gem 'mjollnir'` to your Gemfile
 
-Create a directory in your lib directory called "mjollnir".
+Create a directory in your lib directory called `mjollnir`.
 Add four files to this directory:  
-	1. append.rb - this file contains instructions for insertions at the end of generated files.  
-	2. prepend.rb - this file contains instructions for insertions at the beinning of generated files.  
-	3. comment_starts.csv - put lines in this file when you need to create block comments in different file types.  For example, use a line, "rb,=start" for the start of a ruby block.  When generating text in the append.rb or prepend.rb files, use <%= universal_comment_start %> to declare the start of any comment block, so long as that file type has been included in comment_starts.csv.  
-	4. comment_ends.csv - much like comment_starts.csv, but this file is for comment block ends in generated text.  For example, use "erb,-->" to end a comment block in an erb file.  When generating text in the append.rb or prepend.rb files, use <%= universal_comment_end %> to declare the end of any comment block, so long as that file type has been included in comment.ends.csv.  
+1. `append.rb` - this file contains instructions for insertions at the end of generated files.  
+2. `prepend.rb` - this file contains instructions for insertions at the beinning of generated files.  
+3. `comment_starts.csv` - put lines in this file when you need to create block comments in different file types.  For example, use a line, `rb,=start` for the start of a ruby block.  When generating text in the `append.rb` or `prepend.rb` files, use `<%= universal_comment_start %>` to declare the start of any comment block, so long as that file type has been included in `comment_starts.csv`.  
+4. `comment_ends.csv` - much like `comment_starts.csv`, but this file is for comment block ends in generated text.  For example, use `erb,-->` to end a comment block. in an erb file.  When generating text in the `append.rb` or `prepend.rb` files, use `<%= universal_comment_end %>` to declare the end of any comment block, so long as that file type has been included in `comment.ends.csv`.  
 
 ## Variables
 
-	The following usable variables for append.rb and prepend.rb:  
+The following usable variables for `append.rb` and `prepend.rb`:  
 
-	target_file_type - the target file's type (rb, erb, coffee, etc.)  
-	target_file - the target file directory, name and extention  
-	universal_comment_start - the target file's file type comment block start, so long as it is declared in the comment_starts.csv file in the lib/mjollnir directory  
-	universal_comment_end - the taret file's file type comment block end, so long as it is declared in the comment_ends.csv file in the lib/mjollnir directory  
+* `target_file_type` - the target file's type (`rb`, `erb`, `coffee`, etc.)  
+* `target_file` - the target file directory, name and extention  
+* `universal_comment_start` - the target file's file type comment block start, so long as it is declared in the `comment_starts.csv` file in the `lib/mjollnir` directory.  
+* `universal_comment_end` - the taret file's file type comment block end, so long as it is declared in the `comment_ends.csv` file in the `lib/mjollnir` directory.
 
 ## Example
 
-prepend.rb for adding MIT license:  
-		<%= universal_comment_start %>
+`prepend.rb` for adding MIT license:
+```Ruby
+<%= universal_comment_start %>
 
-		<%= target_file %>
+<%= target_file %>
 
-        Copyright (c)<%= Time.now.year %> 123 Fake Co.
+	Copyright (c)<%= Time.now.year %> 123 Fake Co.
 
         Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -38,9 +39,10 @@ prepend.rb for adding MIT license:
         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
         Generated at: <%= Time.now %>
-		<%= universal_comment_end %>
-
-comment_ends.csv for common file types:  
+<%= universal_comment_end %>
+```
+`comment_ends.csv` for common file types:  
+```
 rb,=end  
 scss,*/  
 js,*/  
@@ -49,7 +51,7 @@ coffee,###
 css,*/  
 erb,-->  
 html,-->  
-
+```
 
 
 ## Contributing
@@ -63,4 +65,4 @@ html,-->
 ## Planned changes
 
 1. Version 0.2.0 will add a generator for the prepend, and append ruby files, as well as for the two csvs.
-2.  The change after that will be to automate some testing.
+2. The change after that will be to automate some testing.

data/lib/mjollnir/version.rb

@@ -1,3 +1,3 @@
 module Mjollnir
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/mjollnir.rb

@@ -1,35 +1,33 @@
 require "mjollnir/version"
 
 module Mjollnir
-	def self.include(base)
-		base.extend(ClassMethods)
-	end
-
 	def template(source, *args, &block)
 		inside_template do
 			super
-			if File.exists?("lib/mjollnir") && File.directory?("lib/mjollnir")
-				target_file = args.first|| source.sub(/\.tt$/, '')
-
-				prependable = ERB.new(::File.binread("lib/mjollnir/prepend.rb"), nil, '-', '@output_buffer')
-				appendable = ERB.new(::File.binread("lib/mjollnir/append.rb"), nil, '-', '@output_buffer')
 			
-				target_file_type = target_file.split('.').pop
+			mjollnir_root = "lib/mjollnir"
 
-				commentstarts = Hash[*File.read('lib/mjollnir/comment_starts.csv').split(/[, \n]+/)]
-				commentends = Hash[*File.read('lib/mjollnir/comment_ends.csv').split(/[, \n]+/)]
-				universal_comment_start = commentstarts[target_file_type] 
-				universal_comment_end = commentends[target_file_type]	
-
-				# Bind the variables to the ERB results
-				preargs = [
-					prependable.result(binding)
-				]
-				postargs = [
-					appendable.result(binding)
-				]
-				prepend_to_file(target_file, *preargs, &block)
-				append_to_file(target_file, *postargs, &block)
+			if File.exists?(mjollnir_root) && File.directory?(mjollnir_root)
+				target_file = args.first|| source.sub(/\.tt$/, '')
+				target_file_type = target_file.split('.').pop
+		
+				if File.exists?(mjollnir_root + "/comment_starts.csv")
+					commentstarts = Hash[*File.read(mjollnir_root + '/comment_starts.csv').split(/[, \n]+/)]
+					universal_comment_start = commentstarts[target_file_type] 
+				end
+				if File.exists?(mjollnir_root + "/comment_ends.csv")
+					commentends = Hash[*File.read(mjollnir_root + '/comment_ends.csv').split(/[, \n]+/)]
+					universal_comment_end = commentends[target_file_type]	
+				end
+			
+				if File.exists?(mjollnir_root + "/prepend.rb") 
+					preargs = [ ERB.new(::File.binread(mjollnir_root + "/prepend.rb"), nil, '-', '@output_buffer').result(binding) ]
+					prepend_to_file(target_file, *preargs, &block)
+				end
+				if File.exists?(mjollnir_root + "/append.rb")
+					postargs = [ ERB.new(::File.binread(mjollnir_root + "/append.rb"), nil, '-', '@output_buffer').result(binding) ]
+					append_to_file(target_file, *postargs, &block)
+				end
 			end
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjollnir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies: []
 description: A gem for prepending and appending generated files from any rails generator,
   though the power of Thor.