ssh-host-lister 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 702affa345f01f04a1d19f1082b799f15072807c
-  data.tar.gz: 0d80852e5c8b00c4f271e0676e114a9acdbf18cd
+SHA256:
+  metadata.gz: 990e9e914a0b7bfef0cc9faa050facc6095a33a8b07ff25a753b7f2b57e14190
+  data.tar.gz: a5e711f556c084e8fd5c480910c72289ef0c4ba571a8b4247063f6fc2418882e
 SHA512:
-  metadata.gz: 1a512e8a326ec81a0417d82cf91f6eef580e6d0266e56196c095f585f92ceda4b181b6e11b3e7123213638235d482e9de2cb4d497d0ebef1c807f83f5699e0ed
-  data.tar.gz: 72fe87223649a8f3af001b3596513bc78a63a115c4eb836e84c0e55f31a0777707265d241f2a06c4790ff86be1dbf733cf1e111bb65ba3d50743fd5e94587e2f
+  metadata.gz: 3bf891ba73c69f18f292c0e7310216d7de8704bca875eb9edd17a52e79898466fe1223701cf72ba2a024cefde31247ddc6dac0f30578fbcdbd09711ca466ea4c
+  data.tar.gz: 451f13069375f981e1278c4dcdf323af7e3e2c9985ab2194021ebcebd5f3a4a583df992a6bc8054748dc37aa482b8aeed0fe4054fd76935ac75a0ebad4542a76

data/lib/ssh_config/entry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SshConfig
-  # SshHost represents a single Host entry in an ssh_config(5)
+  # Entry represents a single Host entry in an ssh_config(5)
   class Entry
     attr_reader :user
 

data/lib/ssh_config/loader.rb

@@ -5,42 +5,46 @@ module SshConfig
   # For loading an ssh_config(5) file.
   class Loader
     def parse(str)
-      pr = ParseRun.new
+      parse_lines(str.to_str.split(/[\n\r]+/))
+    end
 
-      str
-        .to_str
-        .split(/[\n\r]+/)
-        .each do |line|
+    def parse_lines(strings)
+      Array(strings).map(&:to_str).each do |line|
+        p_include(Regexp.last_match(1)) if line =~ /^\s*Include\s+(.*)/
+        p_host(Regexp.last_match(1)) if line =~ /^\s*Host\s+(.*)/
+      end
 
-          pr.parse_host(Regexp.last_match(1)) if line =~ /^\s*Host\s+(.*)/
-        end
+      results
+    end
 
-      pr.results
+    def results
+      @results ||= {}
     end
-  end
 
-  # Internal method for parsing
-  class ParseRun
-    def parse_host(arg)
+    private
+
+    def p_host(arg)
       hosts = arg
         .split(/\s+/)
         .reject { |host| host =~ /^\d|%|\*/ }
 
-      return if hosts.empty?
-      entry = Entry.new(hosts)
-      entry.distinct_names.each { |host| results[host] = entry }
+      add_entry(Entry.new(hosts)) unless hosts.empty?
     end
 
-    def results
-      @results ||= {}
+    def p_include(glob)
+      old_dir = Dir.pwd
+      begin
+        Dir.chdir File.expand_path('~/.ssh')
+        Dir[glob.chomp].each do |fname|
+          parse(File.read(fname))
+        end
+      ensure
+        Dir.chdir old_dir
+      end
     end
 
-    private
-
-    attr_writer :entry
-
-    def entry
-      @entry ||= nil
+    def add_entry(entry)
+      entry.distinct_names.each { |host| results[host] = entry }
     end
   end
 end

data/ssh-host-lister.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'ssh-host-lister'
-  spec.version       = '0.2.1'
+  spec.version       = '0.3.0'
   spec.authors       = ['Christian Höltje']
   spec.email         = ['docwhat@gerf.org']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssh-host-lister
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Christian Höltje
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Lists unique, short host names ssh_config(5)