clouddns 0.0.2 → 0.0.3

data/bin/clouddns

@@ -9,10 +9,16 @@ options = {
   :force => false
 }
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [OPTIONS] [ACTION] FILES"
+option_parser = OptionParser.new do |opts|
+  opts.banner = [
+    "Usage: #{$0} [OPTIONS] print    FILES  # Pretty print contents of FILES",
+    "       #{$0} [OPTIONS] migrate  FILES  # Update DNS servers",
+    "       #{$0} [OPTIONS] zonefile FILES  # Print FILES as zone files",
+    "",
+    ""
+  ].join("\n")
 
-  opts.on('-p', '--provider provider', "Override DNS provider (AWS, Zerigo, etc)") do |provider|
+  opts.on('-p', '--provider provider', "Override DNS provider (AWS, bluebox, dnsimple, dnsmadeeasy, linode, slicehost, zerigo)") do |provider|
     options[:fog][:provider] = provider
   end
 
@@ -29,13 +35,26 @@ OptionParser.new do |opts|
     puts opts
     exit
   end
-end.parse!
+end
+
+option_parser.parse!
 
 action = ARGV.slice!(0)
 files = ARGV
 
-raise "No action specified" unless action
-raise "No files specified" if files.empty?
+if !action
+  error = "No action specified"
+elsif files.empty?
+  error = "No files specified"
+else
+  error = nil
+end
+
+if error
+  puts error
+  puts option_parser
+  exit 1
+end
 
 action = Clouddns::Actions.by_name(action)
 

data/clouddns.gemspec

@@ -14,4 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "clouddns"
   gem.require_paths = ['lib']
   gem.version       = Clouddns::VERSION
+
+  # 0.9.0 changed Record#ip to Record#value
+  gem.add_dependency('fog', '>= 0.9.0')
 end

data/lib/clouddns.rb

@@ -1,11 +1,10 @@
-require "fog"
-
 require "clouddns/actions"
 require "clouddns/dsl"
 require "clouddns/record"
+require "clouddns/utils"
 require "clouddns/version"
 require "clouddns/zone"
 require "clouddns/zone_migration"
 
-module Clouddns
-end
+require 'clouddns/railtie' if defined?(Rails)
+

data/lib/clouddns/actions.rb

@@ -2,6 +2,7 @@
 require 'clouddns/actions/generic_action'
 require 'clouddns/actions/print'
 require 'clouddns/actions/migrate'
+require 'clouddns/actions/zonefile'
 
 module Clouddns
   module Actions
@@ -9,6 +10,7 @@ module Clouddns
       case name.downcase
       when 'print' then Print
       when 'migrate' then Migrate
+      when 'zonefile' then Zonefile
       else
         raise "Unknown action: #{name}"
       end

data/lib/clouddns/actions/migrate.rb

@@ -1,11 +1,10 @@
-require 'clouddns/actions/print_record'
 
 module Clouddns
   module Actions
     class Migrate < GenericAction
-      include PrintRecord
-
       def run
+        require 'fog'
+
         @fog = Fog::DNS.new(@options[:fog])
         @fog_zone = @fog.zones.find { |z| z.domain == @zone.name }
 
@@ -52,15 +51,15 @@ module Clouddns
       end
 
       def print_changes
-        namelength = @migration.changes.map do |(action, record)|
-          record.name.length
+        namelength = @migration.changes.map do |change|
+          change.record.name.length
         end.max
 
         puts
         puts "Changes:"
 
-        @migration.changes.each do |(action, record)|
-          print_record record, namelength, action
+        @migration.changes.each do |change|
+          puts change.to_s(namelength)
         end
       end
 

data/lib/clouddns/actions/print.rb

@@ -1,10 +1,7 @@
-require 'clouddns/actions/print_record'
 
 module Clouddns
   module Actions
     class Print < GenericAction
-      include PrintRecord
-
       def run
         print_all
       end
@@ -14,7 +11,7 @@ module Clouddns
         puts "Zone '#{@zone.name}'"
         namelength = @zone.records.map{ |x| x.name.length }.max
         @zone.records.each do |record|
-          print_record record, namelength
+          puts Utils::format_record record, :namelength => namelength
         end
       end
     end

data/lib/clouddns/actions/zonefile.rb

@@ -0,0 +1,29 @@
+
+module Clouddns
+  module Actions
+    class Zonefile < GenericAction
+      def run
+        print_all
+      end
+
+      protected
+      def print_all
+        puts "$ORIGIN #{@zone.name}"
+
+        namelength = @zone.records.map{ |x| x.name.length }.max
+        @zone.records.each do |record|
+          record.value.each_with_index do |value, i|
+            print "%-18s " % record.name
+            print "%5i " % record.ttl
+            print "IN "
+            print "%-5s " % record.type
+            print "%s " % value
+            puts
+          end
+        end
+        puts
+      end
+    end
+  end
+end
+

