route53 0.1.2 → 0.1.3

data/bin/route53

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'route53'
 require 'route53/cli'
+require 'route53/version'
 
 app = Route53::CLI.new(ARGV, STDIN)
 app.run

data/lib/route53.rb

@@ -1,8 +1,11 @@
+
+require 'rubygems'
 require 'hmac'
 require 'hmac-sha2'
 require 'base64'
 require 'time'
 require 'net/http'
+require 'net/https'
 require 'uri'
 require 'hpricot'
 require 'builder'
@@ -31,7 +34,8 @@ module Route53
       puts "Req: #{data}" if type != "GET" && @verbose
       uri = URI(url)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
+      http.use_ssl = true if uri.scheme == "https"
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if RUBY_VERSION.start_with?("1.8")
       time = get_date
       hmac = HMAC::SHA256.new(@secret)
       hmac.update(time)
@@ -78,7 +82,8 @@ module Route53
       if @date_stale.nil? || @date_stale < Time.now - 30
         uri = URI(@endpoint)
         http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
+        http.use_ssl = true if uri.scheme == "https"
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if RUBY_VERSION.start_with?("1.8")
         resp = nil
         puts "Making Date Request" if @verbose
         http.start { |http| resp = http.head('/date') }

data/lib/route53/cli.rb

@@ -4,7 +4,6 @@ require 'optparse'
 require 'ostruct'
 require 'date'
 require 'yaml'
-require 'route53/version'
 
 module Route53
   class CLI
@@ -60,7 +59,7 @@ module Route53
         opts.on('-g', '--change', String, "Change a record") { |record| @options.change_record = true }
         
         opts.on('--name [NAME]', String, "Specify a name for a record") { |name| @options.name = name }
-        opts.on('--type [TYPE]', String, "Specify a type for a record") { |type| @options.type = type }
+        opts.on('--type [TYPE]', String, "Specify a type for a record") { |dnstype| @options.dnstype = dnstype }
         opts.on('--ttl [TTL]', String, "Specify a TTL for a record") { |ttl| @options.ttl = ttl }
         opts.on('--values [VALUE1],[VALUE2],[VALUE3]', Array, "Specify one or multiple values for a record") { |value| @options.values = value }
         
@@ -143,7 +142,7 @@ module Route53
             resps = []
             zones.each do |z|
               puts "Creating Record"
-              record = Route53::DNSRecord.new(@options.name,@options.type,@options.ttl,@options.values,z)
+              record = Route53::DNSRecord.new(@options.name,@options.dnstype,@options.ttl,@options.values,z)
               puts "Creating Record #{record}"
               resps.push(record.create)
             end
@@ -161,7 +160,7 @@ module Route53
           zones = conn.get_zones(@options.zone)
           if zones.size > 0
             zones.each do |z|
-              records = z.get_records(@options.type.nil? ? "ANY" : @options.type)
+              records = z.get_records(@options.dnstype.nil? ? "ANY" : @options.dnstype)
               if records.size > 0
                 if records.size > 1
                   records = record_picker(records)
@@ -173,7 +172,7 @@ module Route53
                   puts "Record Deleted." unless resp.error?
                 end
               else
-                $stderr.puts "ERROR: Couldn't Find Record for @options.zone of type "+(@options.type.nil? ? "ANY" : @options.type)+"."
+                $stderr.puts "ERROR: Couldn't Find Record for @options.zone of type "+(@options.dnstype.nil? ? "ANY" : @options.dnstype)+"."
               end
             end
           else
@@ -185,19 +184,19 @@ module Route53
           zones = conn.get_zones(@options.zone)
           if zones.size > 0
             zones.each do |z|
-              records = z.get_records(@options.type.nil? ? "ANY" : @options.type)
+              records = z.get_records(@options.dnstype.nil? ? "ANY" : @options.dnstype)
               if records.size > 0
                 if records.size > 1
                   records = record_picker(records,false)
                 end
                 records.each do |r| 
                   puts "Modifying Record #{r.name}"
-                  resp = r.update(@options.name,@options.type,@options.ttl,@options.values,comment=nil)
+                  resp = r.update(@options.name,@options.dnstype,@options.ttl,@options.values,comment=nil)
                   pending_wait(resp)
                   puts "Record Modified." unless resp.error?
                 end
               else
-                $stderr.puts "ERROR: Couldn't Find Record for @options.zone of type "+(@options.type.nil? ? "ANY" : @options.type)+"."
+                $stderr.puts "ERROR: Couldn't Find Record for @options.zone of type "+(@options.dnstype.nil? ? "ANY" : @options.dnstype)+"."
               end
             end
           else
@@ -210,7 +209,7 @@ module Route53
           zones.each do |z|
             puts z
             if @options.zone
-              records = z.get_records(@options.type.nil? ? "ANY" : @options.type)
+              records = z.get_records(@options.dnstype.nil? ? "ANY" : @options.dnstype)
               records.each do |r|
                 puts r
               end
@@ -223,7 +222,7 @@ module Route53
         puts "You've either elected to run the setup or a configuration file could not be found."
         puts "Please answer the following prompts."
         new_config = Hash.new
-        new_config['access_key'] = get_input(String,"Amazon Access Key",)
+        new_config['access_key'] = get_input(String,"Amazon Access Key")
         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/")
@@ -240,7 +239,7 @@ module Route53
         
       end
       
-      def get_input(type,description,default = nil)
+      def get_input(inputtype,description,default = nil)
         print "#{description}: [#{default}] "
         STDOUT.flush
         selection = gets
@@ -248,7 +247,7 @@ module Route53
         if selection == ""
           selection = default
         end
-        if type == true.class
+        if inputtype == true.class
           selection = (selection == 'Y')
         end
         return selection

data/lib/route53/version.rb

@@ -1,3 +1,3 @@
 module Route53
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/route53.gemspec

@@ -11,9 +11,8 @@ Gem::Specification.new do |s|
   s.summary     = "Library for Amazon's Route 53 service"
   s.description = "Provides CRUD and list operations for records and zones as part of Amazon's Route 53 service."
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_rubygems_version = ">= 1.3.5"
 
-  s.add_dependency "bundler", ">= 1.0.0"
   s.add_dependency "ruby-hmac"
   s.add_dependency "hpricot"
   s.add_dependency "builder"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Philip Corliss
@@ -18,7 +18,7 @@ date: 2010-12-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: ruby-hmac
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -26,14 +26,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-hmac
+  name: hpricot
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -58,19 +56,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: Provides CRUD and list operations for records and zones as part of Amazon's Route 53 service.
 email: pcorlis@50projects.com
 executables: 
@@ -81,8 +66,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- Gemfile
-- Gemfile.lock
 - README.markdown
 - Rakefile
 - bin/route53
@@ -115,8 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       segments: 
       - 1
       - 3
-      - 6
-      version: 1.3.6
+      - 5
+      version: 1.3.5
 requirements: []
 
 rubyforge_project: 

data/Gemfile

@@ -1,4 +0,0 @@
-source :gemcutter
-
-# Specify your gem's dependencies in route53.gemspec
-gemspec

data/Gemfile.lock

@@ -1,21 +0,0 @@
-PATH
-  remote: .
-  specs:
-    route53 (0.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    hpricot (0.8.3)
-    ruby-hmac (0.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  builder
-  bundler (>= 1.0.0)
-  hpricot
-  route53!
-  ruby-hmac