ssp 0.6.5 → 0.6.6

data/lib/ssp/application/chef.rb

@@ -25,21 +25,17 @@ class SSP::App::Chef < Thor
 
   desc "deploy APP", "Runs chef-client with deployment enabled for the application on the right node"
   method_options %w( production -P ) => false, %w( migrate -m ) => true,
-                 %w( rollback -r ) => false, %w( force -f ) => false,
-                 %w( node -N ) => "ginger.sspti.me"
+                 %w( rollback -r ) => false, %w( force -f ) => false
   method_option  :revision, :aliases => "-R",
                  :desc => "Revision to deploy to. Previous relative release (1..4) or specific revision. In rollback mode (-r) this defaults to 1."
+  method_option  :node, :aliases => "-N",
+                 :desc => "Node to deploy on. Defaults to `ginger.sspti.me' for staging and `<APP>.sspti.me' for production."
   def deploy(app)
     if options[:ssh_user] == "root"
       raise Thor::Error, "You cannot deploy directly with the root user, use the -u option to specify your user"
     end
     chef_config
-    node =
-      if options[:production]
-        "#{app}-app-01.sspti.me"
-      else
-        options[:node]
-      end
+    node = options[:node] || (options[:production] ? "#{app}.sspti.me" : "ginger.sspti.me")
     debug_log = "/tmp/#{app}_deploy_chef_run.#{Time.now.strftime("%Y%m%d%H%M")}.log"
     command = "sudo chef-client -V -l debug -L #{debug_log} | grep --line-buffered '\\[[^]]*\\] [A-Z]*:' | grep -v DEBUG:"
 

data/lib/ssp/version.rb

@@ -1,3 +1,3 @@
 module SSP
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - "L\xC3\xA1szl\xC3\xB3 B\xC3\xA1csi"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency