capistrano-fiftyfive 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd7a614d1cce71475c2ad308b03b116b5cd2a9a
-  data.tar.gz: 424092e4974c0cfc779ee2ac471bcf1f40e47ab2
+  metadata.gz: ffd897eb6b668f60d4610627fcf7bb456476f31d
+  data.tar.gz: d639e21894968d79f1696948b8f41d7bbc470932
 SHA512:
-  metadata.gz: f416ef20815e2222e99733a8a24b68ff6f4c1729f05259939cd4cb530c1490b554c8ae5025c141a81890f2e0e6914ccc2de4e48639b4cf1e6a9ff8bd2d509adf
-  data.tar.gz: 0c0fd5d8fd66e29fa076961eb77c7776a1e1988fbca13fcd69e0b212a2638c33e73132b9b3fea21dcf57cb070b6bc62d9ef228c4e4f73ffb7508a27881b18de8
+  metadata.gz: 22d68303c1bf01dd10c8910a41f60fca9cad374f3adb7ecf85078239e6fb6a2f7ece4fa65d2347f9680d77c6753e8c88b97b32f60e54b3760b5859fad102b8a5
+  data.tar.gz: 5365ed52ed3fb991cf7bf6c53e857e25d081c5c322a8e7843b888d5c3f5fd6ebe0fd7189df2ce541957caa10b7bef6ebfa504ad0e064387193a533f2d0c785b9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # capistrano-fiftyfive Changelog
 
+## `0.18.0`
+
+* **The abbreviated log formatter has been removed and is now available in a new gem: `airbrussh`.** With this change, capistrano-fiftyfive no longer automatically changes the logging format of capistrano. To opt into the prettier, more concise format, add the airbrussh gem to your project as explained in the [airbrussh README](https://github.com/mattbrictson/airbrussh#readme).
+* The version initializer that capistrano-fiftyfive adds during deployment sets a new value: `Rails.application.config.version_time`. You can use this value within your app for the date and time of the last commit that produced the version that is currently deployed.
+
+
 ## `0.17.2`
 
 * Default self-signed SSL certificate is now more generic (for real this time).

data/README.md

@@ -26,7 +26,7 @@ The gem is named "capistrano-fiftyfive" for historical reasons: it was initially
 * rbenv
 * dotenv
 
-In addition, capistrano-fiftyfive changes many of Capistrano's defaults, including the deployment location, Bundler behavior, and SSH keep-alive settings. It also overhauls and simplifies the logging format. (See [defaults.rake][] for details.)
+In addition, capistrano-fiftyfive changes many of Capistrano's defaults, including the deployment location, Bundler behavior, and SSH keep-alive settings. (See [defaults.rake][] for details.)
 
 Not quite to your liking? Consider forking the project to meet your needs.
 

data/lib/capistrano/fiftyfive.rb

@@ -4,8 +4,6 @@ require "capistrano/fiftyfive/version"
 require "capistrano/fiftyfive/compatibility"
 require "capistrano/fiftyfive/dsl"
 require "capistrano/fiftyfive/recipe"
-require "capistrano/fiftyfive/console"
-require "sshkit/formatter/abbreviated"
 include Capistrano::Fiftyfive::DSL
 
 load File.expand_path("../tasks/provision.rake", __FILE__)
@@ -28,4 +26,3 @@ load File.expand_path("../tasks/seed.rake", __FILE__)
 load File.expand_path("../tasks/version.rake", __FILE__)
 load File.expand_path("../tasks/rake.rake", __FILE__)
 load File.expand_path("../tasks/sidekiq.rake", __FILE__)
-load File.expand_path("../tasks/deploy.rake", __FILE__)

data/lib/capistrano/fiftyfive/templates/version.rb.erb

@@ -1,2 +1,3 @@
 Rails.application.config.version = "<%= git_version[:tag] %>"
 Rails.application.config.version_date = Date.parse("<%= git_version[:date] %>")
+Rails.application.config.version_time = Time.zone.parse("<%= git_version[:time] %>")

data/lib/capistrano/fiftyfive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiftyfive
-    VERSION = "0.17.2"
+    VERSION = "0.18.0"
   end
 end

data/lib/capistrano/tasks/defaults.rake

@@ -94,7 +94,6 @@ namespace :load do
     set :bundle_binstubs, false
     set :bundle_flags, '--deployment'
     set :deploy_to, -> { "/home/deployer/apps/#{fetch(:application)}" }
-    set :format, :abbreviated
     set :keep_releases, 10
     set :linked_dirs, -> {
         ["public/#{fetch(:assets_prefix, 'assets')}"] +

data/lib/capistrano/tasks/version.rake

@@ -17,6 +17,9 @@ namespace :fiftyfive do
             git_version[:date] = \
               capture(:git, "log", branch, '-1 --format="%ad" --date=short')\
               .chomp
+            git_version[:time] = \
+              capture(:git, "log", branch, '-1 --format="%ad" --date=iso')\
+              .chomp
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiftyfive
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -83,7 +83,6 @@ files:
 - capistrano-fiftyfive.gemspec
 - lib/capistrano/fiftyfive.rb
 - lib/capistrano/fiftyfive/compatibility.rb
-- lib/capistrano/fiftyfive/console.rb
 - lib/capistrano/fiftyfive/dsl.rb
 - lib/capistrano/fiftyfive/recipe.rb
 - lib/capistrano/fiftyfive/templates/crontab.erb
@@ -106,7 +105,6 @@ files:
 - lib/capistrano/tasks/crontab.rake
 - lib/capistrano/tasks/defaults.rake
 - lib/capistrano/tasks/delayed_job.rake
-- lib/capistrano/tasks/deploy.rake
 - lib/capistrano/tasks/dotenv.rake
 - lib/capistrano/tasks/logrotate.rake
 - lib/capistrano/tasks/maintenance.rake
@@ -123,7 +121,6 @@ files:
 - lib/capistrano/tasks/unicorn.rake
 - lib/capistrano/tasks/user.rake
 - lib/capistrano/tasks/version.rake
-- lib/sshkit/formatter/abbreviated.rb
 homepage: https://github.com/mattbrictson/capistrano-fiftyfive
 licenses:
 - MIT
@@ -144,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Additional Capistrano 3 recipes

data/lib/capistrano/fiftyfive/console.rb

@@ -1,64 +0,0 @@
-require 'io/console'
-
-module Capistrano
-  module Fiftyfive
-    # Helper class that wraps an IO object and provides methods for truncating
-    # output, assuming the IO object represents a console window.
-    #
-    # This is useful for writing log messages that will typically show up on
-    # an ANSI color-capable console. When a console is not present (e.g. when
-    # running on a CI server) the output will gracefully degrade.
-    class Console
-      def initialize(output)
-        @output = output
-      end
-
-      # 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. Color output can be forced by
-      # setting the SSHKIT_COLOR environment variable.
-      def print_line(obj="")
-        string = obj.to_s
-
-        if console_width
-          string = truncate_to_console_width(string)
-        end
-        unless ENV["SSHKIT_COLOR"] || @output.tty?
-          string = strip_ascii_color(string)
-        end
-
-        write(string + "\n")
-        @output.flush
-      end
-
-      # Writes directly through to the IO with no truncation or color logic.
-      # No newline is added.
-      def write(string)
-        @output.write(string || "")
-      end
-      alias_method :<<, :write
-
-      def truncate_to_console_width(string)
-        string = (string || "").rstrip
-        width = console_width
-
-        if strip_ascii_color(string).length > width
-          while strip_ascii_color(string).length >= width
-            string.chop!
-          end
-          string << "…\e[0m"
-        else
-          string
-        end
-      end
-
-      def strip_ascii_color(string)
-        (string || "").gsub(/\033\[[0-9;]*m/, "")
-      end
-
-      def console_width
-        IO.console.winsize.last if @output.tty?
-      end
-    end
-  end
-end

data/lib/capistrano/tasks/deploy.rake

@@ -1,6 +0,0 @@
-namespace :deploy do
-  task :failed do
-    output = env.backend.config.output
-    output.on_deploy_failure if output.respond_to?(:on_deploy_failure)
-  end
-end

data/lib/sshkit/formatter/abbreviated.rb

@@ -1,194 +0,0 @@
-require 'colorize'
-require 'ostruct'
-
-module SSHKit
-  module Formatter
-    class Abbreviated < SSHKit::Formatter::Abstract
-
-      class << self
-        attr_accessor :current_rake_task
-
-        def monkey_patch_rake_task!
-          return if @rake_patched
-
-          eval(<<-EVAL)
-            class ::Rake::Task
-              alias_method :_original_execute_cap55, :execute
-              def execute(args=nil)
-                SSHKit::Formatter::Abbreviated.current_rake_task = name
-                _original_execute_cap55(args)
-              end
-            end
-          EVAL
-
-          @rake_patched = true
-        end
-      end
-
-      def initialize(io)
-        super
-
-        self.class.monkey_patch_rake_task!
-
-        @tasks = {}
-
-        @log_file = fetch(:fiftyfive_log_file) || "capistrano.log"
-        @log_file_formatter = SSHKit::Formatter::Pretty.new(
-          ::Logger.new(@log_file, 1, 20971520)
-        )
-
-        @console = Capistrano::Fiftyfive::Console.new(original_output)
-        write_log_file_delimiter
-        write_banner
-      end
-
-      def print_line(string)
-        @console.print_line(string)
-      end
-
-      def write_banner
-        print_line "Using abbreviated format."
-        print_line "Full cap output is being written to #{blue(@log_file)}."
-      end
-
-      def write_log_file_delimiter
-        delimiter = []
-        delimiter << "-" * 75
-        delimiter << "START #{Time.now} cap #{ARGV.join(' ')}"
-        delimiter << "-" * 75
-        delimiter.each do |line|
-          @log_file_formatter << SSHKit::LogMessage.new(
-            SSHKit::Logger::INFO,
-            line
-            )
-        end
-      end
-
-      def write(obj)
-        @log_file_formatter << obj
-
-        case obj
-        when SSHKit::Command    then write_command(obj)
-        when SSHKit::LogMessage then write_log_message(obj)
-        end
-      end
-      alias :<< :write
-
-      def on_deploy_failure
-        err = Capistrano::Fiftyfive::Console.new($stderr)
-        err.print_line
-        err.print_line(red("** DEPLOY FAILED"))
-        err.print_line(yellow(
-          "** Refer to #{@log_file} for details. Here are the last 20 lines:"
-          ))
-        err.print_line
-        system("tail -n 20 #{@log_file.shellescape} 1>&2")
-      end
-
-      private
-
-      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?
-          description = yellow(ctx.shell_string)
-          print_line "      #{number} #{description}"
-        end
-
-        if command.finished?
-          status = format_command_completion_status(command, number)
-          print_line "    #{status}"
-        end
-      end
-
-      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
-        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 ), "")
-
-        if task_commands.include?(shell_string)
-          first_execution = false
-        else
-          first_execution = true
-          task_commands << shell_string
-        end
-
-        number = task_commands.index(shell_string) + 1
-
-        OpenStruct.new({
-          :first_execution? => first_execution,
-          :number => number,
-          :shell_string => shell_string
-        })
-      end
-
-      def format_command_completion_status(command, number)
-        user = command.user { command.host.user }
-        host = command.host.to_s
-        user_at_host = [user, host].join("@")
-
-        status = if command.failure?
-          red("✘ #{number} #{user_at_host} (see #{@log_file} for details)")
-        else
-          green("✔ #{number} #{user_at_host}")
-        end
-
-        runtime = light_black("%5.3fs" % command.runtime)
-
-        status + " " + runtime
-      end
-
-      def clock
-        @start_at ||= Time.now
-        duration = Time.now - @start_at
-
-        minutes = (duration / 60).to_i
-        seconds = (duration - minutes * 60).to_i
-
-        "%02d:%02d" % [minutes, seconds]
-      end
-
-      %w(light_black red blue green yellow).each do |color|
-        define_method(color) do |string|
-          string.to_s.colorize(color.to_sym)
-        end
-      end
-    end
-  end
-end