sconb 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 143b5ee22e1aec1cfa3abeda6d574e5184e79b74
-  data.tar.gz: db168ab3f7df31ed9bf00fc70fb786550f9f24b3
+  metadata.gz: ce50a910176ca5f5dbd57e32d2bfc18cfe882f3e
+  data.tar.gz: 2c05c98bf6f70c777d3893f020642444bebaa07c
 SHA512:
-  metadata.gz: 2194f42a4ff86c5f4f284709ae92e0d3f459277d055fd5bf4b2caf721e06cc4a1554a82a39cc18a1519a0544f358e8a99e84449e79594538dd5a2baded53cae6
-  data.tar.gz: 4f0308b33c7d137d8168bb8622ff2a2146f6cc6c837e99e3e6819ac29259c80bf2c4245779ef53bbb364e8d9600dda4b603aea79082cd88658eec203d54fd4f6
+  metadata.gz: c28afe40de5c5089c6a10d5f1603c7370c0231dc891c25e54d783aeaecc9d390c94ab4e536a9a7ff0cce33158a5850ee243d3e993b357109f52cf70c633693a7
+  data.tar.gz: f19acd9534c333f70313eced8c4c9b16fdfcb60feb9b2037675a818f4691b0004dd664b7f1bc7b251b36d914e807569c81f82e55e17c881dfe77681ab8de072e

data/lib/sconb/ext/net/ssh/config.rb

@@ -4,16 +4,15 @@ module Net
       class << self
         # Original code is Net::SSH::Config.load (https://github.com/net-ssh/net-ssh/blob/master/LICENSE.txt)
         # rubocop:disable all
-        def load_with_key(path, host, options)
+        def parse_with_key(content, host, options)
           settings = {}
-          file = File.expand_path(path)
-          return settings unless File.readable?(file)
+          return settings unless content
 
           globals = {}
           matched_host = nil
           multi_host = []
           seen_host = false
-          IO.foreach(file) do |line|
+          content.each_line do |line|
             next if line =~ /^\s*(?:#.*)?$/
 
             if line =~ /^\s*(\S+)\s*=(.*)$/

data/lib/sconb/ssh_config.rb

@@ -2,24 +2,28 @@ module Sconb
   module SSHConfig
     class << self
       def load(path, regexp_str = '.*', options = [])
-        @path = path
+        file = File.expand_path(path)
+        content = File.readable?(file) ? File.open(file).read : nil
+        parse(content, regexp_str, options)
+      end
+
+      def parse(content, regexp_str = '.*', options = [])
         @regexp = Regexp.new(regexp_str)
         @options = options
-        file = File.expand_path(@path)
+        @content = content
         @configs = {}
-        return @configs unless File.readable?(file)
-
-        @allconfig = Net::SSH::Config.load_with_key(@path, '*', @options)
+        return @configs if content.nil?
+        @allconfig = Net::SSH::Config.parse_with_key(@content, '*', @options)
         @configs['*'] = @allconfig unless @allconfig.size <= 1
-        IO.foreach(file) do |line|
-          parse(line)
+        @content.each_line do |line|
+          parse_line(line)
         end
         @configs
       end
 
       private
 
-      def parse(line)
+      def parse_line(line)
         return if line =~ /^\s*(?:#.*)?$/
         if line =~ /^\s*(\S+)\s*=(.*)$/
           key = Regexp.last_match[1]
@@ -35,7 +39,7 @@ module Sconb
           positive_hosts.each do |host|
             next if host == '*'
             next unless host.match @regexp
-            config = Net::SSH::Config.load_with_key(@path, host, @options)
+            config = Net::SSH::Config.parse_with_key(@content, host, @options)
 
             @allconfig.each do |k, _v|
               next unless config.key? k
@@ -50,7 +54,7 @@ module Sconb
         if key.downcase == 'match'
           match_key = key + ' ' + value
           return unless match_key.match @regexp
-          @configs[match_key] = Net::SSH::Config.load_with_key(@path, value, @options)
+          @configs[match_key] = Net::SSH::Config.parse_with_key(@content, value, @options)
         end
       end
     end

data/lib/sconb/version.rb

@@ -1,3 +1,3 @@
 module Sconb
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sconb
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - k1LoW