lisausa-knife-plugins 0.0.5 → 0.0.6

data/lib/chef/knife/setup_ssh.rb

@@ -2,16 +2,25 @@ require_relative '../../core_ext'
 require 'chef/knife'
 
 class LisausaKnifePlugins::SetupSsh < ::Chef::Knife
-  banner 'knife setup ssh'
+  banner 'knife setup ssh (options)'
 
   deps do
     require 'chef/shef/ext'
   end
 
+  option :write, long: '--write-file', boolean: true,
+      description: 'Write the config to your ~/.ssh/config (CAREFUL!)'
+
   # This method will be executed when you run this knife command.
   def run
     Shef::Extensions.extend_context_object(self)
-    config = []
+    ssh_config = []
+
+    ssh_config << "### BEGIN KNIFE BLOCK ###"
+    ssh_config << "## This was generated by `knife setup ssh`:"
+
+    STDOUT.sync = true
+
     nodes.all do |n|
       next if /vagrant/.match(n.name)
       name = n.name
@@ -19,17 +28,46 @@ class LisausaKnifePlugins::SetupSsh < ::Chef::Knife
 
       begin
         hostname = n.ipaddress
-      rescue
-        hostname = nil
+      rescue => ex
+        ui.warn("Error (#{ex.inspect}) while getting #ipaddress for #{n.name}")
+        next
       end
-      config << <<-END.strip_heredoc
-        Host #{name}
-          HostName #{hostname}
-      END
+
+      ssh_config << [
+        "Host #{name}",
+        "  HostName #{hostname}",
+        "  HostKeyAlias #{[name,hostname,n.macaddress].join('-')}"
+      ]
     end
 
-    ui.msg "Copy and paste the following into your ~/.ssh/config file:"
-    puts "## This is generated by `knife setup ssh`:\n\n#{config.join("\n")}"
+    if (c = Chef::Config.knife).keys.grep(/identity_file|ssh_user/).any?
+      ssh_config.push [
+        "Host *.lisausa.net",
+        "  IdentitiesOnly yes",
+        "  PasswordAuthentication no"
+      ]
+      ssh_config.push "  IdentityFile #{c[:identity_file]}" if c[:identity_file]
+      ssh_config.push "  User #{c[:ssh_user]}" if c[:ssh_user]
+    end
+
+    ssh_config << "### END KNIFE BLOCK ###"
+    ssh_config = ssh_config.flatten.join("\n")
+
+    file_path = File.join(ENV['HOME'], '.ssh', 'config')
+    if config[:write] or ui.ask_question("Write config to #{file_path} (Y/N)?", default: 'N').downcase == 'y'
+      FileUtils.copy_file(file_path, "#{file_path}~")
+      File.open(file_path, File::RDWR|File::CREAT) do |f|
+        f.flock(File::LOCK_EX)
+        contents = f.read.gsub(/### BEGIN KNIFE BLOCK ###.+?(### END KNIFE BLOCK ###|\Z)/m, ssh_config)
+        f.rewind
+        f.truncate(0)
+        f.write contents
+      end
+      ui.msg "Wrote to #{file_path}. Previous contents were backed up to #{file_path}~"
+    else
+      ui.msg "Copy and paste the following into your #{file_path} file:"
+      ui.msg ssh_config
+    end
   end
 
 end

data/lib/lisausa_knife_plugins.rb

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

data/lisausa-knife-plugins.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'chef'
 
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lisausa-knife-plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' These are plugins for the Chef utility `knife`, for use by LISAUSA
   employees '
 email:
@@ -74,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4271793852436981644
+      hash: -1816767679144316471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4271793852436981644
+      hash: -1816767679144316471
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23