vagrant-command-dns 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd77fab9b2c0d0d39c8b38f2db26615e58c27c84
-  data.tar.gz: 8cfd993bbc28ced4e07711752166157fa8bdf7b6
+  metadata.gz: b411197419ba64b4a43e66157cae7983eea8fa08
+  data.tar.gz: f4285387240a7f19431a60306937d1f80427e084
 SHA512:
-  metadata.gz: 42520e3d9c9fc2332455695663dfafdc7b246f2df7d74b9a43765943b2c38cf5f3e93864a50ad3d841e9de45d7b7d15b9e5588d7498dfca46e528dbbf54f196c
-  data.tar.gz: e5725a24eb19b3b81b90d90aa9598fbcedc131830d9822f7774cd0dc9d0ff452fd2b6c5768e2fe0794bafda492e87ef78565f2675d2a41e71933aef733d030c9
+  metadata.gz: cdc10966cde761d47c266c74f463cf352b505b5c7d82798a7a7e0b0cb02097881eeadecfbaa5ab245d586a0d0326fa0f904e922b08667f54a935b7766b160873
+  data.tar.gz: 41e08550046de23227dc4af2a457174078d3b04cc39141862d33fc57c1f8c38647b4a1da0eb1a47f018df99ee103d726a798d157cbb608c3b66fedfba630a599

data/lib/vagrant-command-dns/action/get_ip.rb

@@ -13,35 +13,44 @@ module VagrantPlugins
         def call(env)
           if !env[:machine].config.dns.__skip
             if env[:machine].state.id != :running
-              raise Errors::MachineStateError
+              raise Errors::MachineState, state: 'running'
             end
 
             ip = nil
+            unable = true
 
             case env[:machine].provider_name
               when :virtualbox
                 env[:machine].config.vm.networks.each do |network|
                   key, options = network[0], network[1]
                   if key == :private_network or key == :public_network
+                    unable = false
                     if options[:dns] != 'skip'
-                      case key
-                        when :private_network
-                          cmd = "vagrant ssh -c \"ip -4 addr show \\$(ip -4 route | tail -n1 | awk '{print \\$3}') | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'\" 2>/dev/null"
-                        when :public_network
-                          cmd = "vagrant ssh -c \"ip -4 addr show \\$(ip -4 route | head -n2 | tail -n1 | awk '{print \\$5}') | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'\" 2>/dev/null"
-                      end
-                      begin
-                        ip = IPAddr.new(`#{cmd}`.chomp)
-                      rescue IPAddr::InvalidAddressError
-                        raise Errors::InvalidAddressError
+                      if options[:ip] # static ip specified
+                        ip = IPAddr.new(options[:ip])
+                      else
+                        case key
+                          when :private_network
+                            cmd = "vagrant ssh -c \"ip -4 addr show \\$(ip -4 route | tail -n1 | awk '{print \\$3}') | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'\" 2>/dev/null"
+                          when :public_network
+                            cmd = "vagrant ssh -c \"ip -4 addr show \\$(ip -4 route | head -n2 | tail -n1 | awk '{print \\$5}') | grep -oP '(?<=inet\\s)\\d+(\\.\\d+){3}'\" 2>/dev/null"
+                        end
+                        begin
+                          ip = IPAddr.new(`#{cmd}`.chomp)
+                        rescue IPAddr::InvalidAddressError
+                          raise Errors::InvalidAddress
+                        end
                       end
                     else
                       env[:ui].info(I18n.t('vagrant_command_dns.config.network_skip'))
                     end
                   end
                 end
+                if unable
+                  raise Errors::NoNetwork
+                end
               else
-                raise Errors::UnsupportedProviderError
+                raise Errors::UnsupportedProvider
             end
 
             unless ip.nil?

data/lib/vagrant-command-dns/action/host/create.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
 
           def call(env)
             if env[:machine].state.id != :running
-              raise Errors::MachineStateError, state: 'running'
+              raise Errors::MachineState, state: 'running'
             end
 
             record_map = env[:record_map]
@@ -21,6 +21,10 @@ module VagrantPlugins
             File.open('/etc/hosts', 'r') do |file|
               file.each_line do |line|
                 env[:record_map].each do |hostname, ip|
