vagrant-aws-route53 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27ca034304d5c081b77b825600a9eefd5573a1aa
-  data.tar.gz: f7cc77f63ac3a177a57841a25c1c70cd2991196e
+  metadata.gz: 8ff63645e09462a3a38e825f29b31fbeeef34d8d
+  data.tar.gz: 16131fe1c2f409121f17b0e759e72f1a59a249c5
 SHA512:
-  metadata.gz: f569da2a1f4cf74bb72ab1bac1a40d683663726598f1bf0930d79ba391781c262034127e485e2cce6aa920175b11badb181f7aa513063599e2a38a75327cfb9b
-  data.tar.gz: 88933a86df6ce7699162406b7aa5fe1a51b63c2c28a32dfdf63346706e3eee9b7c783dbb8f0ebce0ce735e625bc04675a3e8b9144c4a6eb8a351df2fff9e34f4
+  metadata.gz: 8d921b4517d6cc060f6d2c528f5049511e3fb6d1c2e10cf16ca0dedf9c2b6249c6f70432d401e126af3c2a8c71077e8948bec68c0b84b2c9b401c4fc3173c185
+  data.tar.gz: 366ca879285ab4fbf6b0d17fb40eb1f1dc9aef748d93c53e00fa048e4d8a5327559f6f5ad1f75f74247befb227a4e1c2b0fc1ae5e61445382e10a0477ed93d19

data/lib/vagrant-aws-route53/action/ip_operations.rb

@@ -0,0 +1,42 @@
+require 'aws-sdk'
+
+module VagrantPlugins
+  module AwsRoute53
+    module Action
+      class IpOperations
+        private
+        def config(environment)
+          config          = environment[:machine].config
+          provider_config = environment[:machine].provider_config
+
+          access_key_id     = provider_config.access_key_id
+          secret_access_key = provider_config.secret_access_key
+          region            = provider_config.region
+          instance_id       = environment[:machine].id
+          hosted_zone_id    = config.route53.hosted_zone_id
+          record_set        = config.route53.record_set
+
+          return access_key_id, hosted_zone_id, instance_id, record_set, region, secret_access_key
+        end
+
+        def set(options)
+          ::AWS.config(access_key_id: options[:access_key_id], secret_access_key: options[:secret_access_key], region: options[:region])
+
+          ec2 = ::AWS.ec2
+          public_ip = options[:public_ip] || ec2.instances[options[:instance_id]].public_ip_address
+
+          record_sets = ::AWS::Route53::HostedZone.new(options[:hosted_zone_id]).rrsets
+          record_set  = record_sets[*options[:record_set]]
+          record_set.resource_records = [{ value: public_ip }]
+          record_set.update
+
+          if block_given?
+            yield options[:instance_id], public_ip, options[:record_set]
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws-route53/action/set_ip.rb

@@ -1,23 +1,16 @@
 require 'aws-sdk'
+require_relative 'ip_operations'
 
 module VagrantPlugins
   module AwsRoute53
     module Action
-      class SetIp
+      class SetIp < IpOperations
         def initialize(app, environment)
           @app = app
         end
 
         def call(environment)
-          config          = environment[:machine].config
-          provider_config = environment[:machine].provider_config
-
-          access_key_id     = provider_config.access_key_id
-          secret_access_key = provider_config.secret_access_key
-          region            = provider_config.region
-          instance_id       = environment[:machine].id
-          hosted_zone_id    = config.route53.hosted_zone_id
-          record_set        = config.route53.record_set
+          access_key_id, hosted_zone_id, instance_id, record_set, region, secret_access_key = config(environment)
 
           set(
             access_key_id:     access_key_id,
@@ -32,26 +25,6 @@ module VagrantPlugins
 
           @app.call(environment)
         end
-
-        private
-
-        def set(options)
-          ::AWS.config(access_key_id: options[:access_key_id], secret_access_key: options[:secret_access_key], region: options[:region])
-
-          ec2 = ::AWS.ec2
-          public_ip = ec2.instances[options[:instance_id]].public_ip_address
-
-          record_sets = ::AWS::Route53::HostedZone.new(options[:hosted_zone_id]).rrsets
-          record_set  = record_sets[*options[:record_set]]
-          record_set.resource_records = [{ value: public_ip }]
-          record_set.update
-
-          if block_given?
-            yield options[:instance_id], public_ip, options[:record_set]
-          end
-
-          nil
-        end
       end
     end
   end

data/lib/vagrant-aws-route53/action/unset_ip.rb

@@ -0,0 +1,32 @@
+require 'aws-sdk'
+require_relative 'ip_operations'
+
+module VagrantPlugins
+  module AwsRoute53
+    module Action
+      class UnsetIp < IpOperations
+        def initialize(app, environment)
+          @app = app
+        end
+
+        def call(environment)
+          access_key_id, hosted_zone_id, instance_id, record_set, region, secret_access_key = config(environment)
+
+          set(
+            access_key_id:     access_key_id,
+            secret_access_key: secret_access_key,
+            region:            region,
+            instance_id:       instance_id,
+            hosted_zone_id:    hosted_zone_id,
+            record_set:        record_set,
+            public_ip:         '0.0.0.0'
+          ) do |instance_id, pubilic_ip, record_set|
+            environment[:ui].info("#{pubilic_ip} has been assigned to #{record_set[0]}[#{record_set[1]}]")
+          end
+
+          @app.call(environment)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-aws-route53/plugin.rb

@@ -15,9 +15,21 @@ module VagrantPlugins
 
       action_hook :assign_ip_to_route53, :machine_action_up do |hook|
         require_relative './action/set_ip'
-        hook.after VagrantPlugins::AWS::Action::RunInstance, VagrantPlugins::AwsRoute53::Action::SetIp
+        hook.after VagrantPlugins::AWS::Action::RunInstance,   VagrantPlugins::AwsRoute53::Action::SetIp
         hook.after VagrantPlugins::AWS::Action::StartInstance, VagrantPlugins::AwsRoute53::Action::SetIp
       end
+
+      action_hook :cancel_ip_from_route53, :machine_action_halt do |hook|
+        require_relative './action/unset_ip'
+        hook.after VagrantPlugins::AWS::Action::StopInstance,      VagrantPlugins::AwsRoute53::Action::UnsetIp
+        hook.after VagrantPlugins::AWS::Action::TerminateInstance, VagrantPlugins::AwsRoute53::Action::UnsetIp
+      end
+
+      action_hook :cancel_ip_from_route53, :machine_action_destroy do |hook|
+        require_relative './action/unset_ip'
+        hook.after VagrantPlugins::AWS::Action::StopInstance,      VagrantPlugins::AwsRoute53::Action::UnsetIp
+        hook.after VagrantPlugins::AWS::Action::TerminateInstance, VagrantPlugins::AwsRoute53::Action::UnsetIp
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AwsRoute53
-    VERSION = '0.2.5'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-route53
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Naohiro Oogatta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -31,7 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/vagrant-aws-route53/action/ip_operations.rb
 - lib/vagrant-aws-route53/action/set_ip.rb
+- lib/vagrant-aws-route53/action/unset_ip.rb
 - lib/vagrant-aws-route53/config.rb
 - lib/vagrant-aws-route53/plugin.rb
 - lib/vagrant-aws-route53/version.rb