dnsimple-ruby 1.3.2 → 1.4.0

data/lib/dnsimple/cli.rb

@@ -1,7 +1,5 @@
-require 'yaml'
-
 module DNSimple
-  
+
   class CommandNotFound < RuntimeError
   end
 
@@ -25,98 +23,99 @@ module DNSimple
 
     def commands
       {
-        'info' => DNSimple::Commands::DescribeUser,
-
-        'check' => DNSimple::Commands::CheckDomain,
-        'create' => DNSimple::Commands::CreateDomain,
-        'register' => DNSimple::Commands::RegisterDomain,
-        'transfer' => DNSimple::Commands::TransferDomain,
-        'describe' => DNSimple::Commands::DescribeDomain,
-        'list' => DNSimple::Commands::ListDomains,
-        'delete' => DNSimple::Commands::DeleteDomain,
-        'clear' => DNSimple::Commands::ClearDomain,
-        'apply' => DNSimple::Commands::ApplyTemplate,
-         
-        'record:describe' => DNSimple::Commands::DescribeRecord,
-        'record:create' => DNSimple::Commands::CreateRecord,
-        'record:list' => DNSimple::Commands::ListRecords,
-        'record:update' => DNSimple::Commands::UpdateRecord,
-        'record:delete' => DNSimple::Commands::DeleteRecord,
-
-        'template:create' => DNSimple::Commands::CreateTemplate,
-        'template:list' => DNSimple::Commands::ListTemplates,
-        'template:delete' => DNSimple::Commands::DeleteTemplate,
-
-        'template:list_records' => DNSimple::Commands::ListTemplateRecords,
-        'template:add_record' => DNSimple::Commands::AddTemplateRecord,
-        'template:delete_record' => DNSimple::Commands::DeleteTemplateRecord,
-
-        'contact:create' => DNSimple::Commands::CreateContact,
-        'contact:list' => DNSimple::Commands::ListContacts,
-        'contact:describe' => DNSimple::Commands::DescribeContact,
-        'contact:update' => DNSimple::Commands::UpdateContact,
-        'contact:delete' => DNSimple::Commands::DeleteContact,
-
-        'extended-attributes:list' => DNSimple::Commands::ListExtendedAttributes,
-
-        'service:list' => DNSimple::Commands::ListServices,
-        'service:describe' => DNSimple::Commands::DescribeService,
-
-        'service:applied' => DNSimple::Commands::ListAppliedServices,
-        'service:available' => DNSimple::Commands::ListAvailableServices,
-        'service:add' => DNSimple::Commands::AddService,
-        'service:remove' => DNSimple::Commands::RemoveService,
-
-        'certificate:list' => DNSimple::Commands::ListCertificates,
-        'certificate:describe' => DNSimple::Commands::DescribeCertificate,
-        'certificate:purchase' => DNSimple::Commands::PurchaseCertificate,
-        'certificate:submit' => DNSimple::Commands::SubmitCertificate
+        'info' => DNSimple::Commands::Me,
+
+        'list' => DNSimple::Commands::DomainList,
+        'describe' => DNSimple::Commands::DomainDescribe,
+        'check' => DNSimple::Commands::DomainCheck,
+        'create' => DNSimple::Commands::DomainCreate,
+        'register' => DNSimple::Commands::DomainRegister,
+        'transfer' => DNSimple::Commands::DomainTransfer,
+        'delete' => DNSimple::Commands::DomainDelete,
+        'clear' => DNSimple::Commands::DomainClear,
+        'apply' => DNSimple::Commands::DomainApplyTemplate,
+
+        'record:describe' => DNSimple::Commands::RecordDescribe,
+        'record:create' => DNSimple::Commands::RecordCreate,
+        'record:list' => DNSimple::Commands::RecordList,
+        'record:update' => DNSimple::Commands::RecordUpdate,
+        'record:delete' => DNSimple::Commands::RecordDelete,
+
+        'template:create' => DNSimple::Commands::TemplateCreate,
+        'template:list' => DNSimple::Commands::TemplateList,
+        'template:delete' => DNSimple::Commands::TemplateDelete,
+
+        'template:list_records' => DNSimple::Commands::TemplateRecordList,
+        'template:add_record' => DNSimple::Commands::TemplateRecordCreate,
+        'template:delete_record' => DNSimple::Commands::TemplateRecordDelete,
+
+        'contact:create' => DNSimple::Commands::ContactCreate,
+        'contact:list' => DNSimple::Commands::ContactList,
+        'contact:describe' => DNSimple::Commands::ContactDescribe,
+        'contact:update' => DNSimple::Commands::ContactUpdate,
+        'contact:delete' => DNSimple::Commands::ContactDelete,
+
+        'extended-attributes:list' => DNSimple::Commands::ExtendedAttributeList,
+
+        'service:list' => DNSimple::Commands::ServiceList,
+        'service:describe' => DNSimple::Commands::ServiceDescribe,
+
+        'service:applied' => DNSimple::Commands::ServiceListApplied,
+        'service:available' => DNSimple::Commands::ServiceListAvailable,
+        'service:add' => DNSimple::Commands::ServiceAdd,
+        'service:remove' => DNSimple::Commands::ServiceRemove,
+
+        'certificate:list' => DNSimple::Commands::CertificateList,
+        'certificate:describe' => DNSimple::Commands::CertificateDescribe,
+        'certificate:purchase' => DNSimple::Commands::CertificatePurchase,
+        'certificate:submit' => DNSimple::Commands::CertificateSubmit,
       }
     end
   end
 end
 
