sunzi 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3cdb0743553811ee1eabba13a157b8e083bb0c
-  data.tar.gz: 1a84c8f3f1de7377d64eb0b81ec1c0b5bb53f3c9
+  metadata.gz: 6e5b380c5a3cdd19ac21df1ca08104ba10478ae6
+  data.tar.gz: 43ae6fdbb4e5589934a87dfb5b8f42cb91628dac
 SHA512:
-  metadata.gz: 9d02df7f0f7be31227a1a31221afec080d4e642e314426d9b9053e8c874f70aa1d7f4913cb017e3e33194bbff979af2ac5236064611354c85525aa590a6198eb
-  data.tar.gz: 68ed831c1d46e064dfd442ac43a4bf57a8c755965e513bbb9bf2beafb1cda0c372280ed77d5ea416b673ce3febb247c728cd31ef228e21fa2f2937173c9efb4c
+  metadata.gz: b784234df5371ad733430573ed1ab10ca767082080ec654dcb470b141da3e422f0550bb4900ad22f4c13239d829a681408b9a072d15994de6062c1c397f9590e
+  data.tar.gz: fe414bb9c7aad43e1cc583ac18d98b7bf632d30817832d6467f4d3d647ddef35ed82d599bc5e97d7594714d482539b18cefc2f43dd7229378e58f18f7ee4aa03

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.5, release 2013-09-27
+* `sunzi deploy [linode|digital_ocean] [name]` will deploy to the instance with additional attributes.
+
 ## 1.4, release 2013-09-27
 * `sunzi teardown` no longer requires instance names as an argument, it lets you choose from a list instead.
 

data/lib/sunzi/cli.rb

@@ -11,10 +11,10 @@ module Sunzi
       do_create(project)
     end
 
-    desc 'deploy [user@host:port] [role] [--sudo]', 'Deploy sunzi project'
+    desc 'deploy [user@host:port] [role] [--sudo] or deploy [linode|digital_ocean] [name] [role]  [--sudo]', 'Deploy sunzi project'
     method_options :sudo => false
-    def deploy(target, role = nil)
-      do_deploy(target, role, options.sudo?)
+    def deploy(first, *args)
+      do_deploy(first, *args)
     end
 
     desc 'compile', 'Compile sunzi project'
@@ -54,8 +54,17 @@ module Sunzi
         copy_file 'templates/create/files/.gitkeep',     "#{project}/files/.gitkeep"
       end
 
-      def do_deploy(target, role, force_sudo)
-        sudo = 'sudo ' if force_sudo
+      def do_deploy(first, *args)
+        if ['linode', 'digital_ocean'].include?(first)
+          @instance_attributes = YAML.load(File.read("#{first}/instances/#{args[0]}.yml"))
+          target = @instance_attributes[:fqdn]
+          role = args[1]
+        else
+          target = first
+          role = args[0]
+        end
+
+        sudo = 'sudo ' if options.sudo?
         user, host, port = parse_target(target)
         endpoint = "#{user}@#{host}"
 
@@ -104,6 +113,10 @@ module Sunzi
         # Load sunzi.yml
         @config = YAML.load(File.read('sunzi.yml'))
 
+        # Merge instance attributes
+        @config['attributes'] ||= {}
+        @config['attributes'].update(Hash[@instance_attributes.map{|k,v| [k.to_s, v] }]) if @instance_attributes
+
         # Break down attributes into individual files
         (@config['attributes'] || {}).each {|key, value| create_file "compiled/attributes/#{key}", value }
 

data/sunzi.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sunzi'
-  spec.version       = '1.4.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.version       = '1.5.0' # 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor