use_salesforce_dataloader 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ddaf30c25c5ec5c092d0de40e2477b622bfb441eae8fd9556432de57a19498d
-  data.tar.gz: 6f2c3c603164383be7326b7690d104cbbd394882476fe1e96b74234896b38916
+  metadata.gz: 8c205f7edd003200ca037bfc483f4ba77f9dbf5e32e2295462b3329a99fe6c5c
+  data.tar.gz: 13ad28263df44bf81a189335010dec9af3841d26b8e6e3c131889655e4112b72
 SHA512:
-  metadata.gz: 5e909679727ea08bc3f7e84c885821ba38e6241fbdaffe70cba12510fcf860d20c388fd0e772f721d4eb7ad29de30be17a7321d13a05cdb713c043ea0034d763
-  data.tar.gz: 7cdbe099b7a94449b8fe637246f78e16c6d78b417a0ab2a9ccc09430938784571e88db077cf653fa2d50fe3c2007861654a9b3d7eeb35d08c77a586619bd27a9
+  metadata.gz: ba23a81b62c2bf774f81bec39652650ef97ac719a84771070befd24539077f08a1806d3bfd1bb1c629e56ab6e147c95bd7ca83e6d74b703da6de3c275bb6fd8a
+  data.tar.gz: 196ae184ecb6f452500912368be2c3d51477c9cf7ddca80db805b78ea58b13cfecddf822d5937ba1cf9d4e91fd3a88e6ad72785c142e2ca99846e0702fb0a923

data/lib/use_salesforce_dataloader.rb

@@ -9,7 +9,7 @@ require 'open3'
 #   - <tt>map.sdl</tt>
 #
 class UseSalesforceDataLoader
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 
   # Setter for <tt>@conf_dir</tt>, set values <tt>@conf_key_file</tt>, <tt>@conf_process_xml_file</tt> and <tt>@conf_map_file</tt> at the same time.
   def conf_dir=(path)
@@ -76,9 +76,10 @@ class UseSalesforceDataLoader
   # @param java [String] path of java runtime.
   # @param java_opt [String] command line option for java runtime.
   # @example
-  #   UseSalesforceDataLoader.new('/usr/lib/dataloader-41.0.0-uber.jar', '/usr/bin/java', '-Dfile.encoding=UTF-8')
+  #   UseSalesforceDataLoader.new('/usr/lib/dataloader-42.0.0-uber.jar', '/usr/bin/java', '-Dfile.encoding=UTF-8')
   #
-  def initialize(jar, java = nil, java_opt = nil)
+  def initialize(jar, java = nil, java_opt = nil, dataloader_major_version: 42)
+    @dataloader_major_version = dataloader_major_version
     java = exec_command('which java') unless java
     path_check(java)
     path_check(jar)
@@ -108,11 +109,14 @@ class UseSalesforceDataLoader
   # @see #conf_key_file
   # @return [String] conf_key_file
   def save_conf_key_file
-    @conf_key_file.tap do |f|
-      open(f, 'w:UTF-8') do |o|
+    if @dataloader_major_version < 43
+      open(@conf_key_file, 'w:UTF-8') do |o|
         o.print encrypt("-g #{text_seed}")
       end
+    else
+      encrypt("-k '#{@conf_key_file}'")
     end
+    @conf_key_file
   end
 
   # Save conf xml file
@@ -137,34 +141,38 @@ class UseSalesforceDataLoader
       .join
       .chomp
     PROCESS_XML_TEMPLATE % [@bean_id,
-                            @bean_descrption,
+                            @bean_description,
                             @property_name,
                             entries_xml]
   end
 
   # @note
   #
-  #   Original:
-  #
-  #   dataloader/bin/encrypt.sh
-  #
-  #   Usage: dataloader/bin/encrypt.sh
-  #
-  #   Utility to encrypt a string based on a static or a provided key
-  #
-  #   Options (mutually exclusive - use one at a time):
-  #
-  #   -g <seed text> Generate key based on seed
+  # ref. https://github.com/forcedotcom/dataloader/commit/dda55319ebf741b3fc3e2baf45d49b82e598f2fa#diff-8943e367622f270c051690266c3b9d44
   #
-  #   -v <encrypted> <decrypted value> [Path to Key] Validate whether decryption of encrypted value matches the decrypted value, optionally provide key file
+  # $ java -cp ./lib/dataloader-43.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil
+  # Utility to encrypt a string based on a static or a provided key
+  # Options (mutually exclusive - use one at a time):
+  # -e <plain text> <Path to keyfile>                Encrypt a plain text value, keyfile path
+  # -d <encryptText> <Path to keyfile>               Decrypt an encrypted text back to plain text value using keyfile
+  # -k [Path to Keyfile]                             Generate keyfile with optional keyfile path
   #
-  #   -e <plain text> [Path to Key]                  Encrypt a plain text value, optionally provide key file (generate key using option -g)
+  # $ java -cp ./lib/dataloader-42.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil
+  # Utility to encrypt a string based on a static or a provided key
+  # Options (mutually exclusive - use one at a time):
+  # -g <seed text>                                 Generate key based on seed
+  # -v <encrypted> <decrypted value> [Path to Key] Validate whether decryption of encrypted value matches the decrypted value, optionally provide key file
+  # -e <plain text> [Path to Key]                  Encrypt a plain text value, optionally provide key file (generate key using option -g)
   #
   # internal use
   # @param [String] options
   # @return [String]
   def encrypt(options)
-    cmd = "#{@encrypt} #{options} | sed 's/^.*) \- //g'"
+    cmd = if @dataloader_major_version < 43
+            "#{@encrypt} #{options} | sed 's/^.*) \- //g'"
+          else
+            "#{@encrypt} #{options} | tail -1"
+          end
     exec_command(cmd)
   end
 
@@ -230,6 +238,7 @@ PROCESS_XML
 ENTRIES_XML
           
   # @note internal use
+  # ref. https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm
   BASE_ENTRIES = {
     'dataAccess.readUTF8'               => 'true',
     'dataAccess.writeUTF8'              => 'true',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_salesforce_dataloader
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Hiroaki Nagoya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hnagoya@gmail.com
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Force.com Apex Data Loader for Ruby/Linux - command line version