capistrano-fiftyfive 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ad4e92fe008acf75a2a3281becf8f61cecf67a
-  data.tar.gz: bebf97f80cd64e0cf52bca965318d8605f966737
+  metadata.gz: fdbde2f4fccd4d71cee322fa44e5b0efc0b8e7f8
+  data.tar.gz: c1f3b4f97aaa954f5f12ffdb3dc0b15cf001effa
 SHA512:
-  metadata.gz: 791fd196392a42c2b7c694a869e774479a5b821058e2f1fa668d6fdfe5ebda1ee5f47b548291d0cce4705c164feef8d052b80e72976ce436d9c5d1d9c529000c
-  data.tar.gz: 8a2bc6793637ae88835cbc2ed0eb8ab9319b2c562144e7eaef945919779fdba4e4b2566d74f81bf7fc3eb2082c57da7cff8e0eb87043e468e4abe2cf4f71f9cb
+  metadata.gz: 344a1b1348883651726eb448779a35db61697d0925c856f178d5370ff8894c65b30ab28c1a3249a76f3c6eb84e751575e91b62bb6a557c95c6b92e8ebfe939d3
+  data.tar.gz: 6fbc01f6072e72f639542c294d9e613446de66118840992bee2b6d56bcc0ce4156c088ef344b21017f2a1c4d6847fcfd3ed93a282ba1189a8b8ac4113d39fd89

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # capistrano-fiftyfive Changelog
 
+## `0.12.0`
+
+* capistrano-fiftyfive's abbreviated format now honors the new `SSHKIT_COLOR` environment variable. Set `SSHKIT_COLOR=1` to force ANSI color even on non-ttys (e.g. Jenkins).
+* The generated nginx config now enables reverse proxy caching by default.
+* INFO messages printed by sshkit are now printed to console under the appropriate rake task heading.
+
 ## `0.11.1`
 
 Fixes errors caused by PostgreSQL password containing shell-unsafe characters. Passwords are now safely hashed with MD5 before being used in the `CREATE USER` command.

data/lib/capistrano/fiftyfive/console.rb

@@ -15,13 +15,15 @@ module Capistrano
 
       # Writes to the IO after first truncating the output to fit the console
       # width. If the underlying IO is not a TTY, ANSI colors are removed from
-      # the output. A newline is always added.
+      # the output. A newline is always added. Color output can be forced by
+      # setting the SSHKIT_COLOR environment variable.
       def print_line(obj)
         string = obj.to_s
 
-        if @output.tty?
+        if console_width
           string = truncate_to_console_width(string)
-        else
+        end
+        unless ENV["SSHKIT_COLOR"] || @output.tty?
           string = strip_ascii_color(string)
         end
 

data/lib/capistrano/fiftyfive/templates/nginx.erb

@@ -32,6 +32,10 @@ http {
   # Unicorn nor Rainbows! is optimized for it at the moment
   sendfile on;
 
+  # configure reverse proxy cache
+  proxy_cache_path  /var/cache/nginx levels=1:2 keys_zone=default:8m max_size=1000m inactive=30d;
+  proxy_temp_path   /var/cache/nginx/tmp;
+
   tcp_nopush on; # off may be better for *some* Comet/long-poll stuff
   tcp_nodelay off; # on may be better for some Comet/long-poll stuff
 

data/lib/capistrano/fiftyfive/templates/nginx_unicorn.erb

@@ -87,6 +87,10 @@ upstream unicorn_<%= application_basename %> {
         # redirects, we set the Host: header above already.
         proxy_redirect off;
 
+        # enable caching (honors cache-control headers sent by Rails)
+        proxy_cache default;
+        add_header X-Cache-Status $upstream_cache_status;
+
         proxy_pass http://unicorn_<%= application_basename %>;
       }
 

data/lib/capistrano/fiftyfive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiftyfive
-    VERSION = "0.11.1"
+    VERSION = "0.12.0"
   end
 end

data/lib/sshkit/formatter/abbreviated.rb

@@ -64,20 +64,19 @@ module SSHKit
 
       def write_log_message(log_message)
         return unless log_message.verbosity >= SSHKit::Logger::INFO
+        print_task_if_changed
         @console.print_line(light_black("      " + log_message.to_s))
       end
 
       def write_command(command)
         return unless command.verbosity > SSHKit::Logger::DEBUG
 
+        print_task_if_changed
+
         ctx = context_for_command(command)
         number = '%02d' % ctx.number
 
         if ctx.first_execution?
-          if ctx.first_command_of_task?
-            print_line "#{clock} #{blue(ctx.task)}"
-          end
-
           description = yellow(ctx.shell_string)
           print_line "      #{number} #{description}"
         end
@@ -88,9 +87,33 @@ module SSHKit
         end
       end
 
-      def context_for_command(command)
+      def print_task_if_changed
+        status = current_task_status
+
+        if status.changed
+          print_line "#{clock} #{blue(status.task)}"
+        end
+      end
+
+      def current_task_status
         task = self.class.current_rake_task.to_s
-        task_commands = @tasks[task] ||= []
+        if @tasks[task]
+          changed = false
+        else
+          changed = true
+          @tasks[task] = []
+        end
+
+        OpenStruct.new(
+          :task => task,
+          :commands => @tasks[task],
+          :changed => changed
+        )
+      end
+
+      def context_for_command(command)
+        status = current_task_status
+        task_commands = status.commands
 
         shell_string = command.to_s.sub(%r(^/usr/bin/env ), "")
 
@@ -105,9 +128,7 @@ module SSHKit
 
         OpenStruct.new({
           :first_execution? => first_execution,
-          :first_command_of_task? => (number == 1),
           :number => number,
-          :task => task,
           :shell_string => shell_string
         })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiftyfive
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano