vagrant-multi-putty 1.0.1 → 1.1.0

data/Rakefile

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'bundler/setup'
+
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
+$stdout.sync = true
+$stderr.sync = true
+
+# Change to the directory of this file.
+Dir.chdir(File.expand_path("../", __FILE__))
+
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks

data/lib/vagrant-multi-putty.rb

@@ -1,2 +1,4 @@
 require 'vagrant-multi-putty/command'
 require 'vagrant-multi-putty/config'
+require 'vagrant-multi-putty/plugin'
+require 'vagrant-multi-putty/version'

data/lib/vagrant-multi-putty/command.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'optparse'
 
 module VagrantMultiPutty
-  class Command < Vagrant::Command::Base
+  class Command < Vagrant.plugin(2, :command)
     def execute
       options = {}
       opts = OptionParser.new do |opts|
@@ -17,7 +17,7 @@ module VagrantMultiPutty
       end
 
       argv = parse_options(opts)
-      return if !argv
+      return -1 if !argv
 
       # This is borrowed from the ssh base command that ships with vagrant.
       # It is used to parse out arguments meant for the putty program.
@@ -32,31 +32,30 @@ module VagrantMultiPutty
       # Since putty is a program with a GUI window, we can perform a spawn and
       # detach the process from vagrant.
       with_target_vms(argv) do |vm|
-        # Also borrowed from the base ssh.rb code.
-        # Basic checks needed for a putty connection
-        raise Vagrant::Errors::VMNotCreatedError if !vm.created?
-        raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
-        raise Vagrant::Errors::VMNotRunningError if vm.state != :running
-
         @logger.info("Launching putty session to: #{vm.name}")
         putty_connect(vm, putty_args, plain_auth=options[:plain_auth])
       end
+      return 0
     end
 
     def putty_connect(vm, args, plain_auth=False)
-      # Get the path to the private key for VM.
-      private_key = vm.config.putty.private_key_path || "#{vm.env.default_private_key_path}.ppk"
+      ssh_info = vm.ssh_info
+      # If ssh_info is nil, the machine is not ready for ssh.
+      raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
+
+      # The config.putty directive overrides the config.ssh private_key_path directive.
+      private_key = vm.config.putty.private_key_path || "#{ssh_info[:private_key_path]}.ppk"
       pk_path = File.expand_path("#{private_key}", vm.env.root_path)
       @logger.debug("Putty Private Key: #{pk_path}")
 
-      # Load options set in the Vagrantfile
-      ssh_port = vm.config.ssh.port || vm.driver.ssh_port(vm.config.ssh.guest_port)
-      options = [vm.config.ssh.host]
-      options += ["-l", vm.config.putty.username || vm.config.ssh.username]
-      options += ["-P", ssh_port.to_s]
+      # Load options from machine ssh_info.
+      options = [ssh_info[:host]]
+      # config.putty.username overrides the machines ssh_info username.
+      options += ["-l", vm.config.putty.username || ssh_info[:username]]
+      options += ["-P", ssh_info[:port].to_s]
       options += ["-i", pk_path] if !plain_auth
-      options += ["-X"] if vm.config.ssh.forward_x11
-      options += ["-A"] if vm.config.ssh.forward_agent
+      options += ["-X"] if ssh_info[:forward_x11]
+      options += ["-A"] if ssh_info[:forward_agent]
 
       # Add in additional args from the command line.
       options.concat(args) if !args.nil?
@@ -68,6 +67,4 @@ module VagrantMultiPutty
       Process.detach(pid)
     end
   end
-
-  Vagrant.commands.register(:putty) { Command }
 end

data/lib/vagrant-multi-putty/config.rb

@@ -1,9 +1,16 @@
-
 module VagrantMultiPutty
-  class PuttyConfig < Vagrant::Config::Base
+  class PuttyConfig < Vagrant.plugin(2, :config)
     attr_accessor :username
     attr_accessor :private_key_path
-  end
 
-  Vagrant.config_keys.register(:putty) { PuttyConfig }
+    def initialize
+      @username = UNSET_VALUE
+      @private_key_path = UNSET_VALUE
+    end
+
+    def finalize!
+      @username = nil if @username == UNSET_VALUE
+      @private_key_path = nil if @private_key_path == UNSET_VALUE
+    end
+  end
 end

data/lib/vagrant-multi-putty/plugin.rb

@@ -0,0 +1,21 @@
+require 'vagrant'
+
+module VagrantMultiPutty
+  class Plugin < Vagrant.plugin("2")
+    name "vagrant-multi-putty"
+    description <<-DESC
+      Vagrant-multi-putty allows you to ssh into your virtual machines using the putty
+      program. This plugin also supports opening putty sessions into multi-vm environments.
+    DESC
+
+    command "putty" do
+      require_relative "command"
+      Command
+    end
+
+    config "putty" do
+      require_relative "config"
+      PuttyConfig
+    end
+  end
+end

data/lib/vagrant-multi-putty/version.rb

@@ -1,3 +1,3 @@
 module VagrantMultiPutty
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/vagrant-multi-putty.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.4.0"
 
-  s.add_dependency "vagrant", "~> 1.0.5"
-
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multi-putty
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+date: 2013-04-10 00:00:00.000000000 Z
+dependencies: []
 description: Vagrant plugin to allow VM ssh with PuTTY (multi-vm supported)
 email:
 - nickryand@gmail.com
@@ -37,11 +21,12 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - lib/vagrant-multi-putty.rb
 - lib/vagrant-multi-putty/command.rb
 - lib/vagrant-multi-putty/config.rb
+- lib/vagrant-multi-putty/plugin.rb
 - lib/vagrant-multi-putty/version.rb
-- lib/vagrant_init.rb
 - vagrant-multi-putty.gemspec
 homepage: https://github.com/nickryand/vagrant-multi-putty
 licenses:
@@ -56,6 +41,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 464008797
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/vagrant_init.rb

@@ -1 +0,0 @@
-require 'vagrant-multi-putty'