easy-mysql 0.0.1 → 0.1.0

data/lib/easy-mysql.rb

@@ -3,8 +3,6 @@ require 'rainbow'
 
 class EasyMysql
 	def self.driver
-		puts " easy-mysql, created by Connor McArthur "
-
 		begin
 			new_mysql_user_info = self.getInputAndMakeMySQLUser
 			new_linux_user_info = self.getInputAndMakeLinuxUser
@@ -12,15 +10,17 @@ class EasyMysql
 			return false
 		end
 
-		puts "\r\nMySQL".background(:yellow).bright
-		puts "Username: {#new_mysql_user_info.username}"
-		puts "Password: {#new_mysql_user_info.password}"
-
-		puts "\r\nLinux User".background(:yellow).bright
-		puts "Username: {#new_linux_user_info.username}"
-		puts "Password: {#new_linux_user_info.password}"
-
-		puts "\r\nSUCCESS!".background(:red).bright
+		puts
+		puts "MySQL".bright
+		puts "Username: " + new_mysql_user_info[:username]
+		puts "Password: " + new_mysql_user_info[:password]
+		puts
+		puts "Linux User".bright
+		puts "Username: " + new_linux_user_info[:username]
+		puts "Password: " + new_linux_user_info[:password]
+		puts ""
+		puts "SUCCESS!\n\r".background(:green).color(:black).bright
+		puts ""
 	end
 
 	def self.getInputAndMakeLinuxUser
@@ -36,19 +36,21 @@ class EasyMysql
 
 		new_linux_user_info = self.addLinuxUser(linux_username)
 		self.setUpLinuxUserFilesystem(linux_username, linux_pubkey)
+
+		return new_linux_user_info
 	end
 
 	def self.addLinuxUser(username)
 		group = username
 		password = self.makeRandomPassword
 
-		output = `useradd -p #{password.crypt("JU")} -g #{group} #{username}`
+		output = `useradd -p #{password.crypt("JU")} #{username}`
 
 		unless $?.to_i == 0
 			raise $?
 		end
 
-		return { username: username, password: password }
+		return { :username => username, :password => password }
 	end
 
 	def self.setUpLinuxUserFilesystem(username, pubkeytext)
@@ -57,11 +59,12 @@ class EasyMysql
 			Dir.mkdir("/home/#{username}/.ssh") unless File.exists?("/home/#{username}/.ssh")
 
 			File.open("/home/#{username}/.ssh/authorized_keys", 'w') do |file| 
-				file.write pubkeytext
+				file.write pubkeytext + "\n"
 			end
 
 			`chown -R #{username}:#{username} /home/#{username}`
-			`chmod -R 0600 /home/#{username}/.ssh`
+			`chmod -R 0700 /home/#{username}/.ssh`
+			`chmod 0600 /home/#{username}/.ssh/authorized_keys`
 		rescue => e
 			puts "\r\nERROR! #{e.message}".background(:red).bright
 			raise e
@@ -77,9 +80,11 @@ class EasyMysql
 		mysql_admin_password = gets.chomp
 
 		begin
-			connection = self.makeMySQLConnection(mysql_admin_username, mysql_admin_password)
+			connection = Mysql::new('127.0.0.1', mysql_admin_username, mysql_admin_password)
 		rescue => e
-			puts "\r\nERROR! #{e.message}".background(:red).bright
+			puts ""
+			puts "ERROR! #{e.message}\n".background(:red).bright
+			puts ""
 			raise e
 		end
 
@@ -89,17 +94,15 @@ class EasyMysql
 		mysql_new_username = gets.chomp
 
 		begin
-			new_user = self.addMySQLUser(connection, mysql_new_username)
+			new_mysql_user_info = self.addMySQLUser(connection, mysql_new_username)
 		rescue => e
-			puts "\r\nERROR! #{e.message}".background(:red).bright
+			puts ""
+			puts "ERROR! #{e.message}\n".background(:red).bright
+			puts ""
 			raise e
 		end
 
-		return new_user
-	end
-
-	def self.makeMySQLConnection(username, password)
-		Mysql::new('127.0.0.1', username, password)
+		return new_mysql_user_info
 	end
 
 	def self.addMySQLUser(connection, new_username)
@@ -107,11 +110,12 @@ class EasyMysql
 
 		new_password = self.makeRandomPassword
 
-		query = "GRANT SELECT ON *.* TO `#{new_username}`@`127.0.0.1` IDENTIFIED BY '#{new_password}'";
+		query = "GRANT SELECT ON *.* TO `#{new_username}`@`localhost` IDENTIFIED BY '#{new_password}'";
+		puts query
 
 		connection.query(query)
 
-		return { username: new_username, password: new_password }
+		return { :username => new_username, :password => new_password }
 	end
 
 	def self.makeRandomPassword(len = 24)
@@ -129,7 +133,7 @@ class EasyMysql
 			return (97+rand(26)).chr
 		else
 			# numbers
-			return rand(9)
+			return rand(9).to_s
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-mysql
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,42 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
 description: A simple way to set up a secure MySQL connection.
-email: connormcarthur11@gmail.com
+email: 
 executables:
 - easy-mysql
 extensions: []