dnsimple-ruby 0.9.2 → 0.9.3

data/Gemfile

@@ -8,5 +8,6 @@ group :development do
   gem 'rspec', '>= 2.0.0'
   gem 'ruby-debug'
   gem 'cucumber'
-  gem 'aruba', :git => 'git://github.com/aeden/aruba.git'
+  gem 'aruba'
+  gem 'ruby-debug'
 end

data/Gemfile.lock

@@ -1,18 +1,13 @@
-GIT
-  remote: git://github.com/aeden/aruba.git
-  revision: cff8218
-  specs:
-    aruba (0.3.3)
-      childprocess (~> 0.1.7)
-      cucumber (~> 0.10)
-      rspec (~> 2.5)
-
 GEM
   remote: http://rubygems.org/
   specs:
+    aruba (0.3.5)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
     builder (3.0.0)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
     columnize (0.3.2)
     crack (0.1.8)
     cucumber (0.10.0)
@@ -22,7 +17,7 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
-    ffi (0.6.3)
+    ffi (1.0.7)
       rake (>= 0.8.7)
     gherkin (2.3.4)
       json (~> 1.4.6)
@@ -55,7 +50,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba!
+  aruba
   cucumber
   httparty
   jeweler

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/features/cli/domains/delete_domain.feature

@@ -0,0 +1,11 @@
+Feature: delete a domain with the CLI
+  As a user
+  In order to remove a domain from my account
+  I should be able to use the CLI to delete domains
+
+  @announce-cmd @skip-delete
+  Scenario:
+    Given I have set up my credentials
+    When I run `dnsimple delete` with a domain I created
+    Then the output should show that the domain was deleted 
+

data/features/cli/records/create_record.feature

@@ -9,3 +9,4 @@ Feature: add a record with the CLI
     When I run `dnsimple create` with a new domain
     And I run `dnsimple record:create` with the domain I added and no name and the type "A" and the content "1.2.3.4"
     Then the output should show that the "A" record was created
+    And the output should include the record id

data/features/cli/records/delete_record.feature

@@ -0,0 +1,14 @@
+Feature: delete a record with the CLI
+  As a user
+  In order to remove a record from a domain in my account
+  I should be able to use the CLI to delete a record
+
+  @announce-cmd @announce-stdout
+  Scenario:
+    Given I have set up my credentials
+    When I run `dnsimple create` with a new domain
+    And I run `dnsimple record:create` with the domain I added and no name and the type "A" and the content "1.2.3.4"
+    And I note the id of the record I added
+    And I run `dnsimple record:delete` with the id of the record
+    Then the output should show that the record was deleted
+     

data/features/step_definitions/domain_steps.rb

@@ -8,6 +8,20 @@ When /^I run `(.*)` with a in\-addr\.arpa domain$/ do |cmd|
   steps %Q(When I run `#{cmd} #{@domain_name}`)
 end
 
+When /^I run `dnsimple delete` with a domain I created$/ do
+  steps %Q(
+    When I run `dnsimple create` with a new domain
+  )
+  steps %Q(
+    And I run `dnsimple delete #{@domain_name}`
+  ) 
+end
+
 Then /^the output should show that the domain was created$/ do
   steps %Q(Then the output should contain "Created #{@domain_name}")
 end
+
+Then /^the output should show that the domain was deleted$/ do
+  steps %Q(Then the output should contain "Deleted #{@domain_name}")
+end
+

data/features/step_definitions/record_steps.rb

@@ -6,6 +6,27 @@ When /^I run `(.*)` with the domain I added and the name "([^\"]*)" and the type
   steps %Q(When I run `#{cmd} #{@domain_name} #{name} #{type} #{content}`)
 end
 
+When /^I run `(.*)` with the id of the record$/ do |cmd|
+  steps %Q(When I run `#{cmd} #{@domain_name} #{@record_id}`)  
+end
+
+When /^I note the id of the record I added$/ do
+  ps = only_processes.last
+  fail "No last process" unless ps
+  m = ps.stdout.match(/id:(\d+)/)
+  fail "Unable to find ID of record" unless m
+  @record_id = m[1] 
+end
+
 Then /^the output should show that the "([^\"]*)" record was created$/ do |type|
   steps %Q(Then the output should contain "Created #{type} record for #{@domain_name}")
 end
+
+Then /^the output should include the record id$/ do
+  steps %Q(Then the output should match /id:(\\d+)/) 
+end
+
+Then /^the output should show that the record was deleted$/ do
+  steps %Q(Then the output should contain "Deleted #{@record_id} from #{@domain_name}")
+end
+

