sunzi 0.5.0 → 0.5.1

data/lib/sunzi/cli.rb

@@ -37,10 +37,7 @@ module Sunzi
       end
 
       def do_create(project)
-        empty_directory project
-        empty_directory "#{project}/recipes"
-        empty_directory "#{project}/roles"
-        # template "templates/create/.gitignore",         "#{project}/.gitignore"
+        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/ssh_key.sh", "#{project}/recipes/ssh_key.sh"
@@ -77,11 +74,11 @@ module Sunzi
           stdin.close
           t = Thread.new do
             while (line = stderr.gets)
-              print line.color(:red).bright
+              print line.color(:red)
             end
           end
           while (line = stdout.gets)
-            print line.color(:green).bright
+            print line.color(:green)
           end
           t.join
         end
@@ -95,10 +92,6 @@ module Sunzi
 
         # Load sunzi.yml
         hash = YAML.load(File.read('sunzi.yml'))
-        empty_directory 'compiled'
-        empty_directory 'compiled/attributes'
-        empty_directory 'compiled/recipes'
-        empty_directory 'compiled/files'
 
         # Break down attributes into individual files
         hash['attributes'].each {|key, value| create_file "compiled/attributes/#{key}", value }

data/lib/sunzi/cloud/linode.rb

@@ -9,7 +9,6 @@ module Sunzi
       def setup
         # Only run for the first time
         unless File.exist? 'linode/linode.yml'
-          @cli.empty_directory 'linode'
           @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!'
@@ -143,10 +142,7 @@ module Sunzi
           Route53::DNSRecord.new(@fqdn, "A", "300", [@public_ip], @route53_zone).create
         end
 
-        # Boot
-        say 'Done. Booting...'
-        @api.linode.boot(:LinodeID => @linodeid)
-
+        # Save the instance info
         hash = {
           :linode_id => @linodeid,
           :env => @env,
@@ -169,10 +165,11 @@ module Sunzi
           :public_ip => @public_ip,
           :private_ip => @private_ip,
         }
+        @cli.create_file "linode/instances/#{@label}.yml", YAML.dump(hash)
 
-        File.open("linode/instances/#{@label}.yml",'w') do |file|
-          file.write YAML.dump(hash)
-        end
+        # Boot
+        say 'Done. Booting...'
+        @api.linode.boot(:LinodeID => @linodeid)
       end
 
       def teardown(name)

data/lib/sunzi/version.rb

@@ -1,3 +1,3 @@
 module Sunzi
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/templates/create/sunzi.yml

@@ -15,6 +15,6 @@ recipes:
   # mysql-server: https://raw.github.com/kenn/sunzi-recipes/master/debian/mysql-server.sh
   # redis-server: https://raw.github.com/kenn/sunzi-recipes/master/debian/redis-server.sh
 
-# Files specified here will be copied to compiled/.
+# Files specified here will be copied to compiled/files.
 files:
   - ~/.ssh/id_rsa.pub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2164772780 !ruby/object:Gem::Requirement
+  requirement: &2165136600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164772780
+  version_requirements: *2165136600
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2164772220 !ruby/object:Gem::Requirement
+  requirement: &2165136160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164772220
+  version_requirements: *2165136160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164771480 !ruby/object:Gem::Requirement
+  requirement: &2165135720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164771480
+  version_requirements: *2165135720
 description: Server provisioning utility for minimalists
 email:
 - kenn.ejima@gmail.com
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sunzi
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Server provisioning utility for minimalists