dnsimple-ruby 1.1.1 → 1.2.0

data/README

@@ -58,7 +58,7 @@ The following commands are available for managing contacts:
 
 The following commands are available for purchasing certificates:
 
-* dnsimple certificate:purchase domain.com name
+* dnsimple certificate:purchase domain.com name contact_id
 * dnsimple certificate:submit id
 
 The contact name/value pairs are: 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/bin/dnsimple.rb

@@ -80,7 +80,9 @@ service:available domain.com                                # List all of the se
 service:add domain.com short_name                           # Add the service to the domain
 service:remove domain.com short_name                        # Remove the service from the domain
 
-certificate:purchase domain.com name                        # Purchase a certificate
+certificate:list domain.com                                 # List all certificates for a domain
+certificate:describe domain.com id                          # Get a specific certificate for a domain
+certificate:purchase domain.com name contact_id             # Purchase a certificate
 certificate:submit domain.com id approver_email             # Submit a certificate for processing
 
 Please see the DNSimple documentation at https://dnsimple.com/documentation/api for additional

data/lib/dnsimple/certificate.rb

@@ -1,4 +1,7 @@
 module DNSimple #:nodoc:
+  # Represents an SSL certificate that has been purchased. The certificate
+  # must also be submitted using the #submit method before the Certificate
+  # Authority will issue a signed certificate.
   class Certificate
     include HTTParty
     #debug_output $stdout
@@ -10,6 +13,30 @@ module DNSimple #:nodoc:
 
     # The subdomain on the certificate
     attr_accessor :name
+    
+    # The private key, if DNSimple generated the Certificate Signing Request
+    attr_accessor :private_key
+
+    # The SSL certificate, if it has been issued by the Certificate Authority
+    attr_accessor :ssl_certificate
+
+    # The Certificate Signing Request
+    attr_accessor :csr
+
+    # The Certificate status
+    attr_accessor :certificate_status
+    
+    # The date the Certificate order was placed
+    attr_accessor :order_date
+
+    # The date the Certificate will expire
+    attr_accessor :expiration_date
+
+    # The approver email address
+    attr_accessor :approver_email
+
+    # An array of all emails that can be used to approve the certificate
+    attr_accessor :available_approver_emails
 
     # When the certificate was purchased
     attr_accessor :created_at
@@ -17,6 +44,8 @@ module DNSimple #:nodoc:
     # When the certificate was last updated
     attr_accessor :updated_at
 
+    
+
     #:nodoc:
     def initialize(attributes)
       attributes.each do |key, value|
@@ -32,6 +61,8 @@ module DNSimple #:nodoc:
     end
 
     def submit(approver_email, options={})
+      raise DNSimple::Error, "Approver email is required" unless approver_email
+
       options.merge!(DNSimple::Client.standard_options_with_credentials)
       options.merge!(:body => {:certificate => {:approver_email => approver_email}})
 
@@ -43,9 +74,9 @@ module DNSimple #:nodoc:
       when 200
         return DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
       when 401
-        raise RuntimeError, "Authentication failed"
+        raise DNSimple::AuthenticationFailed, "Authentication failed"
       else
-        raise DNSimple::Error.new("#{name}.#{domain.name}", response["errors"])
+        raise DNSimple::Error.new("Error submitting certificate: #{response["errors"]}")
       end
     end
 
@@ -54,6 +85,13 @@ module DNSimple #:nodoc:
     # subdomain part.
     #
     # Example: DNSimple::Certificate.purchase(domain, 'www', contact)
+    #
+    # Please note that by invoking this method DNSimple will immediately charge
+    # your credit card on file at DNSimple for the full certificate price.
+    #
+    # For wildcard certificates an asterisk must appear in the name.
+    #
+    # Example: DNSimple::Certificate.purchase(domain, '*', contact)
     def self.purchase(domain, name, contact, options={})
       certificate_hash = {
         :name => name,
@@ -71,7 +109,7 @@ module DNSimple #:nodoc:
       when 201
         return DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
       when 401
-        raise RuntimeError, "Authentication failed"
+        raise DNSimple::AuthenticationFailed, "Authentication failed"
       when 406
         raise DNSimple::CertificateExists.new("#{name}.#{domain.name}", response["errors"])
       else
@@ -91,11 +129,30 @@ module DNSimple #:nodoc:
       when 200
         response.map { |r| DNSimple::Certificate.new({:domain => domain}.merge(r["certificate"])) }
       when 401
-        raise RuntimeError, "Authentication failed"
+        raise DNSimple::AuthenticationFailed, "Authentication failed"
       else
-        raise DNSimple::Error.new("#{name}.#{domain.name} list certificates error", response["errors"])
+        raise DNSimple::Error.new("List certificates error: #{response["errors"]}")
       end
     end
 
+    # Find a specific certificate for the given domain.
+    def self.find(domain, certificate_id, options={})
+      options.merge!(DNSimple::Client.standard_options_with_credentials)
+
+      response = self.get("#{DNSimple::Client.base_uri}/domains/#{domain.name}/certificates/#{certificate_id}", options) 
+
+      pp response if DNSimple::Client.debug?
+
+      case response.code
+      when 200
+        DNSimple::Certificate.new({:domain => domain}.merge(response["certificate"]))
+      when 401
+        raise DNSimple::AuthenticationFailed, "Authentication failed"
+      when 404
+        raise DNSimple::CertificateNotFound, "Could not find certificate #{certificate_id} for domain #{domain.name}"
+      else
+        raise DNSimple::Error.new("Find certificate error: #{response["errors"]}")
+      end
+    end
   end
 end

data/lib/dnsimple/cli.rb

@@ -67,7 +67,10 @@ module DNSimple
         'service:add' => DNSimple::Commands::AddService,
         'service:remove' => DNSimple::Commands::RemoveService,
 
-        'certificate:purchase' => DNSimple::Commands::PurchaseCertificate
+        'certificate:list' => DNSimple::Commands::ListCertificates,
+        'certificate:describe' => DNSimple::Commands::DescribeCertificate,
+        'certificate:purchase' => DNSimple::Commands::PurchaseCertificate,
+        'certificate:submit' => DNSimple::Commands::SubmitCertificate
       }
     end
   end
@@ -113,4 +116,7 @@ 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'

data/lib/dnsimple/commands/describe_certificate.rb

@@ -0,0 +1,33 @@
+module DNSimple
+  module Commands
+    class DescribeCertificate
+      def execute(args, options={})
+        domain_name = args.shift
+        certificate_id = args.shift
+        domain = Domain.find(domain_name)
+        certificate = Certificate.find(domain, certificate_id)
+        puts "Certificate: #{certificate.fqdn}"
+        puts "\tID: #{certificate.id}"
+        puts "\tStatus: #{certificate.certificate_status}"
+        puts "\tCreated: #{certificate.created_at}"
+        puts "\tOrder Date: #{certificate.order_date}"
+        puts "\tExpires: #{certificate.expiration_date}"
+
+        if certificate.approver_email =~ /\S+/
+          puts "\tApprover email: #{certificate.approver_email}"
+        else
+          puts "\tAvailable approver emails:"
+          certificate.available_approver_emails.split(",").each do |email|
+            puts "\t\t#{email}"
+          end
+        end
+        
+        puts
+        puts "#{certificate.csr}"
+        puts
+        puts "#{certificate.private_key}"
+        puts 
+      end
+    end
+  end
+end

data/lib/dnsimple/commands/list_certificates.rb

@@ -0,0 +1,15 @@
+module DNSimple
+  module Commands
+    class ListCertificates
+      def execute(args, options={})
+        domain_name = args.shift
+        domain = DNSimple::Domain.find(domain_name)
+        certificates = DNSimple::Certificate.all(domain)
+        puts "Found #{certificates.length} certificate for #{domain_name}"
+        certificates.each do |certificate|
+          puts "\t#{certificate.fqdn} (id: #{certificate.id}, status: #{certificate.certificate_status})" 
+        end
+      end
+    end
+  end
+end

data/lib/dnsimple/commands/purchase_certificate.rb

@@ -5,9 +5,13 @@ module DNSimple
     class PurchaseCertificate < Command
       def execute(args, options={})
         domain_name = args.shift
-        name = args.empty? ? '' : args.shift
+        name = args.shift
+        contact_id = args.shift
+
+        domain = Domain.find(domain_name)
+        contact = Contact.find(contact_id)
         
-        certificate = Certificate.purchase(domain_name, name)
+        certificate = Certificate.purchase(domain, name, contact)
         say "Purchased certificate for #{certificate.fqdn}"
       end
     end

data/lib/dnsimple/error.rb

@@ -1,5 +1,11 @@
 module DNSimple
   class Error < StandardError
+    def initialize(message)
+      super(message)
+    end
+  end
+
+  class DomainError < DNSimple::Error
     def initialize(domain, messages)
       @domain = domain
       @messages = messages
@@ -7,5 +13,13 @@ module DNSimple
     end
   end
 
-  class RecordExists < Error; end
+  class RecordExists < DomainError; end
+
+  class AuthenticationFailed < DNSimple::Error; end
+
+  class UserNotFound < DNSimple::Error; end
+
+  class CertificateExists < DNSimple::Error; end
+
+  class CertificateNotFound < DNSimple::Error; end
 end

data/lib/dnsimple/user.rb

@@ -33,11 +33,11 @@ module DNSimple
       when 200
         return User.new(response["user"])
       when 401
-        raise RuntimeError, "Authentication failed"
+        raise DNSimple::AuthenticationFailed, "Authentication failed"
       when 404
-        raise RuntimeError, "Could not find user"
+        raise DNSimple::UserNotFound, "Could not find user"
       else
-        raise RuntimeError, "Error: #{response.code} #{response.message}"
+        raise DNSimple::Error, "Error: #{response.code} #{response.message}"
       end
     end
   end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ RSpec.configure do |c|
   c.extend VCR::RSpec::Macros
 end
 
-config = YAML.load(File.new(File.expand_path('~/.dnsimple.test')))
+config = YAML.load(File.new(File.expand_path('~/.dnsimple.local')))
 
 DNSimple::Client.base_uri = config['site'] || "https://test.dnsimple.com/" 
 DNSimple::Client.username = config['username']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnsimple-ruby
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Anthony Eden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-12 00:00:00 Z
+date: 2011-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -267,6 +267,7 @@ files:
 - lib/dnsimple/commands/delete_record.rb
 - lib/dnsimple/commands/delete_template.rb
 - lib/dnsimple/commands/delete_template_record.rb
+- lib/dnsimple/commands/describe_certificate.rb
 - lib/dnsimple/commands/describe_contact.rb
 - lib/dnsimple/commands/describe_domain.rb
 - lib/dnsimple/commands/describe_record.rb
@@ -274,6 +275,7 @@ files:
 - lib/dnsimple/commands/describe_user.rb
 - lib/dnsimple/commands/list_applied_services.rb
 - lib/dnsimple/commands/list_available_services.rb
+- lib/dnsimple/commands/list_certificates.rb
 - lib/dnsimple/commands/list_contacts.rb
 - lib/dnsimple/commands/list_domains.rb
 - lib/dnsimple/commands/list_extended_attributes.rb