sconb 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 633f856637a76bba26ed83506c62ea187aa37b68
-  data.tar.gz: 2953d0670461bd8331d956daa6584215028ca8c4
+  metadata.gz: 5c5e18b93db4b66082d25aa8c270858e572d6bd5
+  data.tar.gz: 50eb6adc5e2756f97797b33b898ea70e5f570fa4
 SHA512:
-  metadata.gz: 5d6a82afbe9aa090ccd9ac9844f053dd507c38f9a9ef9366e98c9a8a3855eb0046603a1e5b30f1b5493b8848982d884213b347d28ae1d632444c868e0236b328
-  data.tar.gz: fc8c2c6c76d245e35f25ee655d3a2b90f4ede37894e1c0fb40b6578017cd8e1007c1e9173cd87f4a490d1c43afe5c069ec9da7e96571bbf6d7e67f12812d9a24
+  metadata.gz: 2221bdfc63d7912663c82af6181fd0951d4aeff590a6c88b14c1e9e1feb34417af493667f650490ec446502037dfd39563ec78f38529faecb7d8b6127c0b966c
+  data.tar.gz: f25ff865d164c8b821385e54376f108a9a6baed156e1fcb66ae42629d29399391719a360eac5fb2a12b4487c59e8fb2ece143ecdfa23d6aa97e1f7a673d63cf3

data/lib/sconb/version.rb

@@ -1,3 +1,3 @@
 module Sconb
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/sconb.rb

@@ -2,6 +2,7 @@ require "sconb/version"
 require "thor"
 require "net/ssh"
 require "json"
+require "pp"
 
 module Sconb
   class CLI < Thor
@@ -14,12 +15,12 @@ module Sconb
       file = File.expand_path(path)
       configs = {}
       unless File.readable?(file)
-        puts configs 
+        puts configs
         return
       end
-      
+
       allconfig = config_load(path, '*')
-      configs['*'] = allconfig unless allconfig.size == 1
+      configs['*'] = allconfig unless allconfig.size <= 1
       IO.foreach(file) do |line|
         next if line =~ /^\s*(?:#.*)?$/
         if line =~ /^\s*(\S+)\s*=(.*)$/
@@ -28,23 +29,32 @@ module Sconb
           key, value = line.strip.split(/\s+/, 2)
         end
         next if value.nil?
-        next unless key.downcase == 'host'
-        negative_hosts, positive_hosts = value.to_s.split(/\s+/).partition { |h| h.start_with?('!') }
-        positive_hosts.each do | host |
-          next if host == '*'
-          config = config_load(path, host)
-
-          allconfig.each do |key, value|
-            next unless config.key? key
-            config.delete key if config[key] == allconfig[key]
+
+        # Host
+        if key.downcase == 'host'
+          negative_hosts, positive_hosts = value.to_s.split(/\s+/).partition { |h| h.start_with?('!') }
+          positive_hosts.each do | host |
+            next if host == '*'
+            config = config_load(path, host)
+
+            allconfig.each do |key, value|
+              next unless config.key? key
+              config.delete key if config[key] == allconfig[key]
+            end
+
+            configs[host] = config
           end
+        end
 
-          configs[host] = config
+        # Match
+        if key.downcase == 'match'
+          configs[key + ' ' + value] = config_load(path, value)
         end
+
       end
       puts JSON.pretty_generate configs
     end
-    
+
     desc "restore < dump.json > .ssh/config", "Restore .ssh/config from JSON"
     def restore()
       ssh_configs = []
@@ -52,9 +62,13 @@ module Sconb
       configs = JSON.parse(json)
       configs.each do |host, config|
         ssh_config = ''
-        ssh_config << 'Host ' + host + "\n"
+        unless host.match(/^Match /)
+          ssh_config << 'Host ' + host + "\n"
+        else
+          ssh_config << host + "\n"
+        end
         config.each do |key, value|
-          next if key.downcase == 'host' || key.downcase == 'identityfilecontent'
+          next if key.downcase == 'host' || key.downcase == 'match' || key.downcase == 'identityfilecontent'
           if key.downcase == 'identityfile'
             value.each_with_index do |keyfile,i|
               ssh_config << '  ' + key + ' ' + keyfile + "\n"
@@ -103,7 +117,7 @@ module Sconb
       settings = {}
       file = File.expand_path(path)
       return settings unless File.readable?(file)
-      
+
       globals = {}
       matched_host = nil
       multi_host = []
@@ -136,9 +150,16 @@ module Sconb
           else
             matched_host = positive_hosts.select { |h| host =~ pattern2regex(h) }.first
           end
-
+          settings[key] = host unless matched_host.nil?
+          seen_host = true
+        elsif key.downcase == 'match'
+          if host == value
+            matched_host = true
+          else
+            matched_host = nil
+          end
+          settings[key] = host unless matched_host.nil?
           seen_host = true
-          settings[key] = host
         elsif !seen_host
           if key.downcase == 'identityfile'
             (globals[key] ||= []) << value

data/spec/config_test_multi

@@ -6,10 +6,13 @@ Host github.com
   TCPKeepAlive yes
   IdentitiesOnly yes
 
+Match exec "nmcli connection status id <ap-name> 2> /dev/null"
+  ProxyCommand ssh -W %h:%p github.com
+
 Host gist
   User git
   Port 22
   Hostname gist.github.com
   IdentityFile spec/github_rsa
   TCPKeepAlive yes
-  IdentitiesOnly yes
+  IdentitiesOnly yes

data/spec/sconb_spec.rb

@@ -40,6 +40,10 @@ OUT
     "TCPKeepAlive": "yes",
     "IdentitiesOnly": "yes"
   },
+  "Match exec \\"nmcli connection status id <ap-name> 2> /dev/null\\"": {
+    "Match": "exec \\"nmcli connection status id <ap-name> 2> /dev/null\\"",
+    "ProxyCommand": "ssh -W %h:%p github.com"
+  },
   "gist": {
     "Host": "gist",
     "User": "git",
@@ -111,6 +115,10 @@ OUT
     ],
     "TCPKeepAlive": "yes",
     "IdentitiesOnly": "yes"
+  },
+  "Match exec \\"nmcli connection status id <ap-name> 2> /dev/null\\"": {
+    "Match": "exec \\"nmcli connection status id <ap-name> 2> /dev/null\\"",
+    "ProxyCommand": "ssh -W %h:%p github.com"
   }
 }
 INN
@@ -135,6 +143,9 @@ Host gist
   IdentityFile spec/github_rsa
   TCPKeepAlive yes
   IdentitiesOnly yes
+
+Match exec "nmcli connection status id <ap-name> 2> /dev/null"
+  ProxyCommand ssh -W %h:%p github.com
 OUT
     end
   end

metadata

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