sunzi 0.8.0 → 0.9.0

data/README.md

@@ -18,6 +18,7 @@ Its design goals are:
 
 ### What's new:
 
+* v0.9: Support for [DigitalOcean](https://www.digitalocean.com) setup / teardown.
 * v0.8: Added `--sudo` option to `sunzi deploy`.
 * v0.7: Added `erase_remote_folder` and `cache_remote_recipes` preferences for customized behavior.
 * v0.6: System function sunzi::silencer() added for succinct log messages.
@@ -67,8 +68,8 @@ $ sunzi compile                                 # Compile Sunzi project
 $ sunzi create                                  # Create a new Sunzi project
 $ sunzi deploy [user@host:port] [role] [--sudo] # Deploy Sunzi project
 
-$ sunzi setup [linode|ec2]              # Setup a new VM on the Cloud services
-$ sunzi teardown [linode|ec2] [name]    # Teardown an existing VM on the Cloud services
+$ sunzi setup [linode|digital_ocean]            # Setup a new VM on the Cloud services
+$ sunzi teardown [linode|digital_ocean] [name]  # Teardown an existing VM on the Cloud services
 ```
 
 Directory structure

data/lib/sunzi.rb

@@ -10,8 +10,9 @@ module Sunzi
   autoload :Version,    'sunzi/version'
 
   module Cloud
-    autoload :Base,     'sunzi/cloud/base'
-    autoload :Linode,   'sunzi/cloud/linode'
-    autoload :EC2,      'sunzi/cloud/ec2'
+    autoload :Base,         'sunzi/cloud/base'
+    autoload :Linode,       'sunzi/cloud/linode'
+    autoload :EC2,          'sunzi/cloud/ec2'
+    autoload :DigitalOcean, 'sunzi/cloud/digital_ocean'
   end
 end

data/lib/sunzi/cli.rb

@@ -4,28 +4,28 @@ module Sunzi
   class Cli < Thor
     include Thor::Actions
 
-    desc "create", "Create sunzi project"
+    desc 'create', 'Create sunzi project'
     def create(project = 'sunzi')
       do_create(project)
     end
 
-    desc "deploy [user@host:port] [role] [--sudo]", "Deploy sunzi project"
+    desc 'deploy [user@host:port] [role] [--sudo]', 'Deploy sunzi project'
     method_options :sudo => false
     def deploy(target, role = nil)
       do_deploy(target, role, options.sudo?)
     end
 
-    desc "compile", "Compile sunzi project"
+    desc 'compile', 'Compile sunzi project'
     def compile(role = nil)
       do_compile(role)
     end
 
-    desc "setup [linode|ec2]", "Setup a new VM"
+    desc 'setup [linode|digital_ocean]', 'Setup a new VM'
     def setup(target)
       Cloud::Base.choose(self, target).setup
     end
 
-    desc "teardown [linode|ec2] [name]", "Teardown an existing VM"
+    desc 'teardown [linode|digital_ocean] [name]', 'Teardown an existing VM'
     def teardown(target, name)
       Cloud::Base.choose(self, target).teardown(name)
     end
@@ -38,14 +38,14 @@ module Sunzi
       end
 
       def do_create(project)
-        template "templates/create/.gitignore",         "#{project}/.gitignore"
-        template "templates/create/sunzi.yml",          "#{project}/sunzi.yml"
-        template "templates/create/install.sh",         "#{project}/install.sh"
-        template "templates/create/recipes/sunzi.sh",   "#{project}/recipes/sunzi.sh"
-        template "templates/create/recipes/ssh_key.sh", "#{project}/recipes/ssh_key.sh"
-        template "templates/create/roles/app.sh",       "#{project}/roles/app.sh"
-        template "templates/create/roles/db.sh",        "#{project}/roles/db.sh"
-        template "templates/create/roles/web.sh",       "#{project}/roles/web.sh"
+        template 'templates/create/.gitignore',         "#{project}/.gitignore"
+        template 'templates/create/sunzi.yml',          "#{project}/sunzi.yml"
+        template 'templates/create/install.sh',         "#{project}/install.sh"
+        template 'templates/create/recipes/sunzi.sh',   "#{project}/recipes/sunzi.sh"
+        template 'templates/create/recipes/ssh_key.sh', "#{project}/recipes/ssh_key.sh"
+        template 'templates/create/roles/app.sh',       "#{project}/roles/app.sh"
+        template 'templates/create/roles/db.sh',        "#{project}/roles/db.sh"
+        template 'templates/create/roles/web.sh',       "#{project}/roles/web.sh"
       end
 
       def do_deploy(target, role, force_sudo)
@@ -91,7 +91,7 @@ module Sunzi
 
       def do_compile(role)
         # Check if you're in the sunzi directory
-        abort_with "You must be in the sunzi folder" unless File.exists?('sunzi.yml')
+        abort_with 'You must be in the sunzi folder' unless File.exists?('sunzi.yml')
         # Check if role exists
         abort_with "#{role} doesn't exist!" if role and !File.exists?("roles/#{role}.sh")
 
@@ -115,7 +115,7 @@ module Sunzi
 
         # Build install.sh
         if role
-          create_file 'compiled/install.sh', File.binread("install.sh") << "\n" << File.binread("roles/#{role}.sh")
+          create_file 'compiled/install.sh', File.binread('install.sh') << "\n" << File.binread("roles/#{role}.sh")
         else
           copy_file File.expand_path('install.sh'), 'compiled/install.sh'
         end

data/lib/sunzi/cloud/base.rb

@@ -11,6 +11,8 @@ module Sunzi
           Cloud::Linode.new(cli)
         when 'ec2'
           Cloud::EC2.new(cli)
+        when 'digital_ocean'
+          Cloud::DigitalOcean.new(cli)
         else
           abort_with "#{target} is not valid!"
         end

data/lib/sunzi/cloud/digital_ocean.rb

@@ -0,0 +1,147 @@
+Sunzi::Dependency.load('digital_ocean')
+
+module Sunzi
+  module 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
+
+        @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
+        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
+
+        # 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'
+
+        @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)
+
+        @droplet_id = result.droplet.id
+        say "Created a new droplet (id: #{@droplet_id}). Booting..."
+
+        # Boot
+        while @api.droplets.show(@droplet_id).droplet.status.downcase != 'active'
+          sleep 5
+        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
+        end
+
+        # Save the instance info
+        hash = {
+          :droplet_id => @droplet_id,
+          :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,
+        }
+        @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'
+
+        # Delete the droplet
+        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
+        end
+
+        # Remove the instance config file
+        @cli.remove_file "digital_ocean/instances/#{name}.yml"
+
+        say 'Done.'
+      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
+      end
+    end
+  end
+end

data/lib/sunzi/cloud/linode.rb

@@ -1,8 +1,5 @@
 Sunzi::Dependency.load('linode')
 
-# Workaround the bug: https://github.com/rick/linode/issues/12
-YAML::ENGINE.yamler = 'syck'
-
 module Sunzi
   module Cloud
     class Linode < Base
@@ -30,7 +27,7 @@ module Sunzi
 
         # Ask environment and hostname
         @env = ask("environment? (#{@config['environments'].join(' / ')}): ", String) {|q| q.in = @config['environments'] }.to_s
-        @host = ask('hostname? (only the last part of subdomain): ', String).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)
@@ -200,14 +197,12 @@ module Sunzi
         # Delete DNS record
         case @config['dns']
         when 'linode'
-          # Set the public IP to Linode DNS Manager
-          say "deleting the public IP to Linode DNS Manager..."
+          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'
-          # Set the public IP to AWS Route 53
-          say "deleting the public IP to AWS Route 53..."
+          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
@@ -222,6 +217,7 @@ module Sunzi
         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
       end
 
       def wait_for(action)

data/lib/sunzi/dependency.rb

@@ -2,9 +2,10 @@ module Sunzi
   class Dependency
     def self.all
       {
-        'linode' =>   { :require => 'linode',   :version => '>= 0.7.7' },
+        'linode' =>   { :require => 'linode',   :version => '>= 0.7.9' },
         'highline' => { :require => 'highline', :version => '>= 1.6.11'},
         'route53' =>  { :require => 'route53',  :version => '>= 0.2.1' },
+        'digital_ocean' =>  { :require => 'digital_ocean',  :version => '>= 0.0.1' },
       }
     end
 

data/lib/sunzi/version.rb

@@ -1,3 +1,3 @@
 module Sunzi
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/templates/setup/digital_ocean/digital_ocean.yml

@@ -0,0 +1,26 @@
+---
+api_key: your_api_key
+client_id: your_client_id
+
+# add / remove environments
+environments:
+  - production
+  - staging
+fqdn:
+  zone: example.com
+  production: '%{host}.example.com'
+  staging: '%{host}.staging.example.com'
+name:
+  production: 'example-%{host}'
+  staging: 'example-staging-%{host}'
+
+# filter out large lists by keyword
+distributions_filter: debian
+
+# dns takes "route53"
+# dns: route53
+
+# only used when route53 is chosen for DNS
+route53:
+  key: your_aws_key
+  secret: your_aws_secret

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

@@ -12,11 +12,11 @@ environments:
   - staging
 fqdn:
   zone: example.com
-  production: %{host}.example.com
-  staging: %{host}.staging.example.com
+  production: '%{host}.example.com'
+  staging: '%{host}.staging.example.com'
 label:
-  production: example-%{host}
-  staging: example-staging-%{host}
+  production: 'example-%{host}'
+  staging: 'example-staging-%{host}'
 group:
   production: example
   staging: example-staging

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 0.8.0
   prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+    none: false
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 description: Server provisioning utility for minimalists
 email:
 - kenn.ejima@gmail.com
@@ -75,6 +75,7 @@ files:
 - lib/sunzi.rb
 - lib/sunzi/cli.rb
 - lib/sunzi/cloud/base.rb
+- lib/sunzi/cloud/digital_ocean.rb
 - lib/sunzi/cloud/ec2.rb
 - lib/sunzi/cloud/linode.rb
 - lib/sunzi/dependency.rb
@@ -89,6 +90,7 @@ files:
 - lib/templates/create/roles/db.sh
 - lib/templates/create/roles/web.sh
 - lib/templates/create/sunzi.yml
+- lib/templates/setup/digital_ocean/digital_ocean.yml
 - lib/templates/setup/linode/linode.yml
 - sunzi.gemspec
 - test/test_cli.rb
@@ -99,20 +101,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
+      hash: 3774298767527921378
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3774298767527921378
+  none: false
 requirements: []
 rubyforge_project: sunzi
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Server provisioning utility for minimalists