eac_ruby_utils 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60224aa50261e8212946f7fb3cbe3efd1bef3ee6853bf827d78ca18810d81fc9
-  data.tar.gz: 2da01ff57939fc85b13fab89241c711526726681e547d0194565cad04b9ce811
+  metadata.gz: 8e04909bde0d65f8b8615601194b4fb9c1fb3b6b56f6bf02cd98103fe0510e7b
+  data.tar.gz: 902d0c69a54f0a0330c4e47afa498501b02beec6367c6d952f6d72f8388b74c5
 SHA512:
-  metadata.gz: 35bd1179d9dfdaf7f741f2cf054a379ed37018318955397996bdc8acd484d53b602efc9d383d2c9ee866db00dc306843c48e5c282812f56d08439a1f286c5b78
-  data.tar.gz: 4a937089189a97671ccfa8e30499fa0ddcc69843bdfd6a96232594e48c2019f20bcc02e653c597e2f086c6990437cb5c9d13b58287c4dc87817b0ea5d2a875e9
+  metadata.gz: cbaf478b74fbb77fff8682b733685773ad8c3de4eac8e5fc9c2adcca81fbeac56a5e4df330c0ffb60097f1c3d75b371270814b52ca1bd54ef77fa417adf55284
+  data.tar.gz: 947edd1f4ba4f942ba78ed5e17f99b95d1d89f456426437efa6c3eb35128c12b312fb628f962f0e123a38d8ea37c6fa7a135d1c4c4d7d1b6f9b6449e465458ed

data/lib/eac_ruby_utils/envs/ssh_env.rb

@@ -2,12 +2,14 @@
 
 require 'addressable'
 require 'eac_ruby_utils/envs/base_env'
+require 'eac_ruby_utils/patches/object/if_present'
 require 'net/ssh'
 require 'shellwords'
 
 module EacRubyUtils
   module Envs
     class SshEnv < ::EacRubyUtils::Envs::BaseEnv
+      IDENTITITY_FILE_OPTION = 'IdentityFile'
       USER_PATTERN = /[a-z_][a-z0-9_-]*/.freeze
       HOSTNAME_PATTERN = /[^@]+/.freeze
       USER_HOSTNAME_PATTERN = /\A(?:(#{USER_PATTERN})@)?(#{HOSTNAME_PATTERN})\z/.freeze
@@ -51,6 +53,7 @@ module EacRubyUtils
       def ssh_command_line
         r = %w[ssh]
         r += ['-p', uri.port] if uri.port.present?
+        ssh_identity_file.if_present { |v| r += ['-i', v] }
         r += ssh_command_line_options
         r << user_hostname_uri
         r.map { |a| Shellwords.escape(a) }.join(' ')
@@ -58,7 +61,9 @@ module EacRubyUtils
 
       def ssh_command_line_options
         r = []
-        uri.query_values&.each { |k, v| r += ['-o', "#{k}=#{v}"] }
+        uri.query_values&.each do |k, v|
+          r += ['-o', "#{k}=#{v}"] unless k == IDENTITITY_FILE_OPTION
+        end
         r
       end
 
@@ -67,6 +72,12 @@ module EacRubyUtils
         r = "#{uri.user}@#{r}" if uri.user.present?
         r
       end
+
+      def ssh_identity_file
+        uri.query_values.if_present do |v|
+          v[IDENTITITY_FILE_OPTION]
+        end
+      end
     end
   end
 end

data/lib/eac_ruby_utils/immutable/array_accessor.rb

@@ -18,6 +18,10 @@ module EacRubyUtils
         end
       end
 
+      def immutable_value_get(object)
+        super || []
+      end
+
       def immutable_value_set(object, value)
         duplicate_object(object) do |old_value|
           (old_value || []) + [value]

data/lib/eac_ruby_utils/immutable/hash_accessor.rb

@@ -11,6 +11,10 @@ module EacRubyUtils
         apply_set(klass)
       end
 
+      def immutable_value_get(object)
+        super || {}
+      end
+
       def immutable_value_set(object, key, value)
         duplicate_object(object) do |old_value|
           (old_value || {}).merge(key => value)

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.40.0'
+  VERSION = '0.41.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport