sf_migrate 1.2.5 → 1.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDZkOTg4YzI5MTJmMTIwNjkxYTAxMjE1N2QyOTc5NmY5YzQyMGE4NQ==
+    OTNkZTM5OWVjMDdkODA0MzNjMGE2OGU4ZmZjOWNhN2ZlNzMwZDQ5NQ==
   data.tar.gz: !binary |-
-    YzZkNmE1ZjUyZWJiNDE1MTc1ZmM0NmI3YTNkNDZiYmEzZmM1MmViMg==
+    NTNkNWZhNDYyNzc5ODc2NTFjZThlMWU1ZTBmZjY0MTVhNjIzOGM4NA==
 SHA512:
   metadata.gz: !binary |-
-    M2Q2NzZmMTU4ODBhZDA0MDJmMDMwZjY2NTRkZTA1NDhiN2Y2ZWY2YzEwY2Y0
-    MTQwOGEzY2ViMzgzYmVlMWY4MjZmZmM3ZTg4YTFiZjMzZjE4MWQzMGRmYTNk
-    YzhlMzVhMTZlN2IyZmNlY2YwZTAxMmMxNmRiODI5MGRmM2ViMWI=
+    NWMyZWNlMjA0NzMyMDc5ZWNiNmZhM2VhOTkzMjhlOWZjYTgwMGUwOGE0MTlj
+    ODAxMzhmMTA5NGEyMjhjZDU4ZWZmNTA1NGZlZWFmMGVmYmZlNjE4NTc3MDA4
+    YjQ0N2QyZGJmYzdlYmQwN2IzNzM4ZTBmZTczYTM3NjJjOTViMGQ=
   data.tar.gz: !binary |-
-    OWIyYzMwNWZlYjY5OTk4Nzc5N2VlYWJjNmY2ZjE5OGU2ZmUyMWE3NzQ5OWNh
-    OTc3NTU2YmJlNDZlODlkMmE2MmNkOGMwNmY2ZDFhYmM1YTRkNTU2ODJmZmFk
-    Yzc0YWE0NWY0NGM4NTQ4OTg4YWMzZjY3MWI3MDAzY2M3OWI3OTM=
+    YTEyMmEwYjIzZGEwOGQ0MzQ4NjdhYmE5YmFiNTJhNGVhYjg4NGU3OWFjZmVh
+    MjQ4YTFiN2E3ODhmZTE3ZTE4MzQzYjliMjA5YzU3NDg0YWZhN2I2YTRmYWU0
+    YWUwNGQyYWFlMWNjNDFiMzBlNDNkYWRhOTdjODBiMDA1YTRlZGI=

data/lib/export.rb

@@ -6,11 +6,10 @@ module SalesforceMigration
     #
     # @param [Hash] options hash representing passed command line options
     def initialize(options)
-      credentials         = YAML.load_file(options[:config_file])
-      consumer_key        = credentials['salesforce_consumer_key']
-      consumer_secret     = credentials['salesforce_consumer_secret']
-      username            = credentials['salesforce_username']
-      password            = credentials['salesforce_password']
+      consumer_key        = $credentials['salesforce_consumer_key']
+      consumer_secret     = $credentials['salesforce_consumer_secret']
+      username            = $credentials['salesforce_username']
+      password            = $credentials['salesforce_password']
       @csv_dir            = options[:csv_dir]
       @action             = options[:action]
       @last_modified_date = options[:last_modified_date]

data/lib/import.rb

@@ -15,12 +15,7 @@ module SalesforceMigration
     #
     # @param [Hash] options hash representing passed command line options
     def initialize(options)
-      credentials = YAML.load_file(options[:config_file])
-      url      = credentials['sugar_url']
-      username = credentials['sugar_username']
-      password = credentials['sugar_password']
       @csv_dir = options[:csv_dir]
-      SugarCRM.connect(url, username, password)
       @action = options[:action]
       @isos, @agents, @merchants, @bank_accounts, @agent_users, @iso_users, @emails  = [], [], [], [], [], [], []
       @payment_to_merchants, @emails_to_merchants, @acquirers, @contracts, @users = [], [], [], [],  []

data/lib/mailer.rb

@@ -13,8 +13,6 @@ module SalesforceMigration
                         :authentication       => nil,
                         :enable_starttls_auto => true}
 
-      SugarCRM.connect(@@config['sugar_url'], @@config['sugar_username'], @@config['sugar_password'])
-      
       @logger = SalesforceMigration::Runner::create_logger
       @logger.info("Starting the mailer")
       start

data/lib/sf_migrate.rb

@@ -54,6 +54,8 @@ module SalesforceMigration
 			end
 			optparse.parse!
 			begin
+				$credentials = YAML.load_file(options[:config_file])
+				SugarCRM.connect($credentials['sugar_url'], $credentials['sugar_username'], $credentials['sugar_password'])
 				SalesforceMigration::Export.new(options) if options[:action]
 				SalesforceMigration::Import.new(options) if options[:action]
 				SalesforceMigration::Mailer.new(options) if options[:send_mail]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sf_migrate
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Emil Petkov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugarcrm_emp