ssp 0.6.2 → 0.6.3

data/lib/ssp/application/chef.rb

@@ -25,20 +25,53 @@ 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( 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."
   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 = "#{options[:production] ? "#{app}-app-01" : "sage"}.sspti.me"
-    command = "sudo chef-client -V -l debug -L /tmp/#{app}_deploy_chef_run.#{Time.now.strftime("%Y%m%d%H%M")}.log | grep --line-buffered '\\[[^]]*\\] [A-Z]*:' | grep -v DEBUG:"
+    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:"
 
     env = options[:production] ? "production" : "staging"
-    deploy_action = options[:rollback] ? "rollback" : options[:force] ? "force_deploy" : "deploy"
-    with_updated_bag(app, env, :deploy_action => deploy_action, :migrate => options[:migrate]) do
+    bag_override = { :migrate => options[:migrate] }
+    case rev = options[:revision] || ("1" if options[:rollback])
+    when *%w(1 2 3 4)
+      all_releases = JSON.parse(%x{ssh #{options[:ssh_user]}@#{node} cat /srv/chef/cache/revision-deploys/#{app}}) rescue []
+      all_releases.map! {|r| File.basename(r)}
+      bag_override[:revision] = all_releases[-rev.to_i-1]
+      raise Thor::Error, "Couldn't find revision #{options[:revision]}" unless bag_override[:revision]
+    when String
+      bag_override[:revision] = options[:revision]
+    end
+    bag_override[:deploy_action] =
+      if options[:rollback]
+        "rollback"
+      elsif options[:force]
+        "force_deploy"
+      else
+        "deploy"
+      end
+
+    with_updated_bag(app, env, bag_override) do |bag|
+      say <<-EOS.gsub(/\s+/, ' ').strip
+        #{bag_override[:deploy_action].tr('_', ' ').capitalize}ing
+        #{shell.set_color(app, :green)}
+        #{'to' if options[:rollback]} revision
+        #{shell.set_color(bag_override[:revision] || bag['revision'][env], :yellow)}
+        as #{shell.set_color(options[:ssh_user], :blue)}
+        on #{shell.set_color(node, :cyan)}
+      EOS
+
       ssh_run(node, command)
     end
+
+  ensure
+    say "Debug log of Chef run written to #{node}:#{debug_log}"
   end
 
   private
@@ -86,11 +119,13 @@ class SSP::App::Chef < Thor
       end
       bag.save
 
-      yield
-
-      attributes.each do |key, value|
-        bag.raw_data[key.to_s] = original_values[key.to_s]
+      begin
+        yield(bag)
+      ensure
+        attributes.each do |key, value|
+          bag.raw_data[key.to_s] = original_values[key.to_s]
+        end
+        bag.save
       end
-      bag.save
     end
 end

data/lib/ssp/application/remote.rb

@@ -79,7 +79,7 @@ class SSP::App::Remote < Thor
   def log(logfile)
     @working_dir = options[:cwd] || options[:node] == "dtm-db-2" ? "/srv/rsyslog" : "/var/log"
     @working_dir += '/' + options[:host] if options[:host]
-    @working_dir += '/' + options[:date].tr('-', '/')
+    @working_dir += '/' + options[:date].tr('-', '/') if options[:node] == "dtm-db-2"
 
     @dont_print_hosts = true
     tail = "-f " if options[:date] == Time.now.utc.strftime("%Y-%m-%d")

data/lib/ssp/version.rb

@@ -1,3 +1,3 @@
 module SSP
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - "L\xC3\xA1szl\xC3\xB3 B\xC3\xA1csi"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +02:00
+date: 2010-10-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency