sunzi 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a3f735ba4adee8e29059770569406897d42e9a7
-  data.tar.gz: 3ec26e19e5ca10213f79726d0963e29b03672dc9
+  metadata.gz: e9fc8aafe77074cbb76a6fcf041b1647cc0a0634
+  data.tar.gz: f58cf2395b1361ffeb48336fc5b6e1e09f325555
 SHA512:
-  metadata.gz: 361584e1a3104439e3c1e4ab735ce920b32fdbb052af1815d47f3c5c88c7ffb801cb2b007c7cd5edb53897848aec88dd67239921a1edac9d585d61119c0b49cc
-  data.tar.gz: 564fa3ae5ac3f99ce117c79251a5249307f7e81a79dabbb5c49b973c3f3e1e9fdba766ae124377166600e8d000c9d435e6e5a946f420266cbea7475cf580a57d
+  metadata.gz: f4f22aa9652eb1bca2951b42514aa307c6267bfdd708d7fbc52ecaadac7fde746685d122b967e0adb1ffbbcaaaab7d4eaa5c9b5e81b85bec0d17cf2dd885c59f
+  data.tar.gz: 6d78f2ba89d13ca900cdb6358e388c6197a1a954ae88112ec8eb424ab1fad2a1f483b5d4989c426d522a2f969ea10b8a9bb190093ff3407d84cbc4ff171d17ea

data/lib/sunzi.rb

@@ -4,13 +4,21 @@ require 'yaml'
 
 module Sunzi
   autoload :Cli,        'sunzi/cli'
+  autoload :Cloud,      'sunzi/cloud'
   autoload :Dependency, 'sunzi/dependency'
+  autoload :DNS,        'sunzi/dns'
   autoload :Logger,     'sunzi/logger'
   autoload :Utility,    'sunzi/utility'
 
-  module Cloud
+  class Cloud
     autoload :Base,         'sunzi/cloud/base'
     autoload :Linode,       'sunzi/cloud/linode'
     autoload :DigitalOcean, 'sunzi/cloud/digital_ocean'
   end
+
+  class DNS
+    autoload :Base,     'sunzi/dns/base'
+    autoload :Linode,   'sunzi/dns/linode'
+    autoload :Route53,  'sunzi/dns/route53'
+  end
 end

data/lib/sunzi/cli.rb

@@ -21,13 +21,13 @@ module Sunzi
     end
 
     desc 'setup [linode|digital_ocean]', 'Setup a new VM'
-    def setup(target)
-      Cloud::Base.choose(self, target).setup
+    def setup(provider)
+      Sunzi::Cloud.new(self, provider).setup
     end
 
     desc 'teardown [linode|digital_ocean] [name]', 'Teardown an existing VM'
-    def teardown(target, name)
-      Cloud::Base.choose(self, target).teardown(name)
+    def teardown(provider, name)
+      Sunzi::Cloud.new(self, provider).teardown(name)
     end
 
     desc 'version', 'Show version'

data/lib/sunzi/cloud.rb

@@ -0,0 +1,18 @@
+module Sunzi
+  class Cloud
+    def initialize(cli, provider)
+      @subject = case provider
+      when 'linode'
+        Sunzi::Cloud::Linode.new(cli, provider)
+      when 'digital_ocean'
+        Sunzi::Cloud::DigitalOcean.new(cli, provider)
+      else
+        abort_with "#{provider} is not valid!"
+      end
+    end
+
+    def method_missing(sym, *args, &block)
+      @subject.send sym, *args, &block
+    end
+  end
+end

data/lib/sunzi/cloud/base.rb

@@ -1,29 +1,84 @@
 Sunzi::Dependency.load('highline')
 
 module Sunzi
-  module Cloud
+  class Cloud
     class Base
       include Sunzi::Utility
 
-      def self.choose(cli, target)
-        case target
-        when 'linode'
-          Cloud::Linode.new(cli)
-        when 'digital_ocean'
-          Cloud::DigitalOcean.new(cli)
-        else
-          abort_with "#{target} is not valid!"
+      def initialize(cli, provider)
+        @provider = provider
+        @cli = cli
+        @ui = HighLine.new
+      end
+
+      def setup
+        unless File.exist? "#{@provider}/#{@provider}.yml"
+          @cli.empty_directory "#{@provider}/instances"
+          @cli.template "templates/setup/#{@provider}/#{@provider}.yml", "#{@provider}/#{@provider}.yml"
+          exit_with "Now go ahead and edit #{@provider}.yml, then run this command again!"
+        end
+
+        @config = YAML.load(File.read("#{@provider}/#{@provider}.yml"))
+        @dns = Sunzi::DNS.new(@config, @provider) if @config['dns']
+
+        if @config['fqdn']['zone'] == 'example.com'
+          abort_with "You must have your own settings in #{@provider}.yml"
         end
+
+        # Ask environment and hostname
+        @env = ask("environment? (#{@config['environments'].join(' / ')}): ", String) {|q| q.in = @config['environments'] }.to_s
+        @host = ask('hostname? (only the first part of subdomain): ', String).to_s
+
+        abort_with '"label" field in linode.yml is no longer supported. rename it to "name".' if @config['label']
+        @fqdn = @config['fqdn'][@env].gsub(/%{host}/, @host)
+        @name = @config['name'][@env].gsub(/%{host}/, @host)
+
+        assign_api
+        @attributes = {}
+        do_setup
+
+        # Save instance info
+        @cli.create_file "#{@provider}/instances/#{@name}.yml", YAML.dump(@instance)
+
+        # Register IP to DNS
+        @dns.add(@fqdn, @public_ip) if @dns
       end
 
-      def initialize(cli)
-        @cli = cli
-        @ui = HighLine.new
+      def teardown(name)
+        unless File.exist?("#{@provider}/instances/#{name}.yml")
+          abort_with "#{name}.yml was not found in the instances directory."
+        end
+
+        @config = YAML.load(File.read("#{@provider}/#{@provider}.yml"))
+        @dns = Sunzi::DNS.new(@config, @provider) if @config['dns']
+
+        @instance = YAML.load(File.read("#{@provider}/instances/#{name}.yml"))
+
+        # Are you sure?
+        moveon = ask("Are you sure about deleting #{@instance[:fqdn]} permanently? (y/n) ", String) {|q| q.in = ['y','n']}
+        exit unless moveon == 'y'
+
+        # Run Linode / DigitalOcean specific tasks
+        assign_api
+        do_teardown
+
+        # Delete DNS record
+        @dns.delete(@instance[ip_key]) if @dns
+
+        # Remove the instance config file
+        @cli.remove_file "#{@provider}/instances/#{name}.yml"
+
+        say 'Done.'
       end
 
       def ask(question, answer_type, &details)
         @ui.ask(@ui.color(question, :green, :bold), answer_type, &details)
       end
+
+      def proceed?
+        moveon = ask("Are you ready to go ahead and create #{@fqdn}? (y/n) ", String) {|q| q.in = ['y','n']}
+        exit unless moveon == 'y'
+      end
     end
   end
 end

data/lib/sunzi/cloud/digital_ocean.rb

@@ -1,160 +1,76 @@
 Sunzi::Dependency.load('digital_ocean')
 
 module Sunzi
-  module Cloud
+  class Cloud
     class DigitalOcean < Base
-      def setup
-        unless File.exist? 'digital_ocean/digital_ocean.yml'
-          @cli.empty_directory 'digital_ocean/instances'
-          @cli.template 'templates/setup/digital_ocean/digital_ocean.yml', 'digital_ocean/digital_ocean.yml'
-          exit_with 'Now go ahead and edit digital_ocean.yml, then run this command again!'
-        end
-
-        @config = YAML.load(File.read('digital_ocean/digital_ocean.yml'))
-
-        if @config['fqdn']['zone'] == 'example.com'
-          abort_with 'You must have your own settings in digital_ocean.yml'
-        end
-
-        # When route53 is specified for DNS, check if it's properly configured and if not, fail earlier.
-        setup_route53 if @config['dns'] == 'route53'
-
-        @api = ::DigitalOcean::API.new :api_key => @config['api_key'], :client_id => @config['client_id']
-
-        # Ask environment and hostname
-        @env = ask("environment? (#{@config['environments'].join(' / ')}): ", String) {|q| q.in = @config['environments'] }.to_s
-        @host = ask('hostname? (only the first part of subdomain): ', String).to_s
+      def do_setup
+        choose(:size, @api.sizes.list.sizes)
+        choose(:region, @api.regions.list.regions)
 