-require 'dnsimple/commands/describe_user'
-require 'dnsimple/commands/check_domain'
-require 'dnsimple/commands/create_domain'
-require 'dnsimple/commands/register_domain'
-require 'dnsimple/commands/transfer_domain'
-require 'dnsimple/commands/describe_domain'
-require 'dnsimple/commands/list_domains'
-require 'dnsimple/commands/delete_domain'
-require 'dnsimple/commands/clear_domain'
-require 'dnsimple/commands/apply_template'
-
-require 'dnsimple/commands/describe_record'
-require 'dnsimple/commands/create_record'
-require 'dnsimple/commands/list_records'
-require 'dnsimple/commands/update_record'
-require 'dnsimple/commands/delete_record'
-
-require 'dnsimple/commands/create_template'
-require 'dnsimple/commands/list_templates'
-require 'dnsimple/commands/delete_template'
-require 'dnsimple/commands/list_template_records'
-require 'dnsimple/commands/add_template_record'
-require 'dnsimple/commands/delete_template_record'
-
-require 'dnsimple/commands/create_contact'
-require 'dnsimple/commands/list_contacts'
-require 'dnsimple/commands/describe_contact'
-require 'dnsimple/commands/update_contact'
-require 'dnsimple/commands/delete_contact'
-
-require 'dnsimple/commands/list_extended_attributes'
-
-require 'dnsimple/commands/list_services'
-require 'dnsimple/commands/describe_service'
-
-require 'dnsimple/commands/list_available_services'
-require 'dnsimple/commands/list_applied_services'
-require 'dnsimple/commands/add_service'
-require 'dnsimple/commands/remove_service'
-
-require 'dnsimple/commands/list_certificates'
-require 'dnsimple/commands/describe_certificate'
-require 'dnsimple/commands/purchase_certificate'
-require 'dnsimple/commands/submit_certificate'
+require 'dnsimple/commands/me'
+
+require 'dnsimple/commands/domain_list'
+require 'dnsimple/commands/domain_describe'
+require 'dnsimple/commands/domain_check'
+require 'dnsimple/commands/domain_create'
+require 'dnsimple/commands/domain_register'
+require 'dnsimple/commands/domain_transfer'
+require 'dnsimple/commands/domain_delete'
+require 'dnsimple/commands/domain_clear'
+require 'dnsimple/commands/domain_apply_template'
+
+require 'dnsimple/commands/record_list'
+require 'dnsimple/commands/record_describe'
+require 'dnsimple/commands/record_create'
+require 'dnsimple/commands/record_update'
+require 'dnsimple/commands/record_delete'
+
+require 'dnsimple/commands/template_list'
+require 'dnsimple/commands/template_create'
+require 'dnsimple/commands/template_delete'
+require 'dnsimple/commands/template_record_list'
+require 'dnsimple/commands/template_record_create'
+require 'dnsimple/commands/template_record_delete'
+
+require 'dnsimple/commands/contact_list'
+require 'dnsimple/commands/contact_describe'
+require 'dnsimple/commands/contact_create'
+require 'dnsimple/commands/contact_update'
+require 'dnsimple/commands/contact_delete'
+
+require 'dnsimple/commands/extended_attribute_list'
+
+require 'dnsimple/commands/service_list'
+require 'dnsimple/commands/service_describe'
+
+require 'dnsimple/commands/service_list_available'
+require 'dnsimple/commands/service_list_applied'
+require 'dnsimple/commands/service_add'
+require 'dnsimple/commands/service_remove'
+
+require 'dnsimple/commands/certificate_list'
+require 'dnsimple/commands/certificate_describe'
+require 'dnsimple/commands/certificate_purchase'
+require 'dnsimple/commands/certificate_submit'