data/lib/clouddns/dsl.rb

@@ -3,9 +3,6 @@ module Clouddns
     attr_reader :zones
     attr_reader :fog_options
 
-    # This need not be too strict. Only exists to help catch typos.
-    DNS_REGEX = /\A.*\..*\.\z/
-
     def initialize
       @zones = []
       @zone = nil
@@ -32,7 +29,8 @@ module Clouddns
     end
 
     def add_record type, name, value, options={}
-      name = domainname(name)
+      name = Utils::parse_domain(name)
+      options = @defaults.merge(options)
 
       value = "\"#{value}\"" if type == 'TXT'
 
@@ -45,7 +43,7 @@ module Clouddns
     def zone name
       raise "zones cannot be nested" if @zone
 
-      @zone = Zone.new(domainname(name))
+      @zone = Zone.new(Utils::parse_domain(name))
       @zones << @zone
       yield
       @zone = nil
@@ -66,15 +64,6 @@ module Clouddns
     def provider name, options={}
       @fog_options = options.merge({:provider => name})
     end
-
-    private
-    def domainname name
-      if name.end_with? '.'
-        name
-      else
-        "#{name}."
-      end
-    end
   end
 end
 

data/lib/clouddns/railtie.rb

@@ -0,0 +1,9 @@
+
+module Clouddns
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load 'clouddns/tasks.rb'
+    end
+  end
+end
+

data/lib/clouddns/tasks.rb

@@ -0,0 +1,33 @@
+
+require 'clouddns'
+require 'pathname'
+
+namespace :dns do
+  desc "Print DNS entries from config/dns/*.rb"
+  task :print do
+    run_action Clouddns::Actions::Print
+  end
+  desc "Update DNS service with config/dns/*.rb"
+  task :migrate do
+    run_action Clouddns::Actions::Migrate
+  end
+  desc "Print config/dns/*.rb as zonefiles"
+  task :zonefile do
+    run_action Clouddns::Actions::Zonefile
+  end
+  def run_action action
+    root_path = defined?(Rails) ? Rails.root : Pathname.new('.')
+    dns_path = root_path.join('config', 'dns')
+    files = Dir[dns_path.join('**','*.rb')]
+    if files.empty?
+      raise "No DNS configuration. Please create config/dns/yourdomain.rb"
+    end
+    files.each do |file|
+      dsl = Clouddns::DSL.parse_file(file)
+      dsl.zones.each do |zone|
+        action.run(zone)
+      end
+    end
+  end
+end
+

data/lib/clouddns/utils.rb

@@ -0,0 +1,31 @@
+module Clouddns
+  module Utils
+    extend self
+
+    def parse_domain name
+      if name =~ /\A(.*?\..*?)\.?\z/
+        "#{$1}."
+      else
+        raise "Invalid domain: '#{name}'"
+      end
+    end
+
+    def format_record record, options={}
+      namelength = options[:namelength] || 20
+      prefix = options[:prefix] || ''
+
+      output = []
+
+      record.value.each_with_index do |value, i|
+        if i.zero?
+          args = [prefix, record.type, record.ttl, record.name, value]
+        else
+          args = [prefix, '', '', '', value]
+        end
+        output << "%s%5s %5s %#{namelength}s %s" % args
+      end
+
+      output.join("\n")
+    end
+  end
+end

data/lib/clouddns/version.rb

@@ -1,3 +1,3 @@
 module Clouddns
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/clouddns/zone_migration.rb

@@ -1,5 +1,28 @@
 module Clouddns
   class ZoneMigration
+    module Change
+      class None < Struct.new(:record)
+        def perform! fog_zone
+        end
+        def print_prefix; ' '; end
+        def to_s length=30
+          Utils::format_record record, :prefix => print_prefix, :namelength => length
+        end
+      end
+      class Create < None
+        def perform! fog_zone
+          fog_zone.records.create(:type => record.type, :name => record.name, :value => record.value, :ttl => record.ttl)
+        end
+        def print_prefix; '+'; end
+      end
+      class Remove < None
+        def perform! fog_zone
+          record.destroy
+        end
+        def print_prefix; '-'; end
+      end
+    end
+
     def initialize zone, fog_zone
       @zone = zone
       @fog_zone = fog_zone
@@ -12,35 +35,31 @@ module Clouddns
       @zone.records.each do |record|
         if (fog_record = fog_records.delete([record.name, record.type]))
           if records_equal?(record, fog_record)
