engineyard-dnsimple 0.1.2 → 0.2.0

data/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v0.2.0 - 2011/5/22
+
+* If [domain, name] pair already exists then prompt for override
+
 ## v0.1.2 - 2011/5/22
 
 * Cucumber scenario is now working against http://test.dnsimple.com

data/features/assign_dns_to_environment.feature

@@ -7,12 +7,12 @@ Feature: Assign DNS to environment IP address
     And I have setup my dnsimple credentials
     And I have DNSimple domain "myapp.com"
     
-  Scenario: Assign DNS A Record to an environment
+  Scenario: Assign new DNS A Record to an environment
     When I run local executable "ey-dnsimple" with arguments "assign myapp.com --account main --environment giblets"
     Then I should see matching
       """
       Fetching AppCloud environment information...
-      Found environment giblets on account main with IP 174.129.7.113
+      Found AppCloud environment giblets on account main with IP 174.129.7.113
       Assigning myapp.com --> 174.129.7.113 (main/giblets)
       Created A record for myapp.com (id:\d+)
       Assigning www.myapp.com --> 174.129.7.113 (main/giblets)
@@ -23,5 +23,24 @@ Feature: Assign DNS to environment IP address
       	www.myapp.com (A)-> 174.129.7.113 (ttl:60, id:\d+)
       """
   
+  Scenario: Resssign DNS A Record to an environment
+    When I run local executable "ey-dnsimple" with arguments "assign myapp.com --account main --environment giblets"
+    And I run local executable "ey-dnsimple" with arguments "assign myapp.com --account main --environment giblets --override"
+    Then I should see matching
+      """
+      Fetching AppCloud environment information...
+      Found AppCloud environment giblets on account main with IP 174.129.7.113
+      Deleted \d+ from myapp.com
+      Deleted \d+ from myapp.com
+      Assigning myapp.com --> 174.129.7.113 (main/giblets)
+      Created A record for myapp.com (id:\d+)
+      Assigning www.myapp.com --> 174.129.7.113 (main/giblets)
+      Created A record for myapp.com (id:\d+)
+      Complete!
+      Found 2 records for myapp.com
+      	.myapp.com (A)-> 174.129.7.113 (ttl:60, id:\d+)
+      	www.myapp.com (A)-> 174.129.7.113 (ttl:60, id:\d+)
+      """
+
   
   

data/lib/engineyard-dnsimple/cli.rb

@@ -23,6 +23,7 @@ module EngineYard
       method_option :verbose, :aliases     => ["-V"], :desc => "Display more output"
       method_option :environment, :aliases => ["-e"], :desc => "Environment in which to deploy this application", :type => :string
       method_option :account, :aliases     => ["-c"], :desc => "Name of the account you want to deploy in"
+      method_option :override, :aliases    => ["-o"], :type => :boolean, :desc => "Override DNSimple records if they already exist"
       def assign(domain)
         say "Fetching AppCloud environment information..."; $stdout.flush
         
@@ -39,15 +40,12 @@ module EngineYard
         
         public_ip = "#{$1}.#{$2}.#{$3}.#{$4}"
 
-        say "Found environment #{env_name} on account #{account_name} with IP #{public_ip}"        
+        say "Found AppCloud environment #{env_name} on account #{account_name} with IP #{public_ip}"        
         $stdout.flush
 
         ::DNSimple::Client.load_credentials_if_necessary
-
-        say "Assigning "; say "#{domain} ", :green; say "--> "; say "#{public_ip} ", :green; say "(#{account_name}/#{env_name})"
-        ::DNSimple::Commands::CreateRecord.new.execute([domain, "", "A", public_ip, "60"]) # A record for .mydomain.com
-        say "Assigning "; say "www.#{domain} ", :green; say "--> "; say "#{public_ip} ", :green; say "(#{account_name}/#{env_name})"
-        ::DNSimple::Commands::CreateRecord.new.execute([domain, "www", "A", public_ip, "60"]) # A record for www.mydomain.com
+        assign_dns(account_name, env_name, domain, public_ip, "", options[:override])
+        assign_dns(account_name, env_name, domain, public_ip, "www", options[:override])
 
         say "Complete!", :green
         
@@ -94,6 +92,34 @@ module EngineYard
           end
         end
       end
+      
+      def assign_dns(account_name, env_name, domain, public_ip, name = "", override = false)
+        records = ::DNSimple::Record.all(domain)
+        if record = records.find { |record| record.name == name && record.domain.name == domain }
+          if override || ask_override_dns?(domain, name)
+            ::DNSimple::Commands::DeleteRecord.new.execute([domain, record.id]) # A record for .mydomain.com
+          else
+            error "Cannot replace existing #{domain_name domain, name} DNS"
+          end
+        end
+        say "Assigning "; say "#{domain_name domain, name} ", :green; say "--> "; say "#{public_ip} ", :green; say "(#{account_name}/#{env_name})"
+        $stdout.flush
+        
+        ::DNSimple::Commands::CreateRecord.new.execute([domain, name, "A", public_ip, "60"]) # A record for .mydomain.com
+      end
+      
+      def ask_override_dns?(domain, name)
+        ui = EY::CLI::UI::Prompter.backend
+        ui.agree("Replace #{domain_name domain, name}: ", "y")
+      end
+      
+      def domain_name(domain, name = nil)
+        if name && name.length > 0
+          "#{name}.#{domain}"
+        else
+          domain
+        end
+      end
     end
   end
 end

data/lib/engineyard-dnsimple/version.rb

@@ -1,5 +1,5 @@
 module EngineYard
   module DNSimple
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-dnsimple
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dr Nic Williams