Merge pull request #1 from ggoodale/master

Can I have your changes

Author: jflowers

.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+test/tmp
+test/tmp/*

Rakefile

@@ -4,6 +4,8 @@ require 'rake/testtask'
 task :default => :test
 
 Rake::TestTask.new do |t|
+  ENV['VAGRANT_HOME'] = File.join(File.dirname(__FILE__), 'test', 'tmp', 'home')
+
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'
 end

lib/vagrant-aws.rb

@@ -6,9 +6,16 @@
 require 'vagrant-aws/config'
 require 'vagrant-aws/middleware'
 require 'vagrant-aws/command'
-require 'vagrant-aws/system'
 require 'vagrant-aws/box'
-require 'vagrant-aws/box_collection'
 
 # Add our custom translations to the load path
 I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
+
+module VagrantAWS
+  # The source root is the path to the root directory of
+  # the Vagrant gem.
+  def self.source_root
+    @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+  end
+end
+

lib/vagrant-aws/action/create.rb

@@ -1,16 +1,16 @@
 module VagrantAWS
-	class Action
+	module Action
 		class Create
 			def initialize(app, env)
 				@app = app
 			end
 
 			def call(env)
-				raise Errors::KeyNameNotSpecified if env["config"].aws.key_name.nil?
+				raise Errors::KeyNameNotSpecified if env["vm"].config.aws.key_name.nil?
 
-				env.ui.info I18n.t("vagrant.plugins.aws.actions.create.creating")
+				env["ui"].info I18n.t("vagrant.plugins.aws.actions.create.creating")
 
-				server_def = server_definition(env["config"])
+				server_def = server_definition(env["vm"].config)
 
 				# Verify AMI is valid (and in the future enable options specific to EBS-based AMIs)
 				image = env["vm"].connection.images.get(server_def[:image_id])
@@ -19,12 +19,12 @@ def call(env)
 				env["vm"].vm = env["vm"].connection.servers.create(server_def)
 				raise VagrantAWS::Errors::VMCreateFailure if env["vm"].vm.nil? || env["vm"].vm.id.nil?
 
-				env.ui.info I18n.t("vagrant.plugins.aws.actions.create.created", :id => env["vm"].vm.id)
+				env["ui"].info I18n.t("vagrant.plugins.aws.actions.create.created", :id => env["vm"].vm.id)
 
 				env["vm"].vm.wait_for { ready? }
 				env["vm"].connection.create_tags(env["vm"].vm.id, { "name" => env["vm"].name })
 
-				env.ui.info I18n.t("vagrant.plugins.aws.actions.create.available", :dns => env["vm"].vm.dns_name)
+				env["ui"].info I18n.t("vagrant.plugins.aws.actions.create.available", :dns => env["vm"].vm.dns_name)
 
 				@app.call(env)
 			end

lib/vagrant-aws/action/create_image.rb

@@ -1,26 +1,7 @@
 require 'fileutils'
 
-# Path vagrant to not delete pre-existing package file (pull request submitted upstream)
-
-module Vagrant
-  class Action
-    module General
-      
-			class Package
-				def recover(env)
-          unless env["vagrant.error"].is_a?(Errors::PackageOutputExists)
-						# Cleanup any packaged files if the packaging failed at some point.
-						File.delete(tar_path) if File.exist?(tar_path)
-					end
-        end
-			end
-
-		end
-	end
-end
-
 module VagrantAWS
-	class Action
+	module Action
 		class CreateImage
 			include Vagrant::Util
 
@@ -50,10 +31,11 @@ def call(env)
 				raise VagrantAWS::Errors::EBSDeviceRequired, :command => "box_create" if @env["image.register"] and @env["vm"].vm.root_device_type != "ebs"
 
 				if @env["image.register"]
-					@env.ui.info I18n.t("vagrant.plugins.aws.actions.create_image.creating")
+					@env["ui"].info I18n.t("vagrant.plugins.aws.actions.create_image.creating")
 					@image = @env["vm"].connection.create_image(@env["vm"].vm.id, @env['image.name'], @env['image.desc'])
+
 					@image = @env["vm"].connection.images.new({ :id => @image.body['imageId'] })
-					@image.wait_for { state == "available" }
+					@image.wait_for { ready? }
 				else
 					@image = @env["vm"].connection.images.get(@env["vm"].vm.image_id)
 				end
@@ -68,7 +50,7 @@ def call(env)
 
 			def recover(env)
 				if env["image.register"]
-					env.ui.info I18n.t("vagrant.plugins.aws.actions.deregister_image.deregistering", :image => @image.id)
+					env["ui"].info I18n.t("vagrant.plugins.aws.actions.deregister_image.deregistering", :image => @image.id)
 					@image.deregister(!@image.root_device_name.nil?)  # Don't try to delete backing snapshot if it was not created
 				end
 				cleanup_temp_dir
@@ -81,8 +63,8 @@ def cleanup_temp_dir
 			end
 
 			def setup_temp_dir
-				@env.ui.info I18n.t("vagrant.actions.vm.export.create_dir")
-				@temp_dir = @env["export.temp_dir"] = @env.env.tmp_path.join(Time.now.to_i.to_s)
+				@env["ui"].info I18n.t("vagrant.actions.vm.export.create_dir")
+				@temp_dir = @env["export.temp_dir"] = @env["vm"].env.tmp_path.join(Time.now.to_i.to_s)
 				FileUtils.mkpath(@env["export.temp_dir"])
 			end
 
@@ -91,7 +73,7 @@ def export
 				File.open(File.join(@env["export.temp_dir"], 'Vagrantfile'), "w") do |f|
 					f.write(TemplateRenderer.render_string(PACKAGE_VAGRANTFILE, {
 						:image => @image.id,
-						:region => @env["config"].aws.region
+						:region => @env["vm"].config.aws.region
 					}))
 				end
 				File.open(File.join(@env["export.temp_dir"], 'image.json'), "w") do |f|

lib/vagrant-aws/action/create_sshkey.rb

@@ -1,7 +1,7 @@
 require 'Macaddr'
 
 module VagrantAWS
-	class Action
+	module Action
 		class CreateSSHKey
 			def initialize(app, env)
 				@app = app
@@ -10,25 +10,25 @@ def initialize(app, env)
 			def call(env)
 				@env = env
 
-				if @env["config"].aws.key_name.nil?	
+				if @env["vm"].config.aws.key_name.nil?	
           # Do we have a previously created key available on AWS?
-					key = @env["vm"].connection.key_pairs.all('key-name' => @env.env.ssh_keys).first
+					key = @env["vm"].connection.key_pairs.all('key-name' => @env["vm"].env.ssh_keys).first
 					if key.nil?
 						# Create and save key
 						key = @env["vm"].connection.key_pairs.create(:name => "vagrantaws_#{Mac.addr.gsub(':','')}")
-						env.ui.info I18n.t("vagrant.plugins.aws.actions.create_ssh_key.created", :name => key.name)	
+						env["ui"].info I18n.t("vagrant.plugins.aws.actions.create_ssh_key.created", :name => key.name)	
 						File.open(local_key_path(key.name), File::WRONLY|File::TRUNC|File::CREAT, 0600) { |f| f.write(key.private_key) }	
 					end
 
-					@env["config"].aws.key_name = key.name
-					@env["config"].aws.private_key_path = local_key_path(key.name) 
+					@env["vm"].config.aws.key_name = key.name
+					@env["vm"].config.aws.private_key_path = local_key_path(key.name) 
 				end
 
 				@app.call(env)
 			end
 
 			def local_key_path(name)
-				@env.env.ssh_keys_path.join(name)
+				@env["vm"].env.ssh_keys_path.join(name)
 			end
 
 		end

lib/vagrant-aws/action/deregister_image.rb

@@ -1,5 +1,5 @@
 module VagrantAWS
-	class Action
+	module Action
 		class DeregisterImage
 			def initialize(app, env)
 				@app = app

lib/vagrant-aws/action/populate_ssh.rb

@@ -1,5 +1,5 @@
 module VagrantAWS
-	class Action
+	module Action
 		class PopulateSSH
 			def initialize(app, env)
 				@app = app

lib/vagrant-aws/action/prepare_provisioners.rb

@@ -1,7 +1,7 @@
 require 'archive/tar/minitar'
 
 module VagrantAWS
-	class Action
+	module Action
 		class PrepareProvisioners
 			def initialize(app, env)
 				@app = app

lib/vagrant-aws/action/resume.rb

@@ -1,5 +1,5 @@
 module VagrantAWS
-	class Action
+	module Action
 		class Resume
 			def initialize(app, env)
 				@app = app

lib/vagrant-aws/action/suspend.rb

@@ -1,5 +1,5 @@
 module VagrantAWS
-	class Action
+	module Action
 		class Suspend
 			def initialize(app, env)
 				@app = app

lib/vagrant-aws/action/terminate.rb

@@ -1,12 +1,12 @@
 module VagrantAWS
-	class Action
+	module Action
 		class Terminate
 			def initialize(app, env)
 				@app = app
 			end
 
 			def call(env)
-				env.ui.info I18n.t("vagrant.actions.vm.destroy.destroying")
+				env["ui"].info I18n.t("vagrant.actions.vm.destroy.destroying")
 
 				env["vm"].vm.destroy
 				env["vm"].vm = nil

lib/vagrant-aws/box.rb

@@ -2,7 +2,7 @@ module VagrantAWS
 
 	class Box < Vagrant::Box
 
-		%w{ ovf_file repackage destroy }.each do |method|
+		%w{ repackage destroy }.each do |method|
 			undef_method(method)
 		end