sunzi 0.4.2 → 0.4.3

data/README.md

@@ -25,7 +25,7 @@ Install:
 $ gem install sunzi
 ```
 
-Go to your project directory, then:
+Go into your project directory (if it's a Rails project, `config` would be a good place to start with), then:
 
 ```bash
 $ sunzi create
@@ -56,6 +56,7 @@ Commands
 
 ```bash
 $ sunzi                               # Show command help
+$ sunzi compile                       # Compile Sunzi project
 $ sunzi create                        # Create a new Sunzi project
 $ sunzi deploy [user@host:port]       # Deploy Sunzi project
 $ sunzi setup [linode|ec2]            # Setup a new VM on the Cloud services
@@ -129,6 +130,8 @@ recipes:
 
 `rvm.sh` will be available and you can refer to that recipe by `source recipes/rvm.sh`.
 
+You may find sample recipes in this repository useful: https://github.com/kenn/sunzi-recipes
+
 Cloud Support
 -------------
 

data/Rakefile

@@ -7,3 +7,5 @@ Rake::TestTask.new do |t|
     t.test_files = FileList['test/test*.rb']
     t.verbose = true
   end
+
+task :default => :test

data/lib/sunzi/cloud/linode.rb

@@ -24,8 +24,6 @@ module Sunzi
         # When route53 is specified for DNS, check if it's properly configured and if not, fail earlier.
         setup_route53 if @config['dns'] == 'route53'
 
-        @ui = HighLine.new
-
         @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']}\""
@@ -74,7 +72,7 @@ module Sunzi
         @swap_size = ask('swap size in MB? (default: 256MB): ', Integer) { |q| q.default = 256 }
 
         # Go ahead?
-        moveon = ask("Are you sure to go ahead and create #{@fqdn}? (y/n) ", String) {|q| q.in = ['y','n']}
+        moveon = ask("Are you ready to go ahead and create #{@fqdn}? (y/n) ", String) {|q| q.in = ['y','n']}
         exit unless moveon == 'y'
 
         # Create
@@ -88,16 +86,9 @@ module Sunzi
 
         # Update settings
         say "Updating settings..."
-        result = @api.linode.update(
-          :LinodeID => @linodeid,
-          :Label => @label,
-          :lpm_displayGroup => @group,
-          # :Alert_cpu_threshold => 90,
-          # :Alert_diskio_threshold => 1000,
-          # :Alert_bwin_threshold => 5,
-          # :Alert_bwout_threshold => 5,
-          # :Alert_bwquota_threshold => 80,
-        )
+        settings = { :LinodeID => @linodeid, :Label => @label, :lpm_displayGroup => @group }
+        settings.update(@config['settings']) if @config['settings']
+        result = @api.linode.update(settings)
 
         # Create a root disk
         say "Creating a root disk..."
@@ -192,23 +183,30 @@ module Sunzi
         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'])
 
+        # 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'
+
         # Shutdown first or disk deletion will fail
         say 'shutting down...'
-        @api.linode.shutdown(:LinodeID => @instance[:linode_id])
-        sleep 10
+        @api.linode.shutdown(@linode_id_hash)
+        # Wait until linode.shutdown has completed
+        wait_for('linode.shutdown')
 
         # Delete the disks. It is required - http://www.linode.com/api/linode/linode%2Edelete
         say 'deleting root disk...'
-        @api.linode.disk.delete(:LinodeID => @instance[:linode_id], :DiskID => @instance[:root_diskid]) rescue nil
+        @api.linode.disk.delete(@linode_id_hash.merge(:DiskID => @instance[:root_diskid]))
         say 'deleting swap disk...'
-        @api.linode.disk.delete(:LinodeID => @instance[:linode_id], :DiskID => @instance[:swap_diskid]) rescue nil
-        sleep 5
+        @api.linode.disk.delete(@linode_id_hash.merge(:DiskID => @instance[:swap_diskid]))
+        # Wait until linode.disk.delete has completed
+        wait_for('fs.delete')
 
         # Delete the instance
         say 'deleting linode...'
-        @api.linode.delete(:LinodeID => @instance[:linode_id])
+        @api.linode.delete(@linode_id_hash)
 
         # Delete DNS record
         case @config['dns']
@@ -236,6 +234,12 @@ module Sunzi
         route53 = Route53::Connection.new(@config['route53']['key'], @config['route53']['secret'])
         @route53_zone = route53.get_zones.find{|i| i.name.sub(/\.$/,'') == @config['fqdn']['zone'] }
       end
+
+      def wait_for(action)
+        begin
+          sleep 3
+        end until @api.linode.job.list(@linode_id_hash).find{|i| i.action == action }.host_success == 1
+      end
     end
   end
 end

data/lib/sunzi/version.rb

@@ -1,3 +1,3 @@
 module Sunzi
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

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

@@ -6,7 +6,7 @@ root_sshkey_path: ~/.ssh/id_rsa.pub
 # payment_term must be 1, 12 or 24
 payment_term: 1
 
-# Add / remove environments
+# add / remove environments
 environments:
   - production
   - staging
@@ -21,7 +21,7 @@ group:
   production: example
   staging: example-staging
 
-# Filter out large lists by keyword
+# filter out large lists by keyword
 distributions_filter: debian
 kernels_filter: latest
 
@@ -31,4 +31,12 @@ dns: linode
 # only used when route53 is chosen for DNS
 route53:
   key: your_aws_key
-  secret: your_aws_secret
+  secret: your_aws_secret
+
+# other parameters for settings.
+# settings:
+#   alert_cpu_threshold: 90
+#   alert_diskio_threshold: 1000
+#   alert_bwin_threshold: 5
+#   alert_bwout_threshold: 5
+#   alert_bwquota_threshold: 80

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152827160 !ruby/object:Gem::Requirement
+  requirement: &2160582840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152827160
+  version_requirements: *2160582840
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2152825860 !ruby/object:Gem::Requirement
+  requirement: &2160582300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152825860
+  version_requirements: *2160582300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152824980 !ruby/object:Gem::Requirement
+  requirement: &2160581480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152824980
+  version_requirements: *2160581480
 description: Server provisioning utility for minimalists
 email:
 - kenn.ejima@gmail.com