vagrant-aws-extras 0.0.1.rc2 → 0.0.1.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf635847008a5c0da7d9b817ded42cf1c5d70cd9
-  data.tar.gz: 960b1da22bdcb80b2e8e44c32979862c1dc156ec
+  metadata.gz: deb61529dad89d1898388941137fe0bf26d62690
+  data.tar.gz: a94af23b0e09d8ea83d03459966729e3adde6f4d
 SHA512:
-  metadata.gz: b60b9f83967f2b18ad7bbb305d2a3d2629196125053c9d13a511984688d88b833e422b36a1a3f3157bc464d2f88ef8613f24a6405b03d0bf7266fc17f557a3ae
-  data.tar.gz: c3d830f1dc1716a8316ce17e04d5e287d92a7183e021d92e1f65e4264bb402acb0b270ba80c8c68ad94ec57d06dc41ac301f56de0a582b4c7c11d75f92b12664
+  metadata.gz: 4bf382a894fa6dcefe4102fd1ea3e54004ef59c2590ed9b56f8f3badc374010489366d887e98b7a494a08c45971a62c75c45883604625c73790748ea33ce8823
+  data.tar.gz: 2fbdc2a3e6d8fdef0bcab89a158820fb7fca2918d1317c4d9c81627cf3fd5436a9db448e0245bc22071a54533297f9c0ff00beb66c3f9c8a9b012f80280522fd

data/Gemfile

@@ -7,6 +7,7 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
+  gem "vagrant-aws"
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.2.7"
   gem "vagrant-rspec-ci", "~> 1.0.1"
 end

data/lib/vagrant-aws-extras/action/dns.rb

@@ -7,6 +7,16 @@ module VagrantPlugins
 		module Extras
 			module Action
 				module DNS
+					class ProviderIsAWS
+						def initialize(app, env)
+							@app = app
+						end
+
+						def call(env)
+							env[:result] = env[:machine].provider_name == "aws"
+							@app.call(env)
+						end
+					end
 					class ConnectAWS
 						def initialize(app, env)
 							@app = app 

data/lib/vagrant-aws-extras/action.rb

@@ -11,21 +11,29 @@ module VagrantPlugins
 
 				def self.action_up
 					Vagrant::Action::Builder.new.tap do |builder|
-						builder.use ConfigValidate
-						builder.use	::VagrantPlugins::AWS::Action::ConnectAWS
-						builder.use ::VagrantPlugins::AWS::Action::ReadSSHInfo
-						builder.use DNS::ConnectAWS
-						builder.use DNS::Set
+						builder.use Call, DNS::ProviderIsAWS do |env, aws_builder|
+							if env[:result]
+								aws_builder.use ConfigValidate
+								aws_builder.use	::VagrantPlugins::AWS::Action::ConnectAWS
+								aws_builder.use ::VagrantPlugins::AWS::Action::ReadSSHInfo
+								aws_builder.use DNS::ConnectAWS
+								aws_builder.use DNS::Set
+							end
+						end
 					end
 				end
 
 				def self.action_destroy
 					Vagrant::Action::Builder.new.tap do |builder|
-						builder.use ConfigValidate
-						builder.use	::VagrantPlugins::AWS::Action::ConnectAWS
-						builder.use ::VagrantPlugins::AWS::Action::ReadSSHInfo
-						builder.use DNS::ConnectAWS			
-						builder.use DNS::Remove
+						builder.use Call, DNS::ProviderIsAWS do |env, aws_builder|
+							if env[:result]
+								aws_builder.use ConfigValidate
+								aws_builder.use	::VagrantPlugins::AWS::Action::ConnectAWS
+								aws_builder.use ::VagrantPlugins::AWS::Action::ReadSSHInfo
+								aws_builder.use DNS::ConnectAWS			
+								aws_builder.use DNS::Remove
+							end
+						end
 					end
 				end
 

data/lib/vagrant-aws-extras/config.rb

@@ -46,13 +46,15 @@ module VagrantPlugins
 	    	def finalize!
 	    		@record_zone 		 	 = nil if @record_zone == UNSET_VALUE	
 	    		@record_type 			 = "CNAME" if @record_type == UNSET_VALUE
-	    		@record_name 		 = nil if @record_name == UNSET_VALUE
+	    		@record_name 		 	 = nil if @record_name == UNSET_VALUE
 	    		@record_ttl 			 = 3600 if @record_ttl == UNSET_VALUE
 	    		@remove_on_suspend = true if @remove_on_suspend == UNSET_VALUE
 	    		@remove_on_destroy = true if @remove_on_destroy == UNSET_VALUE
 	    	end
 
 	    	def validate(machine)
+	    		return {} if machine.provider_name != "aws"
+
 	    		errors = []
 	    		errors.push "record zone must be set" unless @record_zone
 	    		errors.push "record name must be set" unless @record_name

data/lib/vagrant-aws-extras/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module AWS
   	module Extras
-    	VERSION = "0.0.1.rc2"
+    	VERSION = "0.0.1.rc4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-extras
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc2
+  version: 0.0.1.rc4
 platform: ruby
 authors:
 - Jaakko Suutarla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-aws