eac_ruby_utils 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3b0b5ef098921d30e344ef1a171ac78d73ac7211
-  data.tar.gz: 5371f658aff9733d7188a5d2af8849116e645f36
+SHA256:
+  metadata.gz: 5039f5c4f347e71881361fb3bcc462ebd88ee5bcd0140a677be9583591a34d40
+  data.tar.gz: 29e602fb349f046175a50b770433eccf92070aec71c8d7d8a3b41976254669d3
 SHA512:
-  metadata.gz: a8b331f6653deff846c6fccaf5adac0841d35a910f09767498d6fd6647cafdaf32dc597459c8183f697c035694977d7bbcf636701622df747ec805e852c8245f
-  data.tar.gz: 8d6c858e2aa27688bb3c758a8572b53c3a31e6395aae94b4922c730a173b27a41fe7b14fcbca677e10514f448ab4c7d984e67379f1e7ec655956d86f86c8cdaf
+  metadata.gz: 1661013b929f15161d7288505dd7afa52e4f29354a7788d4f1adff038e804bb11c4c6ef7f3b1cf10f959bdda299617247a88125c106b75501adc6edcbc5531f6
+  data.tar.gz: 9fabf390c9845c25b059b4321858d17ab7ee57f36c6ccfd6b7be977c5dac1f97b20a82ad35e11b5e633e5e7c53a14a804f5833fe4f1d66590994c36e0c1ede7b

data/lib/eac_ruby_utils/envs/ssh_env.rb

@@ -1,16 +1,51 @@
 module EacRubyUtils
   module Envs
     class SshEnv < ::EacRubyUtils::Envs::BaseEnv
-      def initialize(user_hostname)
-        @user_hostname = user_hostname
+      class << self
+        def parse_uri(uri)
+          r = parse_user_hostname(uri) || ::Addressable::URI.parse(uri)
+          return r if r.scheme == 'ssh'
+          raise "URI has no SSH scheme: #{uri}"
+        end
+
+        private
+
+        def parse_user_hostname(s)
+          m = /\A([^@]+)@([^@]+)\z/.match(s)
+          m ? ::Addressable::URI.new(scheme: 'ssh', host: m[2], user: m[1]) : nil
+        rescue Addressable::URI::InvalidURIError
+          nil
+        end
+      end
+
+      def initialize(uri)
+        @uri = self.class.parse_uri(uri)
       end
 
       def to_s
-        "SSH(#{@user_hostname})"
+        uri.to_s
       end
 
       def command_line(line)
-        "ssh #{Shellwords.escape(@user_hostname)} #{Shellwords.escape(line)}"
+        "#{ssh_command_line} #{Shellwords.escape(line)}"
+      end
+
+      private
+
+      attr_reader :uri
+
+      def ssh_command_line
+        r = %w[ssh]
+        r += ['-p', uri.port] if uri.port.present?
+        r += ssh_command_line_options
+        r << "#{uri.user}@#{uri.host}"
+        r.map { |a| Shellwords.escape(a) }.join(' ')
+      end
+
+      def ssh_command_line_options
+        r = []
+        uri.query_values.each { |k, v| r += ['-o', "#{k}=#{v}"] } if uri.query_values
+        r
       end
     end
   end

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Utilities for E.A.C.'s Ruby projects.