vagrant-proxyssh 0.1.1 → 0.2.0

data/README.md

@@ -16,14 +16,24 @@ SSH-setup.
 
 ## Installation
 
-Either use `vagrant gem`, or add a `gem "vagrant-proxyssh"` to your `Gemfile`.
+Use `vagrant gem install vagrant-proxyssh` if you have a packaged installation of Vagrant.
 
-Before first use, you can run `vagrant proxy-ssh --setup` to add the necessary
+Use `gem install vagrant-proxyssh` if you have Vagrant installed directly as a gem.
+
+Use `gem "vagrant-proxyssh"` if you bundle Vagrant in a `Gemfile`.
+
+Run `vagrant proxy-ssh --setup` somewhere with an active Vagrant to add the necessary
 configuration to `~/.ssh/config`.
 
-The setup routine is hard-coded for `rbenv`, and assumes Vagrant is bundled with
-each project. Simply modify the `ProxyCommand` line in `~/.ssh/config` if you use
-a system-Ruby, or RVM, or have Vagrant installed as a system gem.
+The setup routine assumes your login environment has the right Ruby-version in its path.
+
+### OS X
+
+On OS X, your login environment is determined by `~/.MacOSX/environment.plist`, and may
+not reflect what you have in your `.bashrc`, `.zshrc`, or such.
+
+Specifically, things may not work with Rubies installed with RVM, rbenv, or Homebrew,
+since none of the usual paths are in the default environment.
 
 
 ## Usage

data/bin/vagrant-proxy-ssh

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+vmname = ARGV[0].sub(/^vagrant-?/, '')
+
+port = 0
+
+raise "No Vagrant here" unless File.exist?('Vagrantfile')
+raise "No active Vagrant here" unless File.exist?('.vagrant')
+
+if ENV['PATH'].split(/:/).any? { |path| File.executable?("#{path}/VBoxManage") }
+	require 'json'
+	vmname = "default" if vmname == ""
+	vms = JSON.load(File.read('.vagrant'))["active"]
+	ssh_info = `VBoxManage showvminfo #{vms[vmname]} | grep 'name = ssh'`
+	port = ssh_info.match(/host port = (\d+),/)[1]
+else
+	cmd = 'bundle exec vagrant'
+	cmd = 'vagrant' if ENV['PATH'].split(/:/).any? { |path| File.executable?("#{path}/vagrant") }
+	port = `#{cmd} ssh-config #{vmname} | grep Port`.match(/Port (\d+)/)[1]
+end
+
+raise "Cannot find port-info for Vagrant host" if port == 0
+
+exec "nc", "127.0.0.1", port

data/lib/vagrant-proxyssh.rb

@@ -5,45 +5,34 @@ class Vagrant::Command::ProxySSH < Vagrant::Command::Base
 		options = {}
 
 		opts = OptionParser.new do |opt|
-			opt.banner = "Usage: <used by ssh>"
-			opt.separator "Helper used to create fake hostnames that proxy through to a VM"
-			opt.separator ""
+			opt.banner = "Usage: Helper to setup ~/.ssh/config for using vagrant-proxy-ssh"
 
 			opt.on("-s", "--setup", "Set up magic in ~/.ssh/config") do |o|
 				options[:setup] = o
 			end
 		end
 
-		argv = parse_options(opts)
+		parse_options(opts)
 
-		return if argv[0].nil?
+		return unless options[:setup]
 
-		vmname = argv[0].sub(/^vagrant-?/, '')
-		vmname = nil if vmname == ""
-
-		with_target_vms(vmname, :single_target => true) do |vm|
+		with_target_vms(nil, :single_target => true) do |vm|
 			raise Errors::VMNotCreatedError if !vm.created?
 			raise Errors::VMInaccessible if !vm.state == :inaccessible
 			raise Errors::VMNotRunningError if vm.state != :running
 
 			ssh_info = vm.ssh.info
 
-			if options[:setup]
-				File.open(File.expand_path("~/.ssh/config"), 'a') do |file|
-					file.puts
-					file.puts "Host vagrant*"
-					file.puts "  ProxyCommand rbenv exec bundle exec vagrant proxy-ssh %h"
-					file.puts "  User #{ssh_info[:username]}"
-					file.puts "  UserKnownHostsFile /dev/null"
-					file.puts "  StrictHostKeyChecking no"
-					file.puts "  PasswordAuthentication no"
-					file.puts "  IdentityFile #{ssh_info[:private_key_path]}"
-					file.puts "  IdentitiesOnly yes"
-				end
-			else
-				raise Errors::SSHPortNotDetected if ssh_info[:port].nil?
-
-				exec 'nc', '127.0.0.1', ssh_info[:port].to_s
+			File.open(File.expand_path("~/.ssh/config"), 'a') do |file|
+				file.puts
+				file.puts "Host vagrant*"
+				file.puts "  ProxyCommand #{cmd}-proxy-ssh %h"
+				file.puts "  User #{ssh_info[:username]}"
+				file.puts "  UserKnownHostsFile /dev/null"
+				file.puts "  StrictHostKeyChecking no"
+				file.puts "  PasswordAuthentication no"
+				file.puts "  IdentityFile #{ssh_info[:private_key_path]}"
+				file.puts "  IdentitiesOnly yes"
 			end
 		end
 	end

data/vagrant-proxyssh.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "vagrant-proxyssh"
-  s.version     = "0.1.1"
+  s.version     = "0.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kenneth Vestergaard"]
   s.email       = ["kvs@binarysolutions.dk"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxyssh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70265749390760 !ruby/object:Gem::Requirement
+  requirement: &70359647557040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,17 +21,19 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70265749390760
+  version_requirements: *70359647557040
 description: Makes it possible to use 'ssh' to login to a Vagrant VM, without adding
   multiple fake hosts to ~/.ssh/config
 email:
 - kvs@binarysolutions.dk
-executables: []
+executables:
+- vagrant-proxy-ssh
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/vagrant-proxy-ssh
 - lib/vagrant-proxyssh.rb
 - lib/vagrant_init.rb
 - vagrant-proxyssh.gemspec