+                  if env[:machine].config.dns.skip_aliases.include? hostname
+                    env[:ui].info(I18n.t('vagrant_command_dns.command.common.skip_alias', hostname: hostname))
+                    next
+                  end
                   precise_pattern = Regexp.new('^\s*' + ip + '\s+' + hostname)
                   loose_pattern = Regexp.new('^\s*[0-9]{1,3}[0-9]{1,3}[0-9]{1,3}[0-9]{1,3}\s+' + hostname)
                   if line.match(/#{precise_pattern}/)

data/lib/vagrant-command-dns/action/host/destroy.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
           def call(env)
             unless env[:machine].config.dns.__skip
               if env[:machine].state.id != :running
-                raise Errors::MachineStateError, state: 'running'
+                raise Errors::MachineState, state: 'running'
               end
             end
 

data/lib/vagrant-command-dns/action/route53/connect.rb

@@ -20,6 +20,13 @@ module VagrantPlugins
           end
 
           def call(env)
+            errors = []
+            errors << I18n.t('vagrant_command_dns.config.route53.access_key_id_required') if env[:machine].config.dns.route53_access_key_id.nil?
+            errors << I18n.t('vagrant_command_dns.config.route53.secret_access_key_required') if env[:machine].config.dns.route53_secret_access_key.nil?
+            if errors.length > 0
+              raise Errors::ConfigInvalid, errors: errors
+            end
+
             # Build the fog config
             fog_config = {
                 :provider              => :aws,

data/lib/vagrant-command-dns/action/route53/create.rb

@@ -14,10 +14,14 @@ module VagrantPlugins
 
           def call(env)
             if env[:machine].state.id != :running
-              raise Errors::MachineStateError, state: 'running'
+              raise Errors::MachineState, state: 'running'
             end
 
             env[:record_map].each do |hostname, ip|
+              if env[:machine].config.dns.skip_aliases.include? hostname
+                env[:ui].info(I18n.t('vagrant_command_dns.command.common.skip_alias', hostname: hostname))
+                next
+              end
               @logger.info("Checking for existing '#{hostname}' Route53 record...")
 
               record_name = hostname + '.' unless hostname.end_with?('.')

data/lib/vagrant-command-dns/action/route53/destroy.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
           def call(env)
             unless env[:machine].config.dns.__skip
               if env[:machine].state.id != :running
-                raise Errors::MachineStateError, state: 'running'
+                raise Errors::MachineState, state: 'running'
               end
             end
 

data/lib/vagrant-command-dns/config.rb

@@ -7,6 +7,11 @@ module VagrantPlugins
       # @return [Array<String>]
       attr_accessor :aliases
 
+      # List of disallowed aliases in FQDN format
+      #
+      # @return [Array<String>]
+      attr_accessor :skip_aliases
+
       # AWS Route53 Settings
 
       # The version of the AWS api to use
@@ -35,10 +40,10 @@ module VagrantPlugins
       attr_accessor :route53_zone_id
 
       attr_accessor :__skip
-      attr_reader   :__available_providers
 
       def initialize
         @aliases                   = UNSET_VALUE
+        @skip_aliases              = UNSET_VALUE
 
         @route53_version           = UNSET_VALUE
         @route53_access_key_id     = UNSET_VALUE
@@ -48,11 +53,11 @@ module VagrantPlugins
 
         # Internal
         @__skip = false
-        @__available_providers = %w(local route53)
       end
 
       def finalize!
-        @aliases = [] if @aliases == UNSET_VALUE
+        @aliases      = [] if @aliases      == UNSET_VALUE
+        @skip_aliases = [] if @skip_aliases == UNSET_VALUE
 
         @route53_version = nil if @route53_version == UNSET_VALUE
         @route53_zone_id = nil if @route53_zone_id == UNSET_VALUE
@@ -67,21 +72,18 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        if @route53
-          if machine.provider_name == :aws
-            aws_config = machine.provider_config
-            # If these values are still not set and the AWS provider is being used, borrow it's config values
-            @route53_version           = aws_config.version           if @route53_version           == nil
-            @route53_access_key_id     = aws_config.access_key_id     if @route53_access_key_id     == nil
-            @route53_secret_access_key = aws_config.secret_access_key if @route53_secret_access_key == nil
-            @route53_session_token     = aws_config.session_token     if @route53_session_token     == nil
-          end
-
-          errors << I18n.t('vagrant_command_dns.config.route53_zone_id_required') if @route53_zone_id.nil?
-          errors << I18n.t('vagrant_command_dns.config.route53_access_key_id_required') if @route53_access_key_id.nil?
-          errors << I18n.t('vagrant_command_dns.config.route53_secret_access_key_required') if @route53_secret_access_key.nil?
+        if machine.provider_name == :aws
+          aws_config = machine.provider_config
+          # If these values are still not set and the AWS provider is being used, borrow it's config values
+          @route53_version           = aws_config.version           if @route53_version           == nil
+          @route53_access_key_id     = aws_config.access_key_id     if @route53_access_key_id     == nil
+          @route53_secret_access_key = aws_config.secret_access_key if @route53_secret_access_key == nil
+          @route53_session_token     = aws_config.session_token     if @route53_session_token     == nil
         end
 
+        errors << I18n.t('vagrant_command_dns.config.aliases_list_required') unless @aliases.kind_of? Array
+        errors << I18n.t('vagrant_command_dns.config.skip_aliases_list_required') unless @skip_aliases.kind_of? Array
+
         { 'DNS' => errors }
       end
 

data/lib/vagrant-command-dns/errors.rb

@@ -6,24 +6,24 @@ module VagrantPlugins
         error_namespace('vagrant_command_dns.errors')
       end
 
-      class MachineStateError < VagrantCommandDnsError
-        error_key(:machine_state_error)
+      class ConfigInvalid < VagrantCommandDnsError
+        error_key(:config_invalid)
       end
 
-      class UnsupportedProviderError < VagrantCommandDnsError
-        error_key(:unsupported_provider_error)
+      class MachineState < VagrantCommandDnsError
+        error_key(:machine_state)
       end
 
-      class InvalidAddressError < VagrantCommandDnsError
-        error_key(:invalid_address_error)
+      class UnsupportedProvider < VagrantCommandDnsError
+        error_key(:unsupported_provider)
       end
 
-      class FogError < VagrantCommandDnsError
-        error_key(:fog_error)
+      class InvalidAddress < VagrantCommandDnsError
+        error_key(:invalid_address)
       end
 
-      class EditLocalHostsError < VagrantCommandDnsError
-        error_key(:edit_local_hosts_error)
+      class NoNetwork < VagrantCommandDnsError
+        error_key(:no_network)
       end
 
     end

data/lib/vagrant-command-dns/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module CommandDns
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/locales/en.yml

@@ -2,48 +2,45 @@ en:
   vagrant_command_dns:
 
     config:
-      network_skip: |-
-        Skip requested for network in Vagrantfile
-      route53_zone_id_required: |-
-        A zone ID must be specified via "route53_zone_id"
-      route53_access_key_id_required: |-
-        An access key ID must be specified via "route53_access_key_id"
-      route53_secret_access_key_required: |-
-        A secret access key is required via "route53_secret_access_key"
+      common:
+        config_invalid: |-
+          There are errors in the configuration of this machine. Please fix
+          the following errors and try again:
+
+          %{errors}
+        missing_field: "The following settings are missing: %{field}"
+        aliases_list_required: "'aliases' must be a list of FQDNs."
+        skip_aliases_list_required: "'skip_aliases' must be a list of FQDNs."
+        network_skip: "Skip requested for network in Vagrantfile."
+
+      route53:
+        access_key_id_required: "An access key ID must be specified via 'route53_access_key_id'"
+        secret_access_key_required: "A secret access key is required via 'route53_secret_access_key'"
+
 
     errors:
-      machine_state_error: |-
-        Machine must be %{state} to preform this action.
-      unsupported_provider_error: |-
-        Machine provider not supported. Pull requests and testers are welcome.
-      invalid_address_error: |-
-        invalid_address_error
+      machine_state: "Machine must be %{state} to preform this action."
+      unsupported_provider: "Machine provider not supported. Pull requests and testers are welcome."
+      invalid_address: "Invalid IP address detected. This could be a bug."
+      no_network: "Vagrantfile has no available :private_network or :public_network specified."
+
 
     command:
+      common:
+        skip_alias: "Desired hostname alias '%{hostname}' is a reserved namespace specified via 'skip_aliases'. Skipping...'"
+
       host:
-        edit_error: |-
-          Unable to edit /etc/hosts. Consult documentation or submit a pull request.
-        create_success: |-
-          /etc/hosts record created for %{ip} %{hostname}
-        create_exists_match: |-
-          /etc/hosts record exists for %{ip} %{hostname}
-        create_exists_conflict: |-
-          Potentially conflicting entries found in /etc/hosts. Please update manually...
-        destroy_success: |-
-          /etc/hosts record destroyed for %{hostname}
+        edit_error: "Unable to edit /etc/hosts. Consult documentation or submit a pull request."
+        create_success: "/etc/hosts record created for %{ip} %{hostname}."
+        create_exists_match: "/etc/hosts record exists for %{ip} %{hostname}."
+        create_exists_conflict: "Potentially conflicting entries found in /etc/hosts. Please update manually..."
+        destroy_success: "/etc/hosts record destroyed for %{hostname}."
 
       route53:
-        fog_error: |-
-          AWS error: %{message}
-        create_success: |-
-          Route53 record created for %{ip} %{hostname}.
-        create_exists_match: |-
-          Route53 record exists for %{ip} %{hostname}.
-        create_exists_conflict: |-
-          Route53 record exists for %{ip} %{hostname}. Please update manually.
-        destroy_success: |-
-          Route53 record destroyed for %{hostname}
-        destroy_conflict: |-
-          Route53 record for %{hostname} does not match. Expected %{expected} got %{got}. Please update manually...
-        destroy_not_found: |-
-          Route53 record for %{hostname} not found. Skipping...
+        fog_error: "AWS error: %{message}"
+        create_success: "Route53 record created for %{ip} %{hostname}."
+        create_exists_match: "Route53 record exists for %{ip} %{hostname}."
+        create_exists_conflict: "Route53 record exists for %{ip} %{hostname}. Please update manually."
+        destroy_success: "Route53 record destroyed for %{hostname}."
+        destroy_conflict: "Route53 record for %{hostname} does not match. Expected %{expected} got %{got}. Please update manually..."
+        destroy_not_found: "Route53 record for %{hostname} not found. Skipping..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-command-dns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - cornfeedhobo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog