sgmailer 1.0.1 → 1.1.1

data/bin/sgmailer

@@ -3,15 +3,23 @@ first_rg = ARGV[0]
 
 if (first_rg == "generate")
 	puts SGmailer.generate(ARGV[1], ARGV[2], ARGV)
+elsif (first_rg == "cleanup")
+	puts SGmailer.cleanup
 elsif (first_rg == "--help")
 	puts "Commands:"
-	puts "sgmailer generate [username] [password] ([flags])"
+	puts "sgmailer generate [username] [password] ([args]) ([flags])"
 	puts "\tusername: your gmail username"
 	puts "\tpassword: your gmail password"
-	puts "\tflags:\n\t\t--no-plain: Do not include plain-text template in email"
-	puts "\n\t\t--no-html: Do not include HTML template in email"
-	puts "\n\t\t--no-message: Do not include a message field, but rather a default template"
-	puts "\n\n\tTo send an email, in your controller use: SGmailer.send_email(to-address, subject, email-message)"
+	puts "\t[args] - name for arguments to pass in that will be viewed on the email message. Optional. If not included, will only have 'message' parameter"
+	puts "\n\tflags:\n\t\t--no-plain: Do not include plain-text template in email"
+	puts "\t\t--no-html: Do not include HTML template in email"
+	puts "\t\t--no-message: Do not include a message field, but rather a default template"
+	puts "\t\t--isolate-password: Put the password file in a seperate file and add it to .gitignore"
+	
+	puts "\n\n\sgmailer cleanup"
+	puts "\tDeletes all your mail files for you so you can re-generate the code"
+	puts "\tWARNING: This will permanetly delete your mailer files. Any saved changes will be deleted"
+	puts "\n\n\tTo send an email, in your controller use: SGmailer.send_email(to-address, subject, parameters[..])"
 else
 	puts "Error, unrecognized command. Please type in 'sgmailer --help' for help."
 end

data/lib/sgmailer.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 class SGmailer
 	def self.generate username, password, args
 			
@@ -21,6 +23,32 @@ class SGmailer
 			
 			puts "\tModified config/environment.rb"
 			
+			#Check to see if we want to put the password in a seperate file
+			if (helper.arg_exists? "--isolate-password")
+				file = File.open("config/password.psw", "w")
+				file.puts password
+				file.close
+				puts "\tWrote password to seperate file"
+				
+				ex = false
+				if (File.exists? ".gitignore")
+					file = File.open(".gitignore", "r")
+					file.each do |line|
+						if line.include? "*.psw"
+							ex = true
+						end
+					end
+					
+					if (ex == false)
+						file = File.open(".gitignore", "a")
+						file.puts "\n\n# Ignore email password file"
+						file.puts "/config/*.psw"
+						file.close
+						puts "\tUpdated gitignore file to not include password file"
+					end
+				end
+			end
+			
 			#Generate file for mailer
 			if (!File.directory? "app/mailers")
 				Dir.mkdir("app/mailers", 755)
@@ -56,15 +84,48 @@ class SGmailer
 			puts "\nComplete! Edit the email scaffolds with your email (and dynamic text)."
 			extra = ""
 			if !helper.arg_exists?("--no-message")
-				extra = ", [message]"
+				helper.get_params.each do |a|
+					extra = extra +  ", [" + a + "]"
+				end
 			end
 			puts "To send an email, in the controller use: SGmailer.send_email([to address], [subject]" + extra + ")"
+			if (helper.arg_exists?("--isolate-password"))
+				puts "IMPORTANT! You MUST copy over config/password.psw to any development or production instance, otherwise errors will occur. This file will not be included in your git repository."
+			end
 			
 		else
 			puts "\tError. Please put your gmail username and password."
 		end
+	end
+	
+	def self.cleanup
+	#Environment
+		if !File.exists? "config/environment.rb"
+			puts "Please create a rails project that has an environment.rb file"
+		end
+		
+		if File.exists? "config/password.psw"
+			File.delete "config/password.psw"
+		end
+		
 		
+		#Check for directory
+		if File.directory? "app/mailers"
+			if File.exists? "app/mailers/s_gmailer.rb"
+				File.delete "app/mailers/s_gmailer.rb"
+				puts "Deleted app/mailers/s_gmailer.rb"
+			end
+		end
+		
+		#Check for templates
+		if ((File.exists? "app/views/s_gmailer/email_plain.html.erb") || (File.exists? "app/views/s_gmailer/email_html.html.erb"))
+			FileUtils.rm_rf('app/views/s_gmailer')
+			puts "Delted mailer views"
+		end
+		
+		puts "Please check your config/environment.rb file and delete all SMTP and ActionMailer lines manually, if they exist."
 	end
+	
 end	
 
 class SGmailer::Thingies
@@ -72,7 +133,19 @@ class SGmailer::Thingies
 	def initialize(username, password, args)
 		@username = username
 		@password = password
-		@args = args
+		@all_args = args
+		
+		i = 3
+		a = args[i]
+		@args = []
+		while (a != nil && !a.include?("--"))
+			@args << a
+			i = i + 1
+			a = args[i]
+		end
+		if (@args.count == 0)
+			@args << "message"
+		end
 	end
 
 	def check_files?
@@ -93,6 +166,10 @@ class SGmailer::Thingies
 			return false
 		end
 		
+		if File.exists? "config/password.psw"
+			return false
+		end
+		
 		#Check for directory
 		if File.directory? "app/mailers"
 			if File.exists? "app/mailers/s_gmailer.rb"
@@ -112,6 +189,10 @@ class SGmailer::Thingies
 	
 	def get_text(text)
 		if (text == :environment)
+			psw = "\"" + @password + "\""
+			if (arg_exists? "--isolate-password")
+				psw = "psw"
+			end
 			"
 			
 ActionMailer::Base.delivery_method = :smtp
@@ -119,27 +200,38 @@ ActionMailer::Base.delivery_method = :smtp
 ActionMailer::Base.raise_delivery_errors = true
 ActionMailer::Base.perform_deliveries = true
 
+psw = \"\"
+if File.exists?(\"config/password.psw\")
+	file = File.open(\"config/password.psw\", \"r\")
+	psw = file.gets
+	file.close
+end
+
 ActionMailer::Base.smtp_settings = {
 	:address => \"smtp.gmail.com\",
 	:port => 587,
 	:authentication => :plain,
 	:user_name => \"" + @username + "\",
-	:password => \"" + @password + "\",
+	:password => " + psw + ",
 	:enable_starttls_auto => true,
 	:openssl_verify_mode => \"none\"
 }"
-		
+
 		elsif (text == :emailer)
 			rt = "class SGmailer < ActionMailer::Base
   default :from => \"#{@username}\"
   def email(recipient, subject"
   if !arg_exists? "--no-message"
-	rt = rt + ", message"
+	@args.each do |a|
+		rt = rt + ", " + a
+	end
   end
   rt = rt + ")
 	"
 	if !arg_exists? "--no-message"
-		rt = rt + "@message = message\n"
+		@args.each do |a|
+			rt = rt + "\t@" + a + " = " + a + "\n"
+		end
 	end
 	rt = rt + "	mail(:to =>	recipient, :subject => subject) do |format|
 		"
@@ -154,12 +246,16 @@ ActionMailer::Base.smtp_settings = {
   
   def send_email(recipient, subject"
   if !arg_exists?("--no-message")
-	rt = rt + ", message"
+	@args.each do |a|
+		rt = rt + ", " + a
+	end
   end
   rt = rt +")
 	self.email(recipient, subject"
 	if !arg_exists?("--no-message")
-		rt = rt + ", message"
+		@args.each do |a|
+			rt = rt + ", " + a
+		end
 	end
 	rt = rt + ").deliver
   end
@@ -174,7 +270,11 @@ end"
 				
 				YIPPEEE!!!!"
 			else
-				"<%= @message %>"
+				rtn = ""
+				@args.each do |a|
+					rtn = rtn + a + ":\n<%= @" + a + " %>\n\n"
+				end
+				return rtn
 			end
 			
 		elsif (text == :html)
@@ -184,18 +284,26 @@ end"
 			
 			YIPEEEEE!!!!"
 			else
-				"<pre><%= @message %></pre>"
+				rtn = ""
+				@args.each do |a|
+					rtn = rtn + "<b>" + a + ":</b><br/>\n<pre><%= @" + a + " %></pre><br/><br/>\n\n"
+				end
+				return rtn
 			end
 		end
 	end
 	
 	
 	def arg_exists? cmd
-		@args.each do |a|
+		@all_args.each do |a|
 			if a == cmd
 				return true
 			end
 		end
 		false
 	end
+	
+	def get_params
+		@args
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sgmailer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies: []
 description: Allows developers to send simple emails through GMail in Ruby on Rails
 email: nolanblew@hotmail.com