-            @changes << [' ', record]
+            @changes << Change::None.new(record)
           else
-            @changes << ['-', fog_record]
-            @changes << ['+', record]
+            @changes << Change::Remove.new(fog_record)
+            @changes << Change::Create.new(record)
           end
         else
-          @changes << ['+', record]
+          @changes << Change::Create.new(record)
         end
       end
 
       fog_records.each do |name, record|
-        @changes << ['-', record]
+        @changes << Change::Remove.new(record)
       end
       @changes
     end
 
     def perform!
-      changes.each do |(action, record)|
-        if action == '+'
-          @fog_zone.records.create(:type => record.type, :name => record.name, :ip => record.value, :ttl => record.ttl)
-        elsif action == '-'
-          record.destroy
-        end
+      changes.each do |change|
+        change.perform! @fog_zone
       end
     end
 
     def completed?
-      changes.all? do |(action, record)|
-        action == ' '
+      changes.all? do |change|
+        change.class == Change::None
       end
     end
 
@@ -53,9 +72,8 @@ module Clouddns
       # AWS replaces * with \052
       record.name == fog_record_name(fog_record) &&
         record.type == fog_record.type &&
-        record.value == fog_record.ip &&
+        record.value == fog_record.value &&
         record.ttl.to_i == fog_record.ttl.to_i
     end
-
   end
 end

data/test/dsl_test.rb

@@ -20,14 +20,20 @@ class DslTest < Test::Unit::TestCase
     assert_equal ['1.2.3.4'], record.value
   end
   def test_trailing_dot_is_implied
-    dsl = Clouddns::DSL.parse_string <<-EOL
-      zone "example.com" do
-        A 'www.example.com', '1.2.3.4'
+    for zonename in %w{example.com example.com.}
+      dsl = Clouddns::DSL.parse_string <<-EOL
+      zone "#{zonename}" do
+        A 'test1.example.com', '1.2.3.4'
+        A 'test2.example.com.', '1.2.3.4'
       end
-    EOL
+      EOL
+
+      assert_equal 'example.com.', dsl.zones.first.name
 
-    assert_equal 'example.com.', dsl.zones.first.name
-    assert_equal 'www.example.com.', dsl.zones.first.records.first.name
+      records = dsl.zones.first.records
+      assert_equal 'test1.example.com.', records[0].name
+      assert_equal 'test2.example.com.', records[1].name
+    end
   end
 end
 

metadata

@@ -1,33 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clouddns
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - John Hawthorn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 Z
-dependencies: []
-
+date: 2011-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &18817680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *18817680
 description: A DSL for managing DNS through cloud services
-email: 
+email:
 - john.hawthorn@gmail.com
-executables: 
+executables:
 - clouddns
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -39,9 +41,12 @@ files:
 - lib/clouddns/actions/generic_action.rb
 - lib/clouddns/actions/migrate.rb
 - lib/clouddns/actions/print.rb
-- lib/clouddns/actions/print_record.rb
+- lib/clouddns/actions/zonefile.rb
 - lib/clouddns/dsl.rb
+- lib/clouddns/railtie.rb
 - lib/clouddns/record.rb
+- lib/clouddns/tasks.rb
+- lib/clouddns/utils.rb
 - lib/clouddns/version.rb
 - lib/clouddns/zone.rb
 - lib/clouddns/zone_migration.rb
@@ -49,37 +54,30 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/jhawthorn/clouddns
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A DSL and tools for managing DNS through any of the services supported by fog.  Currently, this is Amazon Route 53, bluebox, DNSimple, DNS Made Easy, Linode DNS, Slicehost DNS and Zerigo DNS
-test_files: 
+summary: A DSL and tools for managing DNS through any of the services supported by
+  fog.  Currently, this is Amazon Route 53, bluebox, DNSimple, DNS Made Easy, Linode
+  DNS, Slicehost DNS and Zerigo DNS
+test_files:
 - test/dsl_test.rb
 - test/test_helper.rb

data/lib/clouddns/actions/print_record.rb

@@ -1,19 +0,0 @@
-module Clouddns
-  module Actions
-    module PrintRecord
-      protected
-      def print_record record, namelength, prefix=''
-        values = record.respond_to?(:value) ? record.value : record.ip
-        values.each_with_index do |value, i|
-          if i.zero?
-            args = [prefix, record.type, record.ttl, record.name, value]
-          else
-            args = [prefix, '', '', '', value]
-          end
-          puts "%s%5s %5s %#{namelength}s %s" % args
-        end
-      end
-    end
-  end
-end
-