data/lib/dnsimple/client.rb

@@ -1,131 +1,141 @@
-class DNSimple::Client
-  def self.debug?
-    @debug
-  end
+require 'yaml'
 
-  def self.debug=(debug)
-    @debug = debug
-  end
+module DNSimple
+  class Client
 
-  def self.username
-    @username
-  end
-
-  def self.username=(username)
-    @username = username
-  end
+    def self.debug?
+      @debug
+    end
 
-  def self.password
-    @password
-  end
+    def self.debug=(debug)
+      @debug = debug
+    end
 
-  def self.password=(password)
-    @password = password
-  end
+    def self.username
+      @username
+    end
 
-  def self.api_token
-    @api_token
-  end
+    def self.username=(username)
+      @username = username
+    end
 
-  def self.api_token=(api_token)
-    @api_token = api_token
-  end
+    def self.password
+      @password
+    end
 
-  def self.base_uri
-    @base_uri ||= "https://dnsimple.com/"
-  end
+    def self.password=(password)
+      @password = password
+    end
 
-  def self.base_uri=(base_uri)
-    base_uri += '/' if base_uri && base_uri[/\/$/].nil?
-    @base_uri = base_uri
-  end
+    def self.api_token
+      @api_token
+    end
 
-  def self.http_proxy
-    @http_proxy
-  end
+    def self.api_token=(api_token)
+      @api_token = api_token
+    end
 
-  def self.http_proxy=(http_proxy)
-    @http_proxy = http_proxy
-  end
+    # Gets the qualified API base uri.
+    #
+    # @return [String] The qualified API base uri.
+    def self.base_uri
+      @base_uri ||= "https://dnsimple.com"
+    end
 
-  def self.load_credentials_if_necessary
-    load_credentials unless credentials_loaded?
-  end
+    # Sets the qualified API base uri.
+    #
+    # @param [String] value The qualified API base uri.
+    def self.base_uri=(value)
+      @base_uri = value.to_s.chomp("/")
+    end
 
-  def self.config_path
-    ENV['DNSIMPLE_CONFIG'] || '~/.dnsimple'
-  end
+    def self.http_proxy
+      @http_proxy
+    end
 
-  def self.load_credentials(path=config_path)
-    begin
-      credentials = YAML.load(File.new(File.expand_path(path)))
-      self.username  ||= credentials['username']
-      self.password  ||= credentials['password']
-      self.api_token ||= credentials['api_token']
-      self.base_uri  ||= credentials['site']
-      self.http_proxy = { :addr => credentials['proxy_addr'], :port => credentials['proxy_port'] }
-      @credentials_loaded = true
-      "Credentials loaded from #{path}"
-    rescue
-      puts "Error loading your credentials: #{$!.message}"
-      exit 1
+    def self.http_proxy=(http_proxy)
+      @http_proxy = http_proxy
     end
-  end
 
-  def self.credentials_loaded?
-    (@credentials_loaded ||= false) or (username and (password or api_token))
-  end
+    def self.load_credentials_if_necessary
+      load_credentials unless credentials_loaded?
+    end
 
-  def self.standard_options
-    options = {
-                :format => :json, 
-                :headers => {'Accept' => 'application/json'}, 
-              }
+    def self.config_path
+      ENV['DNSIMPLE_CONFIG'] || '~/.dnsimple'
+    end
 
-    if http_proxy
-      options.merge!(
-        :http_proxyaddr => self.http_proxy[:addr],
-        :http_proxyport => self.http_proxy[:port]
-      )
+    def self.load_credentials(path = config_path)
+      begin
+        credentials = YAML.load(File.new(File.expand_path(path)))
+        self.username   ||= credentials['username']
+        self.password   ||= credentials['password']
+        self.api_token  ||= credentials['api_token']
+        self.base_uri     = credentials['site']       if credentials['site']
+        self.base_uri     = credentials['base_uri']   if credentials['base_uri']
+        self.http_proxy   = { :addr => credentials['proxy_addr'], :port => credentials['proxy_port'] }
+        @credentials_loaded = true
+        puts "Credentials loaded from #{path}"
+      rescue => error
+        puts "Error loading your credentials: #{error.message}"
+        exit 1
+      end
     end
 
-    if password
-      options[:basic_auth] = {:username => username, :password => password}
-    elsif api_token
-      options[:headers]['X-DNSimple-Token'] = "#{username}:#{api_token}"
-    else
-      raise RuntimeError, 'A password or API token is required for all API requests.'
+    def self.credentials_loaded?
+      (@credentials_loaded ||= false) or (username and (password or api_token))
     end
 
-    options
-  end
+    def self.standard_options
+      options = {
+                  :format => :json,
+                  :headers => {'Accept' => 'application/json'},
+                }
+
+      if http_proxy
+        options.merge!(
+          :http_proxyaddr => self.http_proxy[:addr],
+          :http_proxyport => self.http_proxy[:port]
+        )
+      end
+
+      if password
+        options[:basic_auth] = {:username => username, :password => password}
+      elsif api_token
+        options[:headers]['X-DNSimple-Token'] = "#{username}:#{api_token}"
+      else
+        raise Error, 'A password or API token is required for all API requests.'
+      end
+
+      options
+    end
 
-  def self.get(path, options = {})
-    request :get, path, options
-  end
+    def self.get(path, options = {})
+      request :get, path, options
+    end
 
-  def self.post(path, options = {})
-    request :post, path, options
-  end
+    def self.post(path, options = {})
+      request :post, path, options
+    end
 
-  def self.put(path, options = {})
-    request :put, path, options
-  end
+    def self.put(path, options = {})
+      request :put, path, options
+    end
 
-  def self.delete(path, options = {})
-    request :delete, path, options
-  end
+    def self.delete(path, options = {})
+      request :delete, path, options
+    end
 
-  def self.request(method, path, options)
-    response = HTTParty.send(method, "#{base_uri}#{path}",
-      standard_options.merge(options))
+    def self.request(method, path, options)
+      response = HTTParty.send(method, "#{base_uri}/#{path}",
+        standard_options.merge(options))
 
-    pp response if debug?
+      if response.code == 401
+        raise AuthenticationFailed
+      end
 
-    if response.code == 401
-      raise DNSimple::AuthenticationFailed, 'Authentication failed'
+      response
     end
 
-    response
   end
 end

data/lib/dnsimple/commands/{describe_certificate.rb → certificate_describe.rb}

@@ -1,7 +1,7 @@
 module DNSimple
   module Commands
-    class DescribeCertificate
-      def execute(args, options={})
+    class CertificateDescribe
+      def execute(args, options = {})
         domain_name = args.shift
         certificate_id = args.shift
         domain = Domain.find(domain_name)

data/lib/dnsimple/commands/{list_certificates.rb → certificate_list.rb}

@@ -1,7 +1,7 @@
 module DNSimple
   module Commands
-    class ListCertificates
-      def execute(args, options={})
+    class CertificateList
+      def execute(args, options = {})
         domain_name = args.shift
         domain = DNSimple::Domain.find(domain_name)
         certificates = DNSimple::Certificate.all(domain)