databasedotcom_console 0.0.4 → 0.0.5

data/bin/dbdc

@@ -2,35 +2,49 @@
 
 require 'databasedotcom_console'
 require 'irb'
+require 'io/console'
 
-ohnoes = false
-begin
-	# @dbdc = Databasedotcom::Client.new(
-	#           :client_id => '3MVG9QDx8IX8nP5RUXIFbi3L4rSVruiBU4O_ozvkJiU0aGZDBxfsF6XDhngJf6Ha2fDNniyDxpt0Gb9Pp.2Tk',
-	#           :client_secret => '7712607496533706277',
-	# 	  			:host => ARGV[0]
-	#         )
-	# @dbdc.authenticate( :username => ARGV[1], :password => ARGV[2] )
-	@dbdc = DatabasedotcomConsole.new_client(ARGV[0], ARGV[1], ARGV[2])
-rescue Exception => e
-	ohnoes = true
-	puts "ERROR: #{e.message}"
-	puts "\nOh Noes! Looks like an error occurred.  Make sure you include your salesforce credentials in the following format: \n"
-	puts "  >> dbdc [host] [username] [password]"
-	puts "\nwhere host is likely either \'test.salesforce.com\'' or \'login.salesforce.com\' \n"
-	puts "If your org requires a security token, please be sure to concatenate it at the end of your password. \n\n"
+### RANDOM UTIL METHOD
+def get_creds
+	creds = {}
+	print "HOST (test.salesforce.com, login.salesforce.com, etc): "
+	creds[:host] = gets.strip
+	print "USERNAME: "
+	creds[:un] = gets.strip
+	print "PASSWORD (and security token if necessary): "
+	creds[:pw] = STDIN.noecho(&:gets)
+	creds
 end
 
-unless ohnoes
-	puts "\n\nWelcome to the Databasedotcom Ruby Console.  \nYou you can access your databasedotcom client via the variable @dbdc"
-	puts "\nExamples: \n"
-	puts "@dbdc.list_sobjects"
-	puts "@dbdc.materialze \'Account\'"
-	puts "john = Account.find_by_LastName \'Yamaguchi\'"
-	puts "account_list = Account.query \'FirstName != null AND My_Custom_Field__C > 7 LIMIT 10\' \n"
-	puts "\n\n"
-	puts "Check out https://github.com/heroku/databasedotcom for more documentation on the databasedotcom gem\n\n"
-
+if ARGV[0] == "exec"
+	path = ARGV[1]
 	ARGV.clear
-	IRB.start
+	creds = get_creds
+	@dbdc = DatabasedotcomConsole.new_client(creds[:host], creds[:un], creds[:pw])
+	DatabasedotcomConsole::ScriptRunner.new(path, @dbdc)
+else
+	begin
+		creds = get_creds
+		@dbdc = DatabasedotcomConsole.new_client(creds[:host], creds[:un], creds[:pw])
+		
+		def dbdc
+			@dbdc
+		end
+
+		puts "\n\nWelcome to the Databasedotcom Ruby Console.  \nYou you can access your databasedotcom client via the variable @dbdc"
+		puts "\nExamples: \n"
+		puts "dbdc.list_sobjects"
+		puts "dbdc.materialze \'Account\'"
+		puts "john = Account.find_by_LastName \'Yamaguchi\'"
+		puts "account_list = Account.query \'FirstName != null AND My_Custom_Field__C > 7 LIMIT 10\' \n"
+		puts "\n\n"
+		puts "Check out https://github.com/heroku/databasedotcom for more documentation on the databasedotcom gem\n\n"
+
+		ARGV.clear
+		IRB.start
+	rescue Exception => e
+		puts "ERROR: #{e.message}"
+		puts "\nOh Noes! Looks like an error occurred.  Make sure you have correctly entered your salesforce credentials!\n"
+		puts "PROTIP: If your org requires a security token, please be sure to concatenate it at the end of your password. \n\n"
+	end
 end

data/foo.rb

@@ -0,0 +1 @@
+puts @dbdc.list_sobjects

data/lib/databasedotcom_console/version.rb

@@ -1,3 +1,3 @@
 module DatabasedotcomConsole
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/databasedotcom_console.rb

@@ -2,13 +2,6 @@ require "databasedotcom_console/version"
 require "databasedotcom"
 
 module DatabasedotcomConsole
-	clients = []
-
-	## Return a list of all clients
-	def self.clients
-		clients
-	end
-
 	## Create a new client for use with multiple orgs
 	def self.new_client(host, username, password)
 		client = Databasedotcom::Client.new(
@@ -17,8 +10,14 @@ module DatabasedotcomConsole
 		  				:host => host
 	        	)
 		client.authenticate(:username => username, :password => password)
-		#clients << client
 		client
 	end
 
+	class ScriptRunner
+		def initialize(path, connection)
+			@dbdc = connection
+			vars = binding
+			eval(File.read(path), vars) if path.class == String
+		end
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: databasedotcom_console
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -42,6 +42,7 @@ files:
 - Rakefile
 - bin/dbdc
 - databasedotcom_console.gemspec
+- foo.rb
 - lib/databasedotcom_console.rb
 - lib/databasedotcom_console/version.rb
 homepage: http://mavens.io/