-        @fqdn = @config['fqdn'][@env].gsub(/%{host}/, @host)
-        @name = @config['name'][@env].gsub(/%{host}/, @host)
-
-        # Choose a size
-        result = @api.sizes.list.sizes
-        result.each{|i| say "#{i.id}: #{i.name}" }
-        @size_id = ask('which size?: ', Integer) {|q| q.in = result.map(&:id); q.default = result.first.id }
-        @size_name = result.find{|i| i.id == @size_id }.name
-
-        # Choose a region
-        result = @api.regions.list.regions
-        result.each{|i| say "#{i.id}: #{i.name}" }
-        @region_id = ask('which region?: ', Integer) {|q| q.in = result.map(&:id); q.default = result.first.id }
-        @region_name = result.find{|i| i.id == @region_id }.name
-
-        # Choose a image
+        # Choose an image
         result = @api.images.list({'filter' => 'global'}).images
         if @config['distributions_filter']
           result = result.select{|i| i.distribution.match Regexp.new(@config['distributions_filter'], Regexp::IGNORECASE) }
         end
-        result.each{|i| say "#{i.id}: #{i.name}" }
-        @image_id = ask('which image?: ', Integer) {|q| q.in = result.map(&:id); q.default = result.first.id }
-        @image_name = result.find{|i| i.id == @image_id }.name
+        choose(:image, result)
 
         # Go ahead?
-        moveon = ask("Are you ready to go ahead and create #{@fqdn}? (y/n) ", String) {|q| q.in = ['y','n']}
-        exit unless moveon == 'y'
+        proceed?
 
-        @ssh_key_ids = @api.ssh_keys.list.ssh_keys.map(&:id).join(',')
+        ssh_key_ids = @api.ssh_keys.list.ssh_keys.map(&:id).join(',')
 
         # Create
         say "creating a new droplets..."
         result = @api.droplets.create(:name => @name,
-          :size_id => @size_id,
-          :image_id => @image_id,
-          :region_id => @region_id,
-          :ssh_key_ids => @ssh_key_ids)
+          :size_id    => @attributes[:size_id],
+          :image_id   => @attributes[:image_id],
+          :region_id  => @attributes[:region_id],
+          :ssh_key_ids => ssh_key_ids)
 
         @droplet_id = result.droplet.id
         say "Created a new droplet (id: #{@droplet_id}). Booting..."
 
-        # Boot
+        # Boot - we need this before getting public IP
         while @api.droplets.show(@droplet_id).droplet.status.downcase != 'active'
-          sleep 5
+          sleep 3
         end
 
         @public_ip = @api.droplets.show(@droplet_id).droplet.ip_address
         say "Done. ip address = #{@public_ip}"
 
-        # Register IP to DNS
-        case @config['dns']
-        when 'route53'
-          # Set the public IP to AWS Route 53
-          say "Setting the public IP to AWS Route 53..."
-          Route53::DNSRecord.new(@fqdn, "A", "300", [@public_ip], @route53_zone).create
-        when 'linode'
-          Sunzi::Dependency.load('linode') # FIXME: this should run at the beginning
-          linode = ::Linode.new(:api_key => @config['linode']['api_key'])
-          # Set the public IP to Linode DNS Manager
-          say "Setting the public IP to Linode DNS Manager..."
-          domainid = linode.domain.list.find{|i| i.domain == @config['fqdn']['zone'] }.domainid
-          linode.domain.resource.create(:DomainID => domainid, :Type => 'A', :Name => @fqdn, :Target => @public_ip)
-        end
-
-        # Save the instance info
-        hash = {
+        @instance = {
           :droplet_id => @droplet_id,
-          :env => @env,
+          :env  => @env,
           :host => @host,
           :fqdn => @fqdn,
           :name => @name,
           :ip_address => @public_ip,
-          :size_id => @size_id,
-          :size_name => @size_name,
-          :region_id => @region_id,
-          :region_name => @region_name,
-          :image_id => @image_id,
-          :image_name => @image_name,
+          :size_id      => @attributes[:size_id],
+          :size_name    => @attributes[:size_name],
+          :region_id    => @attributes[:region_id],
+          :region_name  => @attributes[:region_name],
+          :image_id     => @attributes[:image_id],
+          :image_name   => @attributes[:image_name],
         }
-        @cli.create_file "digital_ocean/instances/#{@name}.yml", YAML.dump(hash)
-
       end
 
-      def teardown(name)
-        unless File.exist?("digital_ocean/instances/#{name}.yml")
-          abort_with "#{name}.yml was not found in the instances directory."
-        end
-
-        @config = YAML.load(File.read('digital_ocean/digital_ocean.yml'))
-        setup_route53 if @config['dns'] == 'route53'
-
-        @instance = YAML.load(File.read("digital_ocean/instances/#{name}.yml"))
-        @droplet_id = @instance[:droplet_id]
-
-        @api = ::DigitalOcean::API.new :api_key => @config['api_key'], :client_id => @config['client_id']
-
-        # Are you sure?
-        moveon = ask("Are you sure about deleting #{@instance[:fqdn]} permanently? (y/n) ", String) {|q| q.in = ['y','n']}
-        exit unless moveon == 'y'
+      def choose(key, result)
+        result.each{|i| say "#{i.id}: #{i.name}" }
+        @attributes[:"#{key}_id"] = ask("which #{key}?: ", Integer) {|q| q.in = result.map(&:id); q.default = result.first.id }
+        @attributes[:"#{key}_name"] = result.find{|i| i.id == @attributes[:"#{key}_id"] }.name
+      end
 
-        # Delete the droplet
+      def do_teardown
         say 'deleting droplet...'
-        @api.droplets.delete(@droplet_id)
-
-        # Delete DNS record
-        case @config['dns']
-        when 'route53'
-          say 'deleting the public IP from AWS Route 53...'
-          @record = @route53_zone.get_records.find{|i| i.values.first == @instance[:ip_address] }
-          @record.delete if @record
-        when 'linode'
-          Sunzi::Dependency.load('linode') # FIXME: this should run at the beginning
-          linode = ::Linode.new(:api_key => @config['linode']['api_key'])
-          say 'deleting the public IP from Linode DNS Manager...'
-          domainid = linode.domain.list.find{|i| i.domain == @config['fqdn']['zone'] }.domainid
-          resource = linode.domain.resource.list(:DomainID => domainid).find{|i| i.target == @instance[:ip_address] }
-          linode.domain.resource.delete(:DomainID => domainid, :ResourceID => resource.resourceid)
-        end
-
-        # Remove the instance config file
-        @cli.remove_file "digital_ocean/instances/#{name}.yml"
+        @api.droplets.delete(@instance[:droplet_id])
+      end
 
-        say 'Done.'
+      def assign_api
+        @api = ::DigitalOcean::API.new :api_key => @config['api_key'], :client_id => @config['client_id']
       end
 
-      def setup_route53
-        Sunzi::Dependency.load('route53')
-        route53 = Route53::Connection.new(@config['route53']['key'], @config['route53']['secret'])
-        @route53_zone = route53.get_zones.find{|i| i.name.sub(/\.$/,'') == @config['fqdn']['zone'] }
-        abort_with "zone for #{@config['fqdn']['zone']} was not found on route53!" unless @route53_zone
+      def ip_key
+        :ip_address
       end
     end
   end

data/lib/sunzi/cloud/linode.rb

@@ -1,79 +1,31 @@
 Sunzi::Dependency.load('linode')
 
 module Sunzi
-  module Cloud
+  class Cloud
     class Linode < Base
-      def setup
-        # Only run for the first time
-        unless File.exist? 'linode/linode.yml'
-          @cli.empty_directory 'linode/instances'
-          @cli.template 'templates/setup/linode/linode.yml', 'linode/linode.yml'
-          exit_with 'Now go ahead and edit linode.yml, then run this command again!'
-        end
-
-        @config = YAML.load(File.read('linode/linode.yml'))
-
-        if @config['fqdn']['zone'] == 'example.com'
-          abort_with 'You must have your own settings in linode.yml'
-        end
-
-        # When route53 is specified for DNS, check if it's properly configured and if not, fail earlier.
-        setup_route53 if @config['dns'] == 'route53'
-
+      def do_setup
         @sshkey = File.read(File.expand_path(@config['root_sshkey_path'])).chomp
         if @sshkey.match(/\n/)
           abort_with "RootSSHKey #{@sshkey.inspect} must not be multi-line! Check inside \"#{@config['root_sshkey_path']}\""
         end
 
-        # Ask environment and hostname
-        @env = ask("environment? (#{@config['environments'].join(' / ')}): ", String) {|q| q.in = @config['environments'] }.to_s
-        @host = ask('hostname? (only the first part of subdomain): ', String).to_s
-
-        @fqdn = @config['fqdn'][@env].gsub(/%{host}/, @host)
-        @label = @config['label'][@env].gsub(/%{host}/, @host)
-        @group = @config['group'][@env]
-        @api = ::Linode.new(:api_key => @config['api_key'])
-
-        # Choose a plan
-        result = @api.avail.linodeplans
-        result.each{|i| say "#{i.planid}: #{i.ram}MB, $#{i.price}" }
-        @planid = ask('which plan?: ', Integer) {|q| q.in = result.map(&:planid); q.default = result.first.planid }
-        @plan_label = result.find{|i| i.planid == @planid }.label
-
-        # Choose a datacenter
-        result = @api.avail.datacenters
-        result.each{|i| say "#{i.datacenterid}: #{i.location}" }
-        @datacenterid = ask('which datacenter?: ', Integer) {|q| q.in = result.map(&:datacenterid); q.default = result.first.datacenterid }
-        @datacenter_location = result.find{|i| i.datacenterid == @datacenterid }.location
-
-        # Choose a distribution
-        result = @api.avail.distributions
-        if @config['distributions_filter']
-          result = result.select{|i| i.label.match Regexp.new(@config['distributions_filter'], Regexp::IGNORECASE) }
-        end
-        result.each{|i| say "#{i.distributionid}: #{i.label}" }
-        @distributionid = ask('which distribution?: ', Integer) {|q| q.in = result.map(&:distributionid); q.default = result.first.distributionid }
-        @distribution_label = result.find{|i| i.distributionid == @distributionid }.label
-
-        # Choose a kernel
-        result = @api.avail.kernels
-        if @config['kernels_filter']
-          result = result.select{|i| i.label.match Regexp.new(@config['kernels_filter'], Regexp::IGNORECASE) }
-        end
-        result.each{|i| say "#{i.kernelid}: #{i.label}" }
-        @kernelid = ask('which kernel?: ', Integer) {|q| q.in = result.map(&:kernelid); q.default = result.first.kernelid }
-        @kernel_label = result.find{|i| i.kernelid == @kernelid }.label
+        choose(:plan, @api.avail.linodeplans)
+        choose(:datacenter, @api.avail.datacenters, :label_method => :location)
+        choose(:distribution, @api.avail.distributions, :filter => 'distributions_filter')
+        choose(:kernel, @api.avail.kernels, :filter => 'kernels_filter')
 
         # Choose swap size
         @swap_size = ask('swap size in MB? (default: 256MB): ', Integer) { |q| q.default = 256 }
 
         # Go ahead?
-        moveon = ask("Are you ready to go ahead and create #{@fqdn}? (y/n) ", String) {|q| q.in = ['y','n']}
-        exit unless moveon == 'y'
+        proceed?
 
         # Create
         say "creating a new linode..."
-        result = @api.linode.create(:DatacenterID => @datacenterid, :PlanID => @planid, :PaymentTerm => @config['payment_term'])
+        result = @api.linode.create(
+          :DatacenterID => @attributes[:datacenterid],
+          :PlanID => @attributes[:planid],
+          :PaymentTerm => @config['payment_term'])
         @linodeid = result.linodeid
         say "created a new instance: linodeid = #{@linodeid}"
 
@@ -82,16 +34,17 @@ module Sunzi
 
         # Update settings
         say "Updating settings..."
-        settings = { :LinodeID => @linodeid, :Label => @label, :lpm_displayGroup => @group }
+        @group = @config['group'][@env]
+        settings = { :LinodeID => @linodeid, :Label => @name, :lpm_displayGroup => @group }
         settings.update(@config['settings']) if @config['settings']
-        result = @api.linode.update(settings)
+        @api.linode.update(settings)
 
         # Create a root disk
         say "Creating a root disk..."
         result = @api.linode.disk.createfromdistribution(
           :LinodeID => @linodeid,
-          :DistributionID => @distributionid,
-          :Label => "#{@distribution_label} Image",
+          :DistributionID => @attributes[:distributionid],
+          :Label => "#{@attributes[:distribution_label]} Image",
           :Size => @totalhd - @swap_size,
           :rootPass => @config['root_pass'],
           :rootSSHKey => @sshkey
@@ -112,8 +65,8 @@ module Sunzi
         say "Creating a config profile..."
         result = @api.linode.config.create(
           :LinodeID => @linodeid,
-          :KernelID => @kernelid,
-          :Label => "#{@distribution_label} Profile",
+          :KernelID => @attributes[:kernelid],
+          :Label => "#{@attributes[:distribution_label]} Profile",
           :DiskList => [ @root_diskid, @swap_diskid ].join(',')
         )
         @config_id = result.configid
@@ -126,34 +79,20 @@ module Sunzi
         result = @api.linode.ip.list(:LinodeID => @linodeid).find{|i| i.ispublic == 0 }
         @private_ip = result.ipaddress
 
-        # Register IP to DNS
-        case @config['dns']
-        when 'linode'
-          # Set the public IP to Linode DNS Manager
-          say "Setting the public IP to Linode DNS Manager..."
-          @domainid = @api.domain.list.find{|i| i.domain == @config['fqdn']['zone'] }.domainid
-          @api.domain.resource.create(:DomainID => @domainid, :Type => 'A', :Name => @fqdn, :Target => @public_ip)
-        when 'route53'
-          # Set the public IP to AWS Route 53
-          say "Setting the public IP to AWS Route 53..."
-          Route53::DNSRecord.new(@fqdn, "A", "300", [@public_ip], @route53_zone).create
-        end
-
-        # Save the instance info
-        hash = {
+        @instance = {
           :linode_id => @linodeid,
           :env => @env,
           :host => @host,
           :fqdn => @fqdn,
-          :label => @label,
+          :label => @name,
           :group => @group,
-          :plan_id => @planid,
-          :datacenter_id => @datacenterid,
-          :datacenter_location => @datacenter_location,
-          :distribution_id => @distributionid,
-          :distribution_label => @distribution_label,
-          :kernel_id => @kernelid,
-          :kernel_label => @kernel_label,
+          :plan_id =>             @attributes[:planid],
+          :datacenter_id =>       @attributes[:datacenterid],
+          :datacenter_location => @attributes[:datacenter_location],
+          :distribution_id =>     @attributes[:distributionid],
+          :distribution_label =>  @attributes[:distribution_label],
+          :kernel_id =>           @attributes[:kernelid],
+          :kernel_label =>        @attributes[:kernel_label],
           :swap_size => @swap_size,
           :totalhd => @totalhd,
           :root_diskid => @root_diskid,
@@ -162,27 +101,29 @@ module Sunzi
           :public_ip => @public_ip,
           :private_ip => @private_ip,
         }
-        @cli.create_file "linode/instances/#{@label}.yml", YAML.dump(hash)
 
         # Boot
         say 'Done. Booting...'
         @api.linode.boot(:LinodeID => @linodeid)
       end
 
-      def teardown(name)
-        unless File.exist?("linode/instances/#{name}.yml")
-          abort_with "#{name}.yml was not found in the instances directory."
+      def choose(key, result, options = {})
+        label_method = options[:label_method] || :label
+        id    = :"#{key}id"
+        label = :"#{key}_#{label_method}"
+
+        # Filters
+        if options[:filter] and @config[options[:filter]]
+          result = result.select{|i| i.label.match Regexp.new(@config[options[:filter]], Regexp::IGNORECASE) }
         end
-        @config = YAML.load(File.read('linode/linode.yml'))
-        setup_route53 if @config['dns'] == 'route53'
 
-        @instance = YAML.load(File.read("linode/instances/#{name}.yml"))
-        @linode_id_hash = { :LinodeID => @instance[:linode_id] }
-        @api = ::Linode.new(:api_key => @config['api_key'])
+        result.each{|i| say "#{i.send(id)}: #{i.send(label_method)}" }
+        @attributes[id] = ask("which #{key}?: ", Integer) {|q| q.in = result.map(&id); q.default = result.first.send(id) }
+        @attributes[label] = result.find{|i| i.send(id) == @attributes[id] }.send(label_method)
+      end
 
-        # Are you sure?
-        moveon = ask("Are you sure about deleting #{@instance[:fqdn]} permanently? (y/n) ", String) {|q| q.in = ['y','n']}
-        exit unless moveon == 'y'
+      def do_teardown
+        @linode_id_hash = { :LinodeID => @instance[:linode_id] }
 
         # Shutdown first or disk deletion will fail
         say 'shutting down...'
@@ -193,31 +134,14 @@ module Sunzi
         # Delete the instance
         say 'deleting linode...'
         @api.linode.delete(@linode_id_hash.merge(:skipChecks => 1))
+      end
 
-        # Delete DNS record
-        case @config['dns']
-        when 'linode'
-          say 'deleting the public IP from Linode DNS Manager...'
-          @domainid = @api.domain.list.find{|i| i.domain == @config['fqdn']['zone'] }.domainid
-          @resource = @api.domain.resource.list(:DomainID => @domainid).find{|i| i.target == @instance[:public_ip] }
-          @api.domain.resource.delete(:DomainID => @domainid, :ResourceID => @resource.resourceid)
-        when 'route53'
-          say 'deleting the public IP from AWS Route 53...'
-          @record = @route53_zone.get_records.find{|i| i.values.first == @instance[:public_ip] }
-          @record.delete if @record
-        end
-
-        # Remove the instance config file
-        @cli.remove_file "linode/instances/#{name}.yml"
-
-        say 'Done.'
+      def assign_api
+        @api = ::Linode.new(:api_key => @config['api_key'])
       end
 
-      def setup_route53
-        Sunzi::Dependency.load('route53')
-        route53 = Route53::Connection.new(@config['route53']['key'], @config['route53']['secret'])
-        @route53_zone = route53.get_zones.find{|i| i.name.sub(/\.$/,'') == @config['fqdn']['zone'] }
-        abort_with "zone for #{@config['fqdn']['zone']} was not found on route53!" unless @route53_zone
+      def ip_key
+        :public_ip
       end
 
       def wait_for(action)

data/lib/sunzi/dns.rb

@@ -0,0 +1,19 @@
+module Sunzi
+  class DNS
+    def initialize(config, cloud)
+      dns = config['dns']
+      @subject = case dns
+      when 'linode'
+        Sunzi::DNS::Linode.new(config, cloud)
+      when 'route53'
+        Sunzi::DNS::Route53.new(config, cloud)
+      else
+        abort_with "DNS #{dns} is not valid!"
+      end
+    end
+
+    def method_missing(sym, *args, &block)
+      @subject.send sym, *args, &block
+    end
+  end
+end

data/lib/sunzi/dns/base.rb

@@ -0,0 +1,7 @@
+module Sunzi
+  class DNS
+    class Base
+      include Sunzi::Utility
+    end
+  end
+end

data/lib/sunzi/dns/linode.rb

@@ -0,0 +1,26 @@
+Sunzi::Dependency.load('linode')
+
+module Sunzi
+  class DNS
+    class Linode < Base
+      def initialize(config, cloud)
+        @api = ::Linode.new(:api_key => (cloud == 'linode') ? config['api_key'] : config['linode']['api_key'])
+        zone = config['fqdn']['zone']
+        @domain = @api.domain.list.find{|i| i.domain == zone }
+        abort_with "zone for #{zone} was not found on Linode DNS!" unless @domain
+      end
+
+      def add(fqdn, ip)
+        say 'adding the public IP to Linode DNS Manager...'
+        @api.domain.resource.create(:DomainID => @domain.domainid, :Type => 'A', :Name => fqdn, :Target => ip)
+      end
+
+      def delete(ip)
+        say 'deleting the public IP from Linode DNS Manager...'
+        resource = @api.domain.resource.list(:DomainID => @domain.domainid).find{|i| i.target == ip }
+        abort_with "ip address #{ip} was not found on Linode DNS!" unless resource
+        @api.domain.resource.delete(:DomainID => @domain.domainid, :ResourceID => resource.resourceid)
+      end
+    end
+  end
+end

data/lib/sunzi/dns/route53.rb

@@ -0,0 +1,25 @@
+Sunzi::Dependency.load('route53')
+
+module Sunzi
+  class DNS
+    class Route53 < Base
+      def initialize(config, cloud)
+        @api = ::Route53::Connection.new(config['route53']['key'], config['route53']['secret'])
+        zone = config['fqdn']['zone']
+        @route53_zone = @api.get_zones.find{|i| i.name.sub(/\.$/,'') == zone }
+        abort_with "zone for #{zone} was not found on Route 53!" unless @route53_zone
+      end
+
+      def add(fqdn, ip)
+        say 'adding the public IP to Route 53...'
+        ::Route53::DNSRecord.new(fqdn, "A", "300", [ip], @route53_zone).create
+      end
+
+      def delete(ip)
+        say 'deleting the public IP from Route 53...'
+        record = @route53_zone.get_records.find{|i| i.values.first == ip }
+        record.delete if record
+      end
+    end
+  end
+end

data/lib/templates/create/install.sh

@@ -11,12 +11,18 @@ export DEBIAN_FRONTEND=noninteractive
 # Add Dotdeb repository. Recommended if you're using Debian. See http://www.dotdeb.org/about/
 # source recipes/dotdeb.sh
 
-# Update installed packages
+# Update apt catalog and upgrade installed packages
 sunzi.mute "apt-get update"
 sunzi.mute "apt-get -y upgrade"
 
 # Install packages
-sunzi.mute "apt-get -y install git-core ntp curl"
+apt-get -y install git-core ntp curl
+
+# Install sysstat, then configure if this is a new install.
+if sunzi.install "sysstat"; then
+  sed -i 's/ENABLED="false"/ENABLED="true"/' /etc/default/sysstat
+  /etc/init.d/sysstat restart
+fi
 
 # Set RAILS_ENV
 environment=$(cat attributes/environment)
@@ -41,9 +47,3 @@ if [[ "$(which ruby)" != /usr/local/rvm/rubies/ruby-$ruby_version* ]]; then
   # Install Bundler
   gem install bundler
 fi
-
-# Install sysstat, then configure if this is a new install.
-if sunzi.install "sysstat"; then
-  sed -i 's/ENABLED="false"/ENABLED="true"/' /etc/default/sysstat
-  /etc/init.d/sysstat restart
-fi

data/lib/templates/setup/linode/linode.yml

@@ -14,7 +14,7 @@ fqdn:
   zone: example.com
   production: '%{host}.example.com'
   staging: '%{host}.staging.example.com'
-label:
+name:
   production: 'example-%{host}'
   staging: 'example-staging-%{host}'
 group:

data/sunzi.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sunzi'
-  spec.version       = '1.1.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.version       = '1.1.1' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
   spec.authors       = ['Kenn Ejima']
   spec.email         = ['kenn.ejima@gmail.com']
   spec.homepage      = 'http://github.com/kenn/sunzi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kenn Ejima
@@ -67,10 +67,15 @@ files:
 - bin/sunzi
 - lib/sunzi.rb
 - lib/sunzi/cli.rb
+- lib/sunzi/cloud.rb
 - lib/sunzi/cloud/base.rb
 - lib/sunzi/cloud/digital_ocean.rb
 - lib/sunzi/cloud/linode.rb
 - lib/sunzi/dependency.rb
+- lib/sunzi/dns.rb
+- lib/sunzi/dns/base.rb
+- lib/sunzi/dns/linode.rb
+- lib/sunzi/dns/route53.rb
 - lib/sunzi/logger.rb
 - lib/sunzi/utility.rb
 - lib/templates/create/.gitignore