fulmar 1.7.5 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21eff8bc3cf11335690de38f4e3903ec3f59b170
-  data.tar.gz: 6f03076d288c0704c75ac30e1d274d5747d5a714
+  metadata.gz: 2d20b737b6af1583286258dc2f016a9e513efb35
+  data.tar.gz: 9b422f9364ec4c4ce227734bf0fb01efe5faf2ac
 SHA512:
-  metadata.gz: f07c2ff44a86b15b5190bffd699a3bfc5e6cd780361db9364fde401d808d957d9f78462d6e902aecdd0b6704f1abfdbfdf84e913a79306578278f705e343077b
-  data.tar.gz: 6db7c318dda2c0a6f9c5087bdaf5ef66795dca43b136298ee6c08ea82dc84c12b524ff2913c380227871b19bfaeef3e974d3d00ffa7c8328054fc6345a66ceea
+  metadata.gz: f86764318b194d621a9259ed8b08b39bc647a3a3a7c03e9ea7721829220da70e95d2a36e3f063920890bd39e1b4a8c5a61b45c1bef3ab3a7b0d024122bb46004
+  data.tar.gz: 55a2081e314963646e7c22d4db62d4118b001f3ea6a7643c6dae3364a29fe0a72a4b050840829bfcbdb4bb5fbc5b4eb361f05bdbb971990229333e13344e0a49

data/lib/fulmar/infrastructure/service/ssh_config_service.rb

@@ -7,6 +7,15 @@ module Fulmar
       class SSHConfigService
         CONFIG_FILE = "#{ENV['HOME']}/.ssh/config"
         KNOWN_HOST_FILE = "#{ENV['HOME']}/.ssh/known_hosts"
+        CONFIG_MAP = {
+          hostname: 'Hostname',
+          port: 'Port',
+          user: 'User',
+          proxycommand: 'ProxyCommand',
+          checkhostip: 'CheckHostIP',
+          stricthostkeychecking: 'StrictHostKeyChecking',
+          identityfile: 'IdentityFile'
+        }
 
         def initialize(config)
           @config = config
@@ -21,7 +30,7 @@ module Fulmar
             if host_exists?(data[:hostname])
               puts "Host #{data[:hostname]} exists, skipping..." if @config[:debug]
             else
-              add_host(data[:hostname], data)
+              add_host(data[:hostname], data[:ssh_config])
             end
           end
         end
@@ -30,7 +39,7 @@ module Fulmar
           input_file = File.open(KNOWN_HOST_FILE, 'r')
           output_file = File.open(KNOWN_HOST_FILE + '.temp', 'w')
           while (line = input_file.gets)
-            output_file.puts(line) unless /^\[?#{hostname.gsub('.', '\\.')}(?:\]:\d+)? /.match(line)
+            output_file.puts(line) unless /^\[?#{hostname.gsub('.', '\\.')}(?:\]:\d+)?[ ,]/.match(line)
           end
           input_file.close
           output_file.close
@@ -51,17 +60,20 @@ module Fulmar
         end
 
         # Adds a host to the ssh config file
-        def add_host(hostname, host_config = {})
-          puts "Adding host #{host_config[:hostname]}..." if @config[:debug]
+        def add_host(hostname, ssh_config = {})
+          puts "Adding host #{hostname}..." if @config[:debug]
           config_file = File.open(CONFIG_FILE, 'a')
 
+          unless ssh_config[:identityfile].blank? or ssh_config[:identityfile][0, 1] == '/'
+            ssh_config[:identityfile] = @config.base_path + '/' + ssh_config[:identityfile]
+          end
+
           config_file.puts "\n" # Add some space between this and the second last entry
           config_file.puts "# Automatically generated by fulmar for project #{@config.project.description}"
           config_file.puts "Host #{hostname}"
-          config_file.puts "    Hostname #{host_config[:config_hostname]}" unless host_config[:config_hostname].blank?
-          config_file.puts "    Port #{host_config[:config_port]}" unless host_config[:config_port].blank?
-          config_file.puts "    User #{host_config[:config_user]}" unless host_config[:config_user].blank?
-          config_file.puts "    ProxyCommand #{host_config[:config_proxycommand]}" unless host_config[:config_proxycommand].blank?
+          CONFIG_MAP.keys.each do |key|
+            config_file.puts "    #{CONFIG_MAP[key]} #{ssh_config[key]}" unless ssh_config[key].blank?
+          end
 
           config_file.close
         end
@@ -69,7 +81,7 @@ module Fulmar
         private
 
         def config_valid?(host_config)
-          (!host_config[:hostname].blank? && !host_config[:config_hostname].blank?)
+          (!host_config[:hostname].blank? && !host_config[:ssh_config].nil?)
         end
       end
     end

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '1.7.5'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.0
 platform: ruby
 authors:
 - Jonas Siegl