metaforce 1.0.2 → 1.0.3

data/README.md

@@ -28,6 +28,19 @@ client = Metaforce.new :username => 'username',
   :security_token => 'security token'
 ```
 
+Or you can specify the username, password and security token with environment
+variables:
+
+```bash
+export SALESFORCE_USERNAME="username"
+export SALESFORCE_PASSWORD="password"
+export SALESFORCE_SECURITY_TOKEN="security token"
+```
+
+```ruby
+client = Metaforce.new
+```
+
 #### Asynchronous Tasks
 
 Some calls to the SOAP API's are performed asynchronously (such as deployments),

data/lib/metaforce.rb

@@ -23,7 +23,10 @@ module Metaforce
 
     # Performs a login and retrurns the session
     def login(options={})
-      Login.new(options.delete(:username), options.delete(:password), options.delete(:security_token)).login
+      username       = options.fetch(:username, ENV['SALESFORCE_USERNAME'])
+      password       = options.fetch(:password, ENV['SALESFORCE_PASSWORD'])
+      security_token = options.fetch(:security_token, ENV['SALESFORCE_SECURITY_TOKEN'])
+      Login.new(username, password, security_token).login
     end
   end
 end

data/lib/metaforce/version.rb

@@ -1,3 +1,3 @@
 module Metaforce
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/lib/metaforce_spec.rb

@@ -11,10 +11,32 @@ describe Metaforce do
   describe '#login' do
     let(:args) { {:username => 'foo', :password => 'foobar', :security_token => 'whizbang'} }
 
-    it 'proxies the login call' do
-      Metaforce::Login.should_receive(:new).with('foo', 'foobar', 'whizbang').and_call_original
-      Metaforce::Login.any_instance.should_receive(:login)
-      described_class.login args
+    context 'when environment variables are not defined' do
+      it 'proxies the login call' do
+        Metaforce::Login.should_receive(:new).with('foo', 'foobar', 'whizbang').and_call_original
+        Metaforce::Login.any_instance.should_receive(:login)
+        described_class.login args
+      end
+    end
+
+    context 'when environment variables are defined' do
+      before do
+        ENV['SALESFORCE_USERNAME'] = args[:username]
+        ENV['SALESFORCE_PASSWORD'] = args[:password]
+        ENV['SALESFORCE_SECURITY_TOKEN'] = args[:security_token]
+      end
+
+      after do
+        ENV.delete('SALESFORCE_USERNAME')
+        ENV.delete('SALESFORCE_PASSWORD')
+        ENV.delete('SALESFORCE_SECURITY_TOKEN')
+      end
+
+      it 'proxies the login call' do
+        Metaforce::Login.should_receive(:new).with('foo', 'foobar', 'whizbang').and_call_original
+        Metaforce::Login.any_instance.should_receive(:login)
+        described_class.login
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon