databasedotcom_console 0.0.8 → 0.0.9

data/bin/dbdc

@@ -1,65 +1,16 @@
 #!/usr/bin/env ruby
-require 'rubygems'
 require 'databasedotcom_console'
-require 'irb'
-
-def supported_ruby
-	this_ruby = RUBY_VERSION.dup
-	Gem::Version.new(this_ruby) >= Gem::Version.new("1.9.3")
-end
-
-require 'io/console' if supported_ruby
-require 'optparse'
-
-### RANDOM UTIL METHOD
-def get_creds(opts={})
-	creds = {}
-	if opts[:host]
-		creds[:host] = opts[:host]
-	else
-		print "HOST (test.salesforce.com, login.salesforce.com, etc): "
-		creds[:host] = gets.strip
-	end
-	if opts[:un]
-		creds[:un] = opts[:un]
-	else
-		print "USERNAME: "
-		creds[:un] = gets.strip
-	end
-	if opts[:pw]
-		creds[:pw] = opts[:pw]
-	else
-		print "PASSWORD (and security token if necessary): "
-		creds[:pw] = STDIN.noecho(&:gets) if supported_ruby
-		creds[:pw] = gets.strip unless supported_ruby		
-	end
-	creds
-end
-
-options = {}
-parser = OptionParser.new do |opts|
-	opts.banner = "Usage: dbdc [options]"
-	opts.on("-h","--host HOST","enter the host (login.salesforce.com or test.salesforce.com") do |arg|
-    options[:host] = arg
-  end
-  opts.on("-u","--username USERNAME","your username") do |arg|
-    options[:un] = arg
-  end
-  opts.on("-p","--password PASSWORD","your password") do |arg|
-    options[:pw] = arg
-  end
-end
-parser.parse!
+require 'databasedotcom_console/cli_tools'
 
 if ARGV[0] == "exec"
 	path = ARGV[1]
 	ARGV.clear
-	creds = get_creds(options)
+	creds = get_creds
 	@dbdc = DatabasedotcomConsole.new_client(creds[:host], creds[:un], creds[:pw])
 	DatabasedotcomConsole::ScriptRunner.new(path, @dbdc)
 else
 	begin
-		creds = get_creds(options)
+		creds = get_creds
 		@dbdc = DatabasedotcomConsole.new_client(creds[:host], creds[:un], creds[:pw])
 		
 		def dbdc

data/bin/restforce

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'databasedotcom_console'
+require 'databasedotcom_console/cli_tools'
+
+if ARGV[0] == "exec"
+  path = ARGV[1]
+  ARGV.clear
+  creds = get_creds
+  @rforce = DatabasedotcomConsole.new_restforce_client(creds[:host], creds[:un], creds[:pw])
+  DatabasedotcomConsole::ScriptRunner.new(path, @rforce)
+else
+  begin
+    creds = get_creds
+    @rforce = DatabasedotcomConsole.new_restforce_client(creds[:host], creds[:un], creds[:pw])
+    puts "\nWelcome to the Restforce Ruby Console.  \nYou you can access your restforce client via the variable: @rforce"
+    puts "Check out https://github.com/ejholmes/restforce for complete documentation on how to use the restforce gem\n\n"
+    ARGV.clear
+    IRB.start
+  rescue Exception => e
+    puts "ERROR: #{e.message}"
+    puts e.backtrace
+    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/databasedotcom_console.gemspec

@@ -30,10 +30,11 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://mavens.io/"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = ["dbdc"]
+  gem.executables   = ["dbdc", "restforce"]
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "databasedotcom_console"
   gem.require_paths = ["lib"]
   gem.add_runtime_dependency "databasedotcom"
+  gem.add_runtime_dependency "restforce"
   gem.version       = DatabasedotcomConsole::VERSION
 end

data/lib/databasedotcom_console.rb

@@ -1,18 +1,32 @@
 require "databasedotcom_console/version"
 require "databasedotcom"
+require "restforce"
+
+CLIENT_ID = '3MVG9QDx8IX8nP5RUXIFbi3L4rSVruiBU4O_ozvkJiU0aGZDBxfsF6XDhngJf6Ha2fDNniyDxpt0Gb9Pp.2Tk'
+CLIENT_SECRET = '7712607496533706277'
 
 module DatabasedotcomConsole
 	## Create a new client for use with multiple orgs
 	def self.new_client(host, username, password)
 		client = Databasedotcom::Client.new(
-	          	:client_id => '3MVG9QDx8IX8nP5RUXIFbi3L4rSVruiBU4O_ozvkJiU0aGZDBxfsF6XDhngJf6Ha2fDNniyDxpt0Gb9Pp.2Tk',
-	          	:client_secret => '7712607496533706277',
+	          	:client_id => CLIENT_ID,
+	          	:client_secret => CLIENT_SECRET,
 		  				:host => host
 	        	)
 		client.authenticate(:username => username, :password => password)
 		client
 	end
 
+	def self.new_restforce_client(host, username, password)
+		Restforce.new( 
+				:password => password,
+				:username => username,
+				:client_id => CLIENT_ID,
+				:client_secret => CLIENT_SECRET,
+				:host => host
+			)
+	end
+
 	class ScriptRunner
 		def initialize(path, connection)
 			@dbdc = connection

data/lib/databasedotcom_console/cli_tools.rb

@@ -0,0 +1,59 @@
+require 'rubygems'
+require 'databasedotcom_console'
+require 'irb'
+
+def supported_ruby
+  this_ruby = RUBY_VERSION.dup
+  Gem::Version.new(this_ruby) >= Gem::Version.new("1.9.3")
+end
+
+# run this once when the file is included.
+require 'io/console' if supported_ruby
+require 'optparse'
+@options = {}
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: <cmd> [options]"
+  
+  opts.on("-h","--host HOST","enter the host (login.salesforce.com or test.salesforce.com") do |arg|
+    @options[:host] = arg
+  end
+  
+  opts.on("-u","--username USERNAME","your username") do |arg|
+    @options[:un] = arg
+  end
+  
+  opts.on("-p","--password PASSWORD","your password") do |arg|
+    @options[:pw] = arg
+  end
+end
+parser.parse!
+
+### UTIL METHOD
+def get_creds
+  opts = @options
+  creds = {}
+  
+  if opts[:host]
+    creds[:host] = opts[:host]
+  else
+    print "HOST (test.salesforce.com, login.salesforce.com, etc): "
+    creds[:host] = gets.strip
+  end
+  
+  if opts[:un]
+    creds[:un] = opts[:un]
+  else
+    print "USERNAME: "
+    creds[:un] = gets.strip
+  end
+  
+  if opts[:pw]
+    creds[:pw] = opts[:pw]
+  else
+    print "PASSWORD (and security token if necessary): "
+    creds[:pw] = STDIN.noecho(&:gets) if supported_ruby
+    creds[:pw] = gets.strip unless supported_ruby		
+  end
+  
+  creds
+end

data/lib/databasedotcom_console/version.rb

@@ -1,3 +1,3 @@
 module DatabasedotcomConsole
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/start_console_test.rb

@@ -0,0 +1,24 @@
+=begin 	
+	TESTS TO COMPLETE
+	-	script runner initialize
+	- test running the executables
+=end
+
+require 'test/unit'
+require './lib/databasedotcom_console'
+class ConsoleStartTest < Test::Unit::TestCase
+	## Creds point to a DE org that exists solely for testing this gem.  If you want to hack a DE org that you can obtain for free, I feel sorry for you.
+	USERNAME = 'dbdcconsole@dfriedman.com'
+	PASSWORD = '321console'
+	HOST = 'login.salesforce.com'
+	def test_open_dbdc_console
+		client = DatabasedotcomConsole.new_client(HOST, USERNAME, PASSWORD)
+		assert_equal client.class, Databasedotcom::Client
+	end
+
+	def test_open_restforce_console
+		client = DatabasedotcomConsole.new_restforce_client(HOST, USERNAME, PASSWORD)
+		assert_equal client.class, Restforce::Client
+
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: databasedotcom_console
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: databasedotcom
@@ -27,11 +27,28 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: restforce
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Quickly spin up a ruby console that can talk to your salesforce org.
 email:
 - dfriedm3@gmail.com
 executables:
 - dbdc
+- restforce
 extensions: []
 extra_rdoc_files: []
 files:
@@ -41,10 +58,12 @@ files:
 - README.md
 - Rakefile
 - bin/dbdc
+- bin/restforce
 - databasedotcom_console.gemspec
 - lib/databasedotcom_console.rb
+- lib/databasedotcom_console/cli_tools.rb
 - lib/databasedotcom_console/version.rb
-- test/console_test.rb
+- test/start_console_test.rb
 homepage: http://mavens.io/
 licenses: []
 post_install_message: 
@@ -70,4 +89,4 @@ signing_key:
 specification_version: 3
 summary: Quickly spin up a ruby console that can talk to your salesforce org.
 test_files:
-- test/console_test.rb
+- test/start_console_test.rb

data/test/console_test.rb

@@ -1,7 +0,0 @@
-# Console Test
-require 'databasedotcom_console.rb'
-
-class TestDatabasedotcomConsole < Test::Unit::TestCase
-	def open_dbdc_console
-	end
-end