metaforce 1.0.1 → 1.0.2

data/lib/metaforce/cli.rb

@@ -16,7 +16,7 @@ module Metaforce
         method_option :username, :aliases => '-u', :desc => 'Username.'
         method_option :password, :aliases => '-p', :desc => 'Password.'
         method_option :security_token, :aliases => '-t', :desc => 'Security Token.'
-        method_option :environment, :aliases => '-e', :default => 'production', :desc => 'Environment to use from config file (if present).'
+        method_option :environment, :aliases => '-e', :default => 'default', :desc => 'Environment to use from config file (if present).'
         method_option :host, :aliases => '-h', :desc => 'Salesforce host to connect to.'
       end
 
@@ -37,7 +37,7 @@ module Metaforce
     def deploy(path)
       say "Deploying: #{path} ", :cyan
       say "#{options[:deploy_options].inspect}"
-      client(options).deploy(path, options[:deploy_options].symbolize_keys!)
+      client.deploy(path, options[:deploy_options].symbolize_keys!)
         .on_complete { |job| report job.result, :deploy }
         .on_error(&error)
         .on_poll(&polling)
@@ -56,7 +56,7 @@ module Metaforce
       end
       say "Retrieving: #{manifest} ", :cyan
       say "#{options[:retrieve_options].inspect}"
-      client(options).retrieve_unpackaged(manifest, options[:retrieve_options].symbolize_keys!)
+      client.retrieve_unpackaged(manifest, options[:retrieve_options].symbolize_keys!)
         .extract_to(path)
         .on_complete { |job| report(job.result, :retrieve) }
         .on_complete { |job| say "Extracted: #{path}", :green }
@@ -100,8 +100,8 @@ module Metaforce
       proc { |job| say 'Polling ...', :cyan }
     end
 
-    def client(options)
-      credentials = Thor::CoreExt::HashWithIndifferentAccess.new(config ? config[options[:environment]] : {})
+    def client
+      credentials = Thor::CoreExt::HashWithIndifferentAccess.new(environment_config)
       credentials.merge!(options.slice(:username, :password, :security_token, :host))
       credentials.tap do |credentials|
         credentials[:username] ||= ask('username:')
@@ -112,6 +112,10 @@ module Metaforce
       Metaforce.new credentials
     end
 
+    def environment_config
+      (config && config[options[:environment]]) ? config[options[:environment]] : {}
+    end
+
     def config
       YAML.load(File.open(config_file)) if File.exists?(config_file)
     end

data/lib/metaforce/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: