salesforce-deploy-tool 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017c01cab1d76fa386f3d7ce393179bfc4f90e5e
-  data.tar.gz: ebd31823a6824baf96f2dd932a8be0bd04b99682
+  metadata.gz: fad8de757cf36572a02786cc1cb215ee881c87d2
+  data.tar.gz: 17136965e98bddbe06fd4c28e2e189c0265e1ddd
 SHA512:
-  metadata.gz: 4bb293aac72a795e695f3cd7883f7a7ccdc6ed1182a5a4b07986231349e83c905e79b880ed343147dc25ec3bfbae561b6127cdb94db7a1046fd8f3094fdb4d19
-  data.tar.gz: 8230741c51cec8be54a6f4cf9608b3170829dd3cf8a6fb794ee0284a85222743be988f5f16b445173dbb31017caef5c627574ed832d310daafeb488ed7fc5be9
+  metadata.gz: 897cf3aba5186e2a8eb2bd3740f2295824bcb2e3390584f706933052044712dc9b6b11abf4f0eb16259944f44d258ef21a7335ed0912e3a4c23d89bc1b45afcd
+  data.tar.gz: 8aa320556bc9183abe9f6e354184a281f69fc3335bf82bce2625c6caff61671d4e64bac57d05933bef636566c6d637b84ac61ad5dd27bc53edfbc4ced8eb51e1

data/bin/sf

@@ -1,16 +1,28 @@
 #!/usr/bin/env ruby
 require 'yaml'
+require 'fileutils'
+require 'pp'
+
+CONFIG_DIR = '~/.sf'
+CONFIG_FILE = '~/.sf/credentials.yaml'
+GLOBAL_CONFIG_FILE = '~/.sf/salesforce.yaml'
+SANDBOX_CONFIG_FILE = '~/.sf/salesforce.sbox'
+
+FileUtils.mkdir File.expand_path CONFIG_DIR if not Dir.exists? File.expand_path CONFIG_DIR
+
+config = {}
+[CONFIG_FILE,GLOBAL_CONFIG_FILE].each do |file|
+  file = File.expand_path file
+  if File.exists? file
+    config_content = YAML::load(File.open(file).read)
+    config.merge! config_content if config_content
+  else
+    FileUtils.touch file
+  end
+end
 
-CONFIG_FILE = '~/.salesforce.yaml'
-SANDBOX_CONFIG_FILE = '~/.salesforce.sbox'
 
-config = nil
-if File.exists? File.expand_path CONFIG_FILE
-  config = YAML::load File.open(File.expand_path CONFIG_FILE).read 
-else
-  puts "error: ~/.salesforce.yaml not found"
-  exit 1
-end
+pp config
 
 begin
   sandbox = File.open(File.expand_path(SANDBOX_CONFIG_FILE)).read
@@ -177,11 +189,11 @@ command :config do |c|
 
     config_new[:username] = ask "Please enter your SalesForce production login user name" do |q|
       q.validate = /^[\.@a-zA-Z\s]+$/ 
-    end
+    end.to_s
 
     config_new[:password] = ask "Please enter your Salesforce production password" do |q|
       q.echo = "x"
-    end
+    end.to_s
 
     git_name = ask "Please enter your Full name to be used as commit owner on GIT" do |q|
       q.validate = /^[a-zA-Z\s]+$/ 
@@ -191,13 +203,13 @@ command :config do |c|
       q.validate = /^.+@.+$/ 
     end
 
-    %x[git config --global user.email "#{git_email}"]
-    %x[git config --global user.name "#{git_name}"]
+    #%x[git config --global user.email "#{git_email}"]
+    #%x[git config --global user.name "#{git_name}"]
 
-    config[:username] = config_new[:username].to_s
-    config[:password] = config_new[:password].to_s
+    config[:username] = config_new[:username]
+    config[:password] = config_new[:password]
 
-    File.open(File.expand_path(CONFIG_FILE),'w').write config.to_yaml
+    File.open(File.expand_path(CONFIG_FILE),'w').write config_new.to_yaml
 
   end
 end

data/lib/salesforcedeploytool/version.rb

@@ -1,3 +1,3 @@
 module SalesforceDeployTool
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce-deploy-tool
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler