route53 0.1.3 → 0.1.4

data/README.markdown

@@ -0,0 +1,181 @@
+Ruby Interface for Amazon's Route 53
+====================================
+
+This interface can either be used as a command line tool or as a library from within your existing ruby project. It provides a way to interact with Amazon's Route 53 service.
+
+Costs & Impact
+--------------
+
+At the time of this writing Amazon charges $1/zone/month. This includes zones that have been created and deleted and then recreated. The creator of this gem is not responsible for costs incurred while using this interface or unexpected oepration or bugs which may incur a cost for the user. The creator is also not responsible for any downtime incurred or disruption in service from the usage of this tool. DNS can be a tricky thing, be careful and always make sure you have a backup of your zone prior to mucking around with it. (route53 -l example.com.)
+
+Latest Version
+--------------
+
+The latest source should be available on my [github account](https://github.com/pcorliss/ruby_route_53) and if you can't obtain it using the gem command you can go directly to the [gem page](https://rubygems.org/gems/route53) hosted on rubygems.
+
+Installation
+------------
+
+Installing the Gem
+
+    sudo gem install route53
+
+Ubuntu with precompiled dependencies
+
+    sudo apt-get update
+    sudo apt-get install ruby rubygems libopenssl-ruby libhmac-ruby libbuilder-ruby libhpricot-ruby
+    sudo gem install route53 --ignore-dependencies
+    /var/lib/gems/1.X/gems/route53-W.Y.Z/bin/route53
+    
+    #When working with the library and using this method you may need to require the library manually
+    require '/var/lib/gems/1.X/gems/route53-W.Y.Z/lib/route53'
+    
+Ubuntu with building dependencies
+
+    sudo apt-get update
+    sudo apt-get install ruby rubygems ruby-dev build-essential libopenssl-ruby
+    sudo gem install route53
+    /var/lib/gems/1.X/bin/route53
+    
+The first time you run the gem in command line mode you'll be prompted to setup. You'll want to have your Amazon access and secret key ready.
+
+    You've either elected to run the setup or a configuration file could not be found.
+    Please answer the following prompts.
+    Amazon Access Key: []
+    Amazon Secret Key: []
+    Amazon Route 53 API Version: [2010-10-01] 
+    Amazon Route 53 Endpoint: [https://route53.amazonaws.com/] 
+    Default TTL: [3600] 
+    Save the configuration file to "~/.route53"?: [Y] 
+
+Command Line Options
+--------------------
+
+    Usage: route53 [options]
+    
+    -v, --version                    Print Version Information
+    -h, --help                       Show this message
+    -V, --verbose                    Verbose Output
+    -l, --list [ZONE]                Receive a list of all zones or specify a zone to view
+    -n, --new [ZONE]                 Create a new Zone
+    -d, --delete [ZONE]              Delete a Zone
+    -z, --zone [ZONE]                Specify a zone to perform an operation on. Either in 'example.com.' or '/hostedzone/XXX' format
+    -c, --create                     Create a new record
+    -r, --remove                     Remove a record
+    -g, --change                     Change a record
+        --name [NAME]                Specify a name for a record
+        --type [TYPE]                Specify a type for a record
+        --ttl [TTL]                  Specify a TTL for a record
+        --values [VALUE1],[VALUE2],[VALUE3]
+                                     Specify one or multiple values for a record
+    -m, --comment [COMMENT]          Provide a comment for this operation
+        --no-wait                    Do not wait for actions to finish syncing.
+    -s, --setup                      Run the setup ptogram to create your configuration file.
+    -f, --file [CONFIGFILE]          Specify a configuration file to use
+        --access [ACCESSKEY]         Specify an access key on the command line.
+        --secret [SECRETKEY]         Specify a secret key on the command line. WARNING: Not a good idea
+
+
+Command Line Usage
+------------------
+
+Once route53 is installed, started and has been setup you're ready to start. You can use the following examples to get started.
+
+    #Creating a new zone
+    route53 -n example.com.
+    
+    #List Operations
+    route53 -l #Get all zones for this account
+    route53 -l example.com. #Get all records for this account within the zone example.com.
+    
+    #Create a new record within our newly created zone.
+    route53 --zone example.com. -c --name foo.example.com. --type CNAME --ttl 3600 --values example.com.
+    
+    #New MX Record for a Google Apps hosted domain
+    route53 --zone example.com. -c --name example.com. --type MX --ttl 3600 \
+    --values "10 ASPMX.L.GOOGLE.com.","20 ALT1.ASPMX.L.GOOGLE.com.","30 ALT2.ASPMX.L.GOOGLE.com.","40 ASPMX2.GOOGLEMAIL.com.","50 ASPMX3.GOOGLEMAIL.com."
+    
+    #Update the TTL of a record (Leave values nil to leave them alone)
+    #You'll be prompted to select the record from a list.
+    #If updating values for a record, make sure to includ all other values. Otherwise they will be dropped
+    route53 --zone example.com. -g --ttl 600
+    
+    #Deleting a zone - First remove all records except the NS and SOA record. Then delete the zone.
+    route53 --zone example.com. -r
+    route53 -d example.com.
+
+Library Usage
+-------------
+
+If you're using this as a library for your own ruby project you can load it and perform operations by using the following examples.
+
+    require 'route53'
+
+    #Creating a Connection object
+    conn = Route53::Connection.new(my_access_key,my_secret_key) #opens connection
+    
+    #Creating a new zone and working with responses
+    new_zone = Route53::Zone.new("example.com.",nil,conn) #Create a new zone "example.com."
+    resp = new_zone.create_zone #Creates a new zone
+    exit 1 if resp.error? #Exit if there was an error. The AWSResponse Class automatically prints out error messages to STDERR.
+    while resp.pending? #Waits for response to sync on Amazon's servers.
+      sleep 1 #If you'll be performing operations on this newly created zone you'll probably want to wait.
+    end
+    
+    #List Operations
+    zones = conn.get_zones #Requests list of all zones for this account
+    records = zones.first.get_records #Gets list of all records for a specific zone
+    
+    #Create a new record within our newly created zone.
+    new_record = Route53::DNSRecord.new("foo.example.com.","CNAME","3600",["example.com."],new_zone)
+    resp = new_record.create 
+    
+    #New MX Record for a Google Apps hosted domain
+    new_mx_record = Route53::DNSRecord.new("example.com.","MX","3600",
+                      ["10 ASPMX.L.GOOGLE.com.",
+                      "20 ALT1.ASPMX.L.GOOGLE.com.",
+                      "30 ALT2.ASPMX.L.GOOGLE.com.",
+                      "40 ASPMX2.GOOGLEMAIL.com.",
+                      "50 ASPMX3.GOOGLEMAIL.com."],
+                      new_zone)
+    resp = new_mx_record.create
+    
+    #Update the TTL of a record (Leave values nil to leave them alone)
+    #If updating values for a record, make sure to includ all other values. Otherwise they will be dropped
+    resp = new_record.update(nil,nil,"600",nil)
+    
+    #Deleting a zone
+    #A zone can't be deleted until all of it's records have been deleted (Except for 1 NS record and 1 SOA record)
+    new_zone.get_records.each do |record|
+      unless record.type == 'NS' || record.type == 'SOA'
+        record.delete
+      end
+    end
+    new_zone.delete_zone
+    
+
+Requirements
+------------
+
+Written with Ruby 1.9.2 on an Ubuntu Linux machine. Smoke tested on an Ubuntu Linux machine with Ruby 1.8.7.
+
+Amazon AWS account with Route 53 opted into - See the signup link at [http://aws.amazon.com/route53/](http://aws.amazon.com/route53/)
+ruby openssl support
+ruby-hmac
+hpricot
+builder
+
+Support and Bugs
+----------------
+
+Bug reports are appreciated and encouraged. Please either file a detailed issue on [Github](https://github.com/pcorliss/ruby_route_53/issues) or send an email to support@50projects.com.
+
+Contact
+-------
+
+This ruby interface for Amazon's Route 53 service was created by Philip Corliss (pcorliss@50projects.com) [50projects.com](http://50projects.com). You can find more information on him and 50projects at [http://blog.50projects.com](http://blog.50projects.com)
+
+License
+-------
+
+LazyRaid is licensed under the GPL. See the LICENSE file for details.

data/lib/route53.rb

@@ -45,31 +45,40 @@ module Route53
         'X-Amzn-Authorization' => "AWS3-HTTPS AWSAccessKeyId=#{@accesskey},Algorithm=HmacSHA256,Signature=#{signature}",
         'Content-Type' => 'text/xml; charset=UTF-8'
       }
-      resp, raw_resp = http.send_request(type,uri.path,data,headers)
+      resp, raw_resp = http.send_request(type,uri.path+"?"+(uri.query.nil? ? "" : uri.query),data,headers)
       #puts "Resp:"+resp.to_s if @verbose
       #puts "XML_RESP:"+raw_resp if @verbose
       return AWSResponse.new(raw_resp,self)
     end
     
     def get_zones(name = nil)
-      resp = request("#{@base_url}/hostedzone")
-      if resp.error?
-        return nil
-      end
-      zone_list = Hpricot::XML(resp.raw_data)
+      truncated = true
+      query = []
       zones = []
-      elements = zone_list.search("HostedZone")
-      elements.each do |e|
-        zones.push(Zone.new(e.search("Name").first.innerText,
-                            e.search("Id").first.innerText,
-                            self))
+      while truncated
+        if !name.nil? && name.start_with?("/hostedzone/")
+          resp = request("#{@base_url}#{name}")
+          truncated = false
+        else
+          resp = request("#{@base_url}/hostedzone?"+query.join("&"))
+        end
+        return nil if resp.error?
+        zone_list = Hpricot::XML(resp.raw_data)
+        elements = zone_list.search("HostedZone")
+        elements.each do |e|
+          zones.push(Zone.new(e.search("Name").first.innerText,
+                              e.search("Id").first.innerText,
+                              self))
+        end
+        truncated = (zone_list.search("IsTruncated").first.innerText == "true") if truncated
+        query = ["marker="+zone_list.search("NextMarker").first.innerText] if truncated
       end
-      unless name.nil?
+      unless name.nil? || name.start_with?("/hostedzone/")
         name_arr = name.split('.')
         (0 ... name_arr.size).each do |i| 
           search_domain = name_arr.last(name_arr.size-i).join('.')+"."
           zone_select = zones.select { |z| z.name == search_domain }
-          return zone_select if zone_select.size == 1
+          return zone_select
         end
         return nil
       end
@@ -112,10 +121,6 @@ module Route53
       @conn = conn
     end
     
-    def exists?
-    
-    end
-    
     def delete_zone
       @conn.request(@conn.base_url + @host_url,"DELETE")
     end
@@ -130,37 +135,52 @@ module Route53
         # "unique string that identifies the request and that 
         # allows failed CreateHostedZone requests to be retried without the risk of executing the operation twice."
         # Just going to pass a random string instead.
-        create.CallerReference(rand().to_s)
+        create.CallerReference(rand(2**32).to_s(16))
         create.HostedZoneConfig { |conf|
           conf.Comment(comment)
         }
       }
       #puts "XML:\n#{xml_str}" if @conn.verbose
-      @conn.request(@conn.base_url + "/hostedzone","POST",xml_str)
+      resp = @conn.request(@conn.base_url + "/hostedzone","POST",xml_str)
+      resp_xml = Hpricot::XML(resp.raw_data)
+      @host_url = resp_xml.search("HostedZone").first.search("Id").first.innerText
+      return resp
     end
     
     def get_records(type="ANY")
       return nil if host_url.nil?
-      resp = @conn.request(@conn.base_url+@host_url+"/rrset")
-      if resp.error?
-        return nil
-      end
-      zone_file = Hpricot::XML(resp.raw_data)
-      records = zone_file.search("ResourceRecordSet")
       
+      truncated = true
+      query = []
       dom_records = []
-      records.each do |record|
-        #puts "Name:"+record.search("Name").first.innerText if @conn.verbose
-        #puts "Type:"+record.search("Type").first.innerText if @conn.verbose
-        #puts "TTL:"+record.search("TTL").first.innerText if @conn.verbose
-        record.search("Value").each do |val|
-          #puts "Val:"+val.innerText if @conn.verbose
+      while truncated
+        resp = @conn.request(@conn.base_url+@host_url+"/rrset?"+query.join("&"))
+        if resp.error?
+          return nil
+        end
+        zone_file = Hpricot::XML(resp.raw_data)
+        records = zone_file.search("ResourceRecordSet")
+
+        records.each do |record|
+          #puts "Name:"+record.search("Name").first.innerText if @conn.verbose
+          #puts "Type:"+record.search("Type").first.innerText if @conn.verbose
+          #puts "TTL:"+record.search("TTL").first.innerText if @conn.verbose
+          record.search("Value").each do |val|
+            #puts "Val:"+val.innerText if @conn.verbose
+          end
+          dom_records.push(DNSRecord.new(record.search("Name").first.innerText,
+                        record.search("Type").first.innerText,
+                        record.search("TTL").first.innerText,
+                        record.search("Value").map { |val| val.innerText },
+                        self))
+        end
+        
+        truncated = (zone_file.search("IsTruncated").first.innerText == "true")
+        if truncated
+          next_name = zone_file.search("NextRecordName").first.innerText
+          next_type = zone_file.search("NextRecordType").first.innerText
+          query = ["name="+next_name,"type="+next_type]
         end
-        dom_records.push(DNSRecord.new(record.search("Name").first.innerText,
-                      record.search("Type").first.innerText,
-                      record.search("TTL").first.innerText,
-                      record.search("Value").map { |val| val.innerText },
-                      self))
       end
       @records = dom_records
       if type != 'ANY'
@@ -205,19 +225,42 @@ module Route53
   
   class AWSResponse
     attr_reader :raw_data
+    
+    #I wanted to put this in a seprate file but ruby's method of determinign the root of the gem is a pain in the butt and I was in a hurry. Sorry. -PC
+
+      
     def initialize(resp,conn)
       @raw_data = resp
       if error?
-        $stderr.puts "An Error has occured"
-        $stderr.puts @raw_data
+        $stderr.puts "ERROR: Amazon returned an error for the request."
+        $stderr.puts "ERROR: RAW_XML: "+@raw_data
+        $stderr.puts "ERROR: "+error_message
+        $stderr.puts ""
+        $stderr.puts "What now? "+helpful_message
+        #exit 1
       end
       @conn = conn
+      @created = Time.now
       puts "Raw: #{@raw_data}" if @conn.verbose
     end
     
     def error?
       return Hpricot::XML(@raw_data).search("ErrorResponse").size > 0
     end
+    
+    def error_message
+      xml = Hpricot::XML(@raw_data)
+      msg_code = xml.search("Code")
+      msg_text = xml.search("Message")
+      return (msg_code.size > 0 ? msg_code.first.inner_text : "") + (msg_text.size > 0 ? ': ' + msg_text.first.innerText : "")
+    end
+    
+    def helpful_message
+      xml = Hpricot::XML(@raw_data)
+      msg_code = xml.search("Code").first.innerText
+      return $messages[msg_code] if $messages[msg_code]
+      return $messages["Other"]
+    end
 
     def complete?
       return true if error?
@@ -232,6 +275,10 @@ module Route53
       if @complete.nil? || @complete == false
         status = Hpricot::XML(@conn.request(@conn.base_url+@change_url).raw_data).search("Status")
         @complete = status.size > 0 && status.first.innerText == "INSYNC" ? true : false
+        if !@complete && @created - Time.now > 60
+          $stderr.puts "WARNING: Amazon Route53 Change timed out on Sync. This may not be an issue as it may just be Amazon being assy. Then again your request may not have completed.'"
+          @complete = true
+        end
       end
       return @complete
     end
@@ -254,6 +301,9 @@ module Route53
     
     def initialize(name,type,ttl,values,zone)
       @name = name
+      unless @name.end_with?(".")
+        @name += "."
+      end
       @type = type
       @ttl = ttl
       @values = values
@@ -312,9 +362,17 @@ module Route53
     end
     
     def to_s
-      return "#{@name} #{@type} #{@ttl} #{@values}"
+      return "#{@name} #{@type} #{@ttl} #{@values.join(",")}"
     end
   end
 end
 
+    $messages = { "InvalidClientTokenId" => "You may have a missing or incorrect secret or access key. Please double check your configuration files and amazon account",
+                  "MissingAuthenticationToken" => "You may have a missing or incorrect secret or access key. Please double check your configuration files and amazon account",
+                  "OptInRequired" => "In order to use Amazon's Route 53 service you first need to signup for it. Please see http://aws.amazon.com/route53/ for your account information and use the associated access key and secret.",
+                  "Other" => "It looks like you've run into an unhandled error. Please send a detailed bug report with the entire input and output from the program to support@50projects.com or to https://github.com/pcorliss/ruby_route_53/issues and we'll do out best to help you.",
+                  "SignatureDoesNotMatch" => "It looks like your secret key is incorrect or no longer valid. Please check your amazon account information for the proper key.",
+                  "HostedZoneNotEmpty" => "You'll need to first delete the contents of this zone. You can do so using the '--remove' option as part of the command line interface.",
+                  "InvalidChangeBatch" => "You may have tried to delete a NS or SOA record. This error is safe to ignore if you're just trying to delete all records as part of a zone prior to deleting the zone. Otherwise please file a bug by sending a detailed bug report with the entire input and output from the program to support@50projects.com or to https://github.com/pcorliss/ruby_route_53/issues and we'll do out best to help you."}
+                  
 

data/lib/route53/cli.rb

@@ -49,10 +49,10 @@ module Route53
         opts.on('-V', '--verbose',"Verbose Output") { @options.verbose = true }  
         #opts.on('-q', '--quiet',"Quiet Output") { @options.quiet = true }
         
-        opts.on('-l', '--list [ZONE]', String, "Receive a list of all zones or specify a zone to view") { |zone| @options.zone = zone; @options.list = true }
-        opts.on('-n', '--new [ZONE]', String, "Create a new Zone") { |zone| @options.zone = zone; @options.new_zone = true }
-        opts.on('-d', '--delete [ZONE]', String, "Delete a Zone") { |zone| @options.zone = zone; @options.delete_zone = true }
-        opts.on('-z', '--zone [ZONE]', String, "Specify a zone to perform an operation on") { |zone| @options.zone = zone }
+        opts.on('-l', '--list [ZONE]', String, "Receive a list of all zones or specify a zone to view") { |zone| @options.zone = zone unless zone.nil?; @options.list = true }
+        opts.on('-n', '--new [ZONE]', String, "Create a new Zone") { |zone| @options.zone = zone unless zone.nil?; @options.new_zone = true }
+        opts.on('-d', '--delete [ZONE]', String, "Delete a Zone") { |zone| @options.zone = zone unless zone.nil?; @options.delete_zone = true }
+        opts.on('-z', '--zone [ZONE]', String, "Specify a zone to perform an operation on. Either in 'example.com.' or '/hostedzone/XXX' format") { |zone| @options.zone = zone }
         
         opts.on('-c', '--create', "Create a new record") { @options.create_record = true }
         opts.on('-r', '--remove', String, "Remove a record") { |record| @options.remove_record = true }
@@ -89,6 +89,11 @@ module Route53
         load_config
         @config['access_key'] = @options.access unless @options.access.nil?
         @config['secret_key'] = @options.secret unless @options.secret.nil?
+        
+        
+        required_options("",["--access-key"]) if @config['access_key'].nil? || @config['access_key'] == ""
+        required_options("",["--secret_key"]) if @config['secret_key'].nil? || @config['secret_key'] == ""
+        
       end
       
       def output_options
@@ -100,14 +105,47 @@ module Route53
       end
 
       def arguments_valid?
-        true #if @arguments.length == 1 
+        return true if @arguments.length == 0
+        $stderr.puts "Received extra arguments. that couldn't be handled:#{@arguments}"
+        return false
       end
       
       # Setup the arguments
       def process_arguments
-
-        
         if @options.new_zone
+          new_zone
+        elsif @options.delete_zone
+          delete_zone
+        elsif @options.create_record
+          create_record
+        elsif @options.remove_record 
+          remove_record
+        elsif @options.change_record
+          change_record
+        elsif @options.list || @options.zone.nil?
+          list
+        end
+      end
+      
+      def list
+        zones = conn.get_zones(@options.zone)
+        unless zones.nil?
+          zones.each do |z|
+            puts z
+            if @options.zone
+              records = z.get_records(@options.dnstype.nil? ? "ANY" : @options.dnstype)
+              records.each do |r|
+                puts r
+              end
+            end
+          end
+        else
+          $stderr.puts "ERROR: No Records found for #{@options.zone}"
+        end
+      end
+    
+      def new_zone
+        if @options.zone
           new_zone = Route53::Zone.new(@options.zone,nil,conn)
           puts "Creating New Zone #{@options.zone}"
           resp = new_zone.create_zone(@options.comment)
@@ -117,9 +155,13 @@ module Route53
             pending_wait(resp)
             puts "Zone Created."
           end
+        else
+          required_options("new zone",["--zone"])
         end
-        
-        if @options.delete_zone
+      end
+      
+      def delete_zone
+        if @options.zone
           records = conn.get_zones(@options.zone)
           if records.size > 0
             if records.size > 1
@@ -134,14 +176,21 @@ module Route53
           else
             $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
           end
+        else
+          required_options("delete zone",["--zone"])
         end
-        
-        if @options.create_record
+      end
+      
+      def create_record
+        if @options.zone && @options.name && 
+           @options.dnstype && @options.values && 
+           (@options.ttl || @config['default_ttl'])
           zones = conn.get_zones(@options.zone)
           if zones.size > 0
             resps = []
             zones.each do |z|
               puts "Creating Record"
+              @options.ttl = @config['default_ttl'] if @options.ttl.nil?
               record = Route53::DNSRecord.new(@options.name,@options.dnstype,@options.ttl,@options.values,z)
               puts "Creating Record #{record}"
               resps.push(record.create)
@@ -153,10 +202,16 @@ module Route53
           else
             $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
           end
-
+        else
+          #$stderr.puts "ERROR: The following arguments are required for a create record operation."
+          #$stderr.puts "ERROR: --zone and at least one of --name, --type, --ttl or --values"
+          #exit 1
+          required_options("create record",["--zone","--name","--type","--ttl","--values"])
         end
-        
-        if @options.remove_record
+      end
+      
+      def remove_record
+        if @options.zone
           zones = conn.get_zones(@options.zone)
           if zones.size > 0
             zones.each do |z|
@@ -178,9 +233,16 @@ module Route53
           else
             $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
           end
+        else
+          #$stderr.puts "ERROR: The following arguments are required for a record removal operation."
+          #$stderr.puts "ERROR: --zone"
+          #exit 1
+          required_options("record removal",["--zone"])
         end
-        
-        if @options.change_record
+      end
+      
+      def change_record
+        if @options.zone && (@options.name || @options.dnstype || @options.ttl || @options.values)
           zones = conn.get_zones(@options.zone)
           if zones.size > 0
             zones.each do |z|
@@ -202,20 +264,21 @@ module Route53
           else
             $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
           end
+        else
+          #$stderr.puts "ERROR: The following arguments are required for a record change operation."
+          #$stderr.puts "ERROR: --zone and at least one of --name, --type, --ttl or --values"
+          #exit 1
+          required_options("record change",["--zone"],["--name","--type","--ttl","--values"])
         end
-        
-        if @options.list || @options.zone.nil?
-          zones = conn.get_zones(@options.zone)
-          zones.each do |z|
-            puts z
-            if @options.zone
-              records = z.get_records(@options.dnstype.nil? ? "ANY" : @options.dnstype)
-              records.each do |r|
-                puts r
-              end
-            end
-          end
-        end
+      end
+      
+      def required_options(operation,required = [],at_least_one = [],optional = [])
+        operation == "" ? operation += " " : operation = " "+operation+" "
+        $stderr.puts "ERROR: The following arguments are required for a#{operation}operation."
+        $stderr.puts "ERROR: #{required.join(", ")} #{ (required.size > 1 ? "are" : "is") } required." if required.size > 0
+        $stderr.puts "ERROR: At least one of #{at_least_one.join(", ")} are required." if at_least_one.size > 0
+        $stderr.puts "ERROR: #{optional.join(", ")}are optional." if optional.size > 0
+        exit 1
       end
       
       def setup
@@ -226,10 +289,12 @@ module Route53
         new_config['secret_key'] = get_input(String,"Amazon Secret Key")
         new_config['api'] = get_input(String,"Amazon Route 53 API Version","2010-10-01")
         new_config['endpoint'] = get_input(String,"Amazon Route 53 Endpoint","https://route53.amazonaws.com/")
+        new_config['default_ttl'] = get_input(String,"Default TTL","3600")
         if get_input(true.class,"Save the configuration file to \"~/.route53\"?","Y")
           File.open(@options.file,'w') do |out|
             YAML.dump(new_config,out)
           end
+          File.chmod(0600,@options.file)
           load_config
         else
           puts "Not Saving File. Dumping Config instead."
@@ -271,7 +336,6 @@ module Route53
           exit 1
         end
         selection = selection.to_i
-        puts "Received #{selection}"
         if selection == records.size && allowall
           return records
         elsif selection == records.size + 1
@@ -287,6 +351,8 @@ module Route53
       def pending_wait(resp)
         while !@options.nowait && resp.pending?
           print '.'
+          
+          STDOUT.flush
           sleep 1
         end
       end