data/features/support/env.rb

@@ -4,8 +4,8 @@ Before do
   @aruba_timeout_seconds = 10
 end
 
-After do
-  unless ENV['NODELETE']
+After do |scenario|
+  unless ENV['NODELETE'] || scenario.source_tag_names.include?('@skip-delete')
     if @domain_name && (@domain_name =~ /^cli-/ || @domain_name =~ /in-addr\.arpa/)
       steps %Q(When I run `dnsimple delete #{@domain_name}`)
     end

data/lib/dnsimple/commands/create_record.rb

@@ -11,7 +11,7 @@ module DNSimple
         domain = Domain.find(name)
         record = Record.create(domain.name, record_name, record_type, content, :ttl => ttl, :prio => options[:prio])
         
-        puts "Created #{record.record_type} record for #{domain.name}"
+        puts "Created #{record.record_type} record for #{domain.name} (id:#{record.id})"
       end
     end
   end

data/lib/dnsimple/record.rb

@@ -34,7 +34,7 @@ module DNSimple
         record_hash[Record.resolve(attribute)] = self.send(attribute)
       end
 
-      options.merge!(:basic_auth => Client.credentials)
+      options.merge!(DNSimple::Client.standard_options)
       options.merge!(:body => {:record => record_hash})
 
       response = self.class.put("#{Client.base_uri}/domains/#{domain.id}/records/#{id}.json", options)
@@ -52,8 +52,8 @@ module DNSimple
     end
     
     def delete(options={})
-      options.merge!({:basic_auth => Client.credentials})
-      self.class.delete("#{Client.base_uri}/domains/#{domain.id}/records/#{id}.json", options)
+      options.merge!(DNSimple::Client.standard_options)
+      self.class.delete("#{Client.base_uri}/domains/#{domain.id}/records/#{id}", options)
     end
     alias :destroy :delete
 
@@ -72,11 +72,11 @@ module DNSimple
       record_hash[:ttl] = options.delete(:ttl) || 3600
       record_hash[:prio] = options.delete(:priority)
       record_hash[:prio] = options.delete(:prio) || ''
-
+      
+      options.merge!(DNSimple::Client.standard_options)
       options.merge!({:query => {:record => record_hash}})
-      options.merge!({:basic_auth => Client.credentials})
 
-      response = self.post("#{Client.base_uri}/domains/#{domain.id}/records.json", options) 
+      response = self.post("#{Client.base_uri}/domains/#{domain.id}/records", options) 
 
       pp response if Client.debug?
 
@@ -94,8 +94,8 @@ module DNSimple
 
     def self.find(domain_name, id, options={})
       domain = Domain.find(domain_name)
-      options.merge!({:basic_auth => Client.credentials})
-      response = self.get("#{Client.base_uri}/domains/#{domain.id}/records/#{id}.json", options)
+      options.merge!(DNSimple::Client.standard_options)
+      response = self.get("#{Client.base_uri}/domains/#{domain.id}/records/#{id}", options)
 
       pp response if Client.debug?
 
@@ -113,8 +113,8 @@ module DNSimple
 
     def self.all(domain_name, options={})
       domain = Domain.find(domain_name)
-      options.merge!({:basic_auth => Client.credentials})
-      response = self.get("#{Client.base_uri}/domains/#{domain.id}/records.json", options)
+      options.merge!(DNSimple::Client.standard_options)
+      response = self.get("#{Client.base_uri}/domains/#{domain.id}/records", options)
 
       pp response if Client.debug?
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +01:00
+date: 2011-03-24 00:00:00 +01:00
 default_executable: dnsimple
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,9 +119,9 @@ dependencies:
         version: "0"
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  type: :development
   prerelease: false
-  name: httparty
+  name: ruby-debug
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -132,6 +132,20 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: httparty
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
 description: A ruby wrapper for the DNSimple API that also includes a command-line client.
 email: anthony.eden@dnsimple.com
 executables: 
@@ -159,8 +173,10 @@ files:
 - dnsimple-ruby.gemspec
 - features/cli/domains/check_domain.feature
 - features/cli/domains/create_domain.feature
+- features/cli/domains/delete_domain.feature
 - features/cli/records/create_ptr_record.feature
 - features/cli/records/create_record.feature
+- features/cli/records/delete_record.feature
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/domain_steps.rb
 - features/step_definitions/record_steps.rb