engineyard-dnsimple 0.1.1 → 0.1.2

data/ChangeLog.md

@@ -1,10 +1,15 @@
 # ChangeLog
 
-## v0.1.1
+## v0.1.2 - 2011/5/22
+
+* Cucumber scenario is now working against http://test.dnsimple.com
+* Worth rereleasing gem just to celebrate
+
+## v0.1.1 - 2011/5/22
 
 * Create .myapp.com and www.myapp.com A records
 
-## v0.1.0
+## v0.1.0 - 2011/5/22
 
 * Initial release
 * Basic implementation of `ey-dnsimple assign DOMAIN`

data/README.md

@@ -9,10 +9,11 @@ Setup `ey` and `dnsimple` gems and credentials (see below).
 
     $ ey-dnsimple assign myapp.com
     Assigning myapp.com --> 1.2.3.4 (drnic/myapp_production)
-    Created A record for myapp.com (id:12345)
-    Complete!
-    Found 1 records for myapp.com
+    Assigning www.myapp.com --> 1.2.3.4 (drnic/myapp_production)
+
+    Found 2 records for myapp.com
     	.myapp.com (A)-> 1.2.3.4 (ttl:, id:12345)
+    	www.myapp.com (A)-> 1.2.3.4 (ttl:, id:12346)
 
 If an AppCloud environment cannot be automatically detected, explicitly pass -e or -a flags
 like the `ey` CLI itself:

data/features/assign_dns_to_environment.feature

@@ -4,24 +4,23 @@ Feature: Assign DNS to environment IP address
   Background:
     Given I have setup my engineyard email/password for API access
     And I have "two apps" in AppCloud
-    And I expect to create DNSimple::Record with attributes:
-      | domain      | myapp.com     |
-      | content     | 174.129.7.113 |
-      | record_type | A             |
+    And I have setup my dnsimple credentials
+    And I have DNSimple domain "myapp.com"
     
   Scenario: Assign 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 exactly
+    Then I should see matching
       """
-      Fetching environment information...
+      Fetching AppCloud environment information...
+      Found environment giblets on account main with IP 174.129.7.113
       Assigning myapp.com --> 174.129.7.113 (main/giblets)
-      Created A record for banjowilliams.com (id:40434)
+      Created A record for myapp.com (id:\d+)
       Assigning www.myapp.com --> 174.129.7.113 (main/giblets)
-      Created A record for banjowilliams.com (id:40435)
+      Created A record for myapp.com (id:\d+)
       Complete!
       Found 2 records for myapp.com
-      	.myapp.com (A)-> 174.129.7.113 (ttl:0, id:40434)
-      	www.myapp.com (A)-> 174.129.7.113 (ttl:0, id:40435)
+      	.myapp.com (A)-> 174.129.7.113 (ttl:60, id:\d+)
+      	www.myapp.com (A)-> 174.129.7.113 (ttl:60, id:\d+)
       """
   
   

data/features/step_definitions/common_steps.rb

@@ -123,6 +123,13 @@ Then /^I should see exactly$/ do |text|
   actual_output.should == text
 end
 
+Then /^I should see matching$/ do |text|
+  regexp = Regexp.new(text.gsub("(", '\(').gsub(")", '\)'))
+  actual_output = File.read(@stdout)
+  actual_output.should match(regexp)
+end
+
+
 Then /^I should see all (\d+) tests pass/ do |expected_test_count|
   expected = %r{^#{expected_test_count} tests, \d+ assertions, 0 failures, 0 errors}
   actual_output = File.read(@stdout)

data/features/step_definitions/dnsimple_steps.rb

@@ -1,9 +1,9 @@
-Given /^I expect to create DNSimple::Record with attributes:$/ do |table|
-  record = table.rows_hash
-  p [record.delete("domain"), record.delete("name") || "", 
-      record.delete("record_type") || "A", record.delete("content"), record]
-  # DNSimple::Record.create(record.delete("domain"), record.delete("name") || "", 
-  #     record.delete("record_type") || "A", record.delete("content"), record)
+Given /^I have setup my dnsimple credentials$/ do
+  setup_dnsimple_credentials
+end
+
+Given /^I have DNSimple domain "([^"]*)"$/ do |domain|
+  create_dnsimple_domain domain
 end
 
 

data/features/support/dnsimple.rb

@@ -0,0 +1,25 @@
+module DNSimpleHelpers
+  def setup_dnsimple_credentials
+    config_file = File.expand_path('~/.dnsimple')
+    unless File.exists? config_file
+      File.open(config_file, "w") do |file|
+        file << <<-EOS.gsub(/^\s{8}/, '')
+        username: ossgrants+dnsimple@engineyard.com
+        password: dnsimple1
+        site:     https://test.dnsimple.com/
+        EOS
+      end
+    end
+    require "dnsimple"
+    DNSimple::Client.load_credentials(config_file)
+  end
+  
+  def create_dnsimple_domain(domain)
+    begin
+      ::DNSimple::Commands::DeleteDomain.new.execute([domain])
+    rescue
+    end
+    ::DNSimple::Commands::CreateDomain.new.execute([domain])
+  end
+end
+World(DNSimpleHelpers)

data/features/support/env.rb

@@ -1,6 +1,8 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
 require 'bundler/setup'
 require 'engineyard-dnsimple'
+require 'dnsimple'
+require 'dnsimple/cli'
 
 path = ENV['PATH']
 

data/lib/engineyard-dnsimple/cli.rb

@@ -24,9 +24,10 @@ module EngineYard
       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"
       def assign(domain)
-        say "Fetching environment information..."; $stdout.flush
+        say "Fetching AppCloud environment information..."; $stdout.flush
         
         environment = fetch_environment(options[:environment], options[:account])
+        account_name, env_name = environment.account.name, environment.name
         unless environment.instances.first
           error "Environment #{account_name}/#{env_name} has no booted instances."
         end
@@ -36,7 +37,6 @@ module EngineYard
           error "Cannot determine public IP from current hostname #{public_hostname}"
         end
         
-        account_name, env_name = environment.account.name, environment.name
         public_ip = "#{$1}.#{$2}.#{$3}.#{$4}"
 
         say "Found environment #{env_name} on account #{account_name} with IP #{public_ip}"        

data/lib/engineyard-dnsimple/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-dnsimple
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -220,6 +220,7 @@ files:
 - features/step_definitions/dnsimple_steps.rb
 - features/step_definitions/ey_api_steps.rb
 - features/support/common.rb
+- features/support/dnsimple.rb
 - features/support/engineyard.rb
 - features/support/env.rb
 - features/support/matchers.rb
@@ -267,6 +268,7 @@ test_files:
 - features/step_definitions/dnsimple_steps.rb
 - features/step_definitions/ey_api_steps.rb
 - features/support/common.rb
+- features/support/dnsimple.rb
 - features/support/engineyard.rb
 - features/support/env.rb
 - features/support/matchers.rb