Updating ssh adder code to make it much dumber. Should be ok if you a…

…ctually have SSH keys.
zivtech · Jun 18, 2013 · 9f58caf · 9f58caf
1 parent cc280a4
commit 9f58caf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -1,8 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+
 # Include our deploy command.
-# require File.dirname(__FILE__) + '/ssh-add.rb'
+if not is_windows
+  require File.dirname(__FILE__) + '/ssh-add.rb'
+end
 
 Vagrant.configure("2") do |config|
 
@@ -27,7 +31,7 @@ Vagrant.configure("2") do |config|
   end
   # NFS sharing does not work on windows, so if this is windows don't try to start it.
   require 'rbconfig'
-  is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+
   if not is_windows
     config.vm.synced_folder "web", "/var/www", :nfs => true
   else

diff --git a/ssh-add.rb b/ssh-add.rb
@@ -1,15 +1,17 @@
-require 'vagrant'
+# require 'vagrant'
 require 'net/ssh'
 
-module ZivtechKeyAdder
-  class Middleware < Vagrant::Command::SSH
-   def initialize(app, env, options = {})
-      @app = app
-      @env = env
-    end
+# TODO: This should actually be tied to `vagrant ssh`. Update for the new API.
 
-    def execute
-      with_target_vms(nil) do |vm|
+# module ZivtechKeyAdder
+#   class Middleware < Vagrant::Command::SSH
+#    def initialize(app, env, options = {})
+#       @app = app
+#       @env = env
+#     end
+
+#     def execute
+#       with_target_vms(nil) do |vm|
         agent = Net::SSH::Authentication::Agent.connect()
         rsaFound = false
         agent.identities().each do |identity|
@@ -19,15 +21,16 @@ def execute
         end
         if not rsaFound
           # If we are still running, no rsa key was found. Add one
-          @env.ui.info "No RSA key found, running ssh-add to add one."
+          # @env.ui.info "No RSA key found, running ssh-add to add one."
+          puts "No RSA key found, running ssh-add to add one."
           Kernel.system "ssh-add"
         end
         # Load and call the default SSH command middleware
-        sshCommand = Vagrant::Command::SSH.new @app, @env
-        sshCommand.execute()
-      end
-    end
-  end
-end
+        # sshCommand = Vagrant::Command::SSH.new @app, @env
+        # sshCommand.execute()
+#       end
+#     end
+#   end
+# end
 
-Vagrant.commands.register(:ssh) { ZivtechKeyAdder::Middleware }
+# Vagrant.commands.register(:ssh) { ZivtechKeyAdder::Middleware }