dnsimple-ruby 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/bin/dnsimple.rb

@@ -101,6 +101,9 @@ if $0.split("/").last == 'dnsimple'
     opts.on("-p", "--password [ARG]") do |password|
       DNSimple::Client.password = password
     end
+    opts.on("-c", "--credentials [ARG]") do |credentials|
+      DNSimple::Client.load_credentials(credentials)
+    end
     opts.on("-d") do
       DNSimple::Client.debug = true
     end

data/features/cli/domains/register_domain.feature

@@ -0,0 +1,10 @@
+Feature: register a domain with the CLI
+  As a user
+  In order to register a domain
+  I should be able to use the CLI for domain registration
+
+  @announce-cmd @announce-stdout
+  Scenario:
+    Given I have set up my credentials
+    When I run `dnsimple register` with a new domain
+    Then the output should show that the domain was registered

data/features/step_definitions/domain_steps.rb

@@ -25,3 +25,8 @@ Then /^the output should show that the domain was deleted$/ do
   steps %Q(Then the output should contain "Deleted #{@domain_name}")
 end
 
+Then /^the output should show that the domain was registered$/ do
+  steps %Q(Then the output should contain "Registered #{@domain_name}")
+end
+
+

data/features/support/env.rb

@@ -1,7 +1,7 @@
 require 'aruba/cucumber'
 
 Before do
-  @aruba_timeout_seconds = 10
+  @aruba_timeout_seconds = 30
 end
 
 After do |scenario|

data/lib/dnsimple/cli.rb

@@ -6,13 +6,9 @@ module DNSimple
   end
 
   class CLI
-    def initialize
-      credentials = load_credentials
-      Client.username = credentials['username']
-      Client.password = credentials['password']
-    end
 
     def execute(command_name, args, options={})
+      DNSimple::Client.load_credentials_if_necessary
       command = commands[command_name]
       if command
         begin
@@ -72,11 +68,6 @@ module DNSimple
         'service:remove' => DNSimple::Commands::RemoveService
       }
     end
-
-    private
-    def load_credentials
-      YAML.load(File.new(File.expand_path('~/.dnsimple')))
-    end
   end
 end
 

data/lib/dnsimple/client.rb

@@ -37,13 +37,23 @@ module DNSimple
       @@base_uri = base_uri.gsub(/\/$/, '')
     end
 
+    def self.load_credentials_if_necessary
+      load_credentials unless credentials_loaded?
+    end
+
     def self.load_credentials(path='~/.dnsimple')
       credentials = YAML.load(File.new(File.expand_path(path)))
       self.username = credentials['username']
       self.password = credentials['password']
+      self.base_uri = credentials['site']
+      @@credentials_loaded = true
       "Credentials loaded from #{path}" 
     end
 
+    def self.credentials_loaded?
+      @@credentials_loaded ||= false
+    end
+
     def self.standard_options
       {:format => :json, :headers => {'Accept' => 'application/json'}}
     end

data/lib/dnsimple/commands/register_domain.rb

@@ -3,7 +3,16 @@ module DNSimple
     class RegisterDomain
       def execute(args, options={})
         name = args.shift
-        registrant = {:id => args.shift}
+        registrant = nil
+
+        registrant_id_or_attribute = args.shift
+        if registrant_id_or_attribute
+          if registrant_id_or_attribute =~ /^\d+$/
+            registrant = {:id => registrant_id_or_attribute}
+          else
+            args.unshift(registrant_id_or_attribute)
+          end
+        end
 
         extended_attributes = {}
         args.each do |arg|

data/lib/dnsimple/domain.rb

@@ -153,10 +153,12 @@ module DNSimple #:nodoc:
       options.merge!(DNSimple::Client.standard_options_with_credentials)
 
       body = {:domain => {:name => name}}
-      if registrant[:id]
-        body[:domain][:registrant_id] = registrant[:id]
-      else
-        body.merge!(:contact => registrant)
+      if registrant
+        if registrant[:id]
+          body[:domain][:registrant_id] = registrant[:id]
+        else
+          body.merge!(:contact => registrant)
+        end
       end
       body.merge!(:extended_attribute => extended_attributes)
       options.merge!({:body => body})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-02 00:00:00 +02:00
+date: 2011-04-03 00:00:00 +02:00
 default_executable: dnsimple
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -175,6 +175,7 @@ files:
 - features/cli/domains/check_domain.feature
 - features/cli/domains/create_domain.feature
 - features/cli/domains/delete_domain.feature
+- features/cli/domains/register_domain.feature
 - features/cli/records/create_ptr_record.feature
 - features/cli/records/create_record.feature
 - features/cli/records/delete_record.feature