capistrano 2.15.5 → 2.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d390cc4fc2f8e025b2aba4fa2c287e36c999ed
-  data.tar.gz: 04a65a40859de8159af366edc9b73248a28cdca2
+  metadata.gz: 09f391e9aa754cd9e2b9414b047993aaee463747
+  data.tar.gz: 5cb90bd02e70dcb1551dc57d1a4ff2ccdeb7c131
 SHA512:
-  metadata.gz: ebf02e5b3c3bd832ca9c67f8c9cae56cbaf424ef6797d43d611604db68088c43b79f7577e9887b7960984f328162390c566ed38c479754a877fb955b3325a86f
-  data.tar.gz: 43ad8672fb85662636eb379a98987fe32bf0ff72af01d5718b6d303eb95335277aabdbfc058f62b6f249973cd1d97a53a66bcca56029847a837179e3f2466222
+  metadata.gz: d4be16d73d6fb8358d51a7c6fa5086322a12fb4827aa6781fb068867af4fb1cb780482303460bacef63b7c10c79dda937e24d3b9eb6e96c26648f91ed786a4fa
+  data.tar.gz: 58d9a81ec729dce023d40601a2ccb9b2b17b683fd7b6f5b5412c4efbc92a29458a452226aa89d060777efe3bed183050346b0032c7297c47298e011ace4b8bc4

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ree
+  - 2.1.1
+cache: bundler
+branches:
+  except:
+    - legacy-v2

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 2.15.5 / June 17 2015
+
+* Handle new Sprockets manifest name (@skaes)
+
 ## 2.15.5 / July 4 2013
 
 * Fix multistage argument parsing when using the `-s` option. (@jmazzi)

data/lib/capistrano/configuration/alias_task.rb

@@ -3,7 +3,7 @@ module Capistrano
     module AliasTask
       # Attempts to find the task at the given fully-qualified path, and
       # alias it. If arguments don't have correct task names, an ArgumentError
-      # wil be raised. If no such task exists, a Capistrano::NoSuchTaskError
+      # will be raised. If no such task exists, a Capistrano::NoSuchTaskError
       # will be raised.
       #
       # Usage:
@@ -16,7 +16,7 @@ module Capistrano
         end
 
         original_task = find_task(old_name) or raise NoSuchTaskError, "the task `#{old_name}' does not exist"
-        task = original_task.dup # Dup. task to avoid modify original task
+        task = original_task.dup # Duplicate task to avoid modify original task
         task.name = new_name
 
         define_task(task)

data/lib/capistrano/configuration/log_formatters.rb

@@ -13,9 +13,9 @@
 #     { :match => /git/,                    :color => :white,     :priority => 20, :style => :reverse }
 #   ]
 #
-#   format_logs capistrano_log_formatters
+#   log_formatter capistrano_log_formatters
 #
-# You can call format_logs multiple times, with either a hash or an array of hashes.
+# You can call log_formatter multiple times, with either a hash or an array of hashes.
 #
 # == Colors:
 #

data/lib/capistrano/configuration/roles.rb

@@ -63,6 +63,12 @@ module Capistrano
       # the roles as the remaining parameters:
       #
       #   server "master.example.com", :web, :app
+      #
+      # Also, you can specify additional information
+      # (in the form of a Hash) which can be used to more uniquely specify the
+      # subset of servers specified by this specific definition:
+      #
+      #   server "master.example.com", :db, :primary => true
       def server(host, *roles)
         options = roles.last.is_a?(Hash) ? roles.pop : {}
         raise ArgumentError, "you must associate a server with at least one role" if roles.empty?

data/lib/capistrano/configuration/servers.rb

@@ -14,7 +14,7 @@ module Capistrano
       # an array of host names or ServerDefinition instances), a :roles
       # option (specifying an array of roles), an :only option (specifying
       # a hash of key/value pairs that any matching server must match),
-      # an :exception option (like :only, but the inverse), and a
+      # an :except option (like :only, but the inverse), and a
       # :skip_hostfilter option to ignore the HOSTFILTER environment variable
       # described below.
       #

data/lib/capistrano/logger.rb

@@ -95,7 +95,7 @@ module Capistrano
 
     def log(level, message, line_prefix=nil)
       if level <= self.level
-        # Only format output if device is a TTY or formatters are not disabled
+        # Only format output if device is a TTY and formatters are not disabled
         if device.tty? && !@disable_formatters
           color = :none
           style = nil

data/lib/capistrano/recipes/deploy/assets.rb

@@ -7,6 +7,7 @@ _cset :assets_prefix, "assets"
 _cset :shared_assets_prefix, "assets"
 _cset :assets_role, [:web]
 _cset :expire_assets_after, (3600 * 24 * 7)
+_cset :asset_manifest_prefix, (`sprockets -v`.chomp < "3.0" ? "manifest" : ".sprockets-manifest") rescue "manifest"
 
 _cset :normalize_asset_timestamps, false
 
@@ -17,7 +18,7 @@ after  'deploy:cleanup',           'deploy:assets:clean_expired'
 after  'deploy:rollback:revision', 'deploy:assets:rollback'
 
 def shared_manifest_path
-  @shared_manifest_path ||= capture("ls #{shared_path.shellescape}/#{shared_assets_prefix}/manifest*").strip
+  @shared_manifest_path ||= capture("ls #{shared_path.shellescape}/#{shared_assets_prefix}/#{asset_manifest_prefix}*").strip
 end
 
 # Parses manifest and returns array of uncompressed and compressed asset filenames with and without digests
@@ -64,14 +65,14 @@ namespace :deploy do
         RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} #{rake} assets:precompile
       CMD
 
-      if capture("ls -1 #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* | wc -l").to_i > 1
+      if capture("ls -1 #{shared_path.shellescape}/#{shared_assets_prefix}/#{asset_manifest_prefix}* | wc -l").to_i > 1
         raise "More than one asset manifest file was found in '#{shared_path.shellescape}/#{shared_assets_prefix}'.  If you are upgrading a Rails 3 application to Rails 4, follow these instructions: http://github.com/capistrano/capistrano/wiki/Upgrading-to-Rails-4#asset-pipeline"
       end
 
       # Sync manifest filenames across servers if our manifest has a random filename
-      if shared_manifest_path =~ /manifest-.+\./
+      if shared_manifest_path =~ /#{asset_manifest_prefix}-.+\./
         run <<-CMD.compact
-          [ -e #{shared_manifest_path.shellescape} ] || mv -- #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* #{shared_manifest_path.shellescape}
+          [ -e #{shared_manifest_path.shellescape} ] || mv -- #{shared_path.shellescape}/#{shared_assets_prefix}/#{asset_manifest_prefix}* #{shared_manifest_path.shellescape}
         CMD
       end
 
@@ -87,7 +88,7 @@ namespace :deploy do
     DESC
     task :update_asset_mtimes, :roles => lambda { assets_role }, :except => { :no_release => true } do
       # Fetch assets/manifest contents.
-      manifest_content = capture("[ -e #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* ] && cat #{shared_path.shellescape}/#{shared_assets_prefix}/manifest* || echo").strip
+      manifest_content = capture("[ -e '#{shared_path.shellescape}/#{shared_assets_prefix}/#{asset_manifest_prefix}*' ] && cat #{shared_path.shellescape}/#{shared_assets_prefix}/#{asset_manifest_prefix}* || echo").strip
 
       if manifest_content != ""
         current_assets = parse_manifest(manifest_content)

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -239,7 +239,7 @@ module Capistrano
           return newrev if newrev =~ /^[0-9a-f]{40}$/
 
           # If sha is not found on remote, try expanding from local repository
-          command = scm('rev-parse --revs-only', revision)
+          command = scm('rev-parse --revs-only', origin + '/' + revision)
           newrev = yield(command).to_s.strip
 
           raise "Unable to resolve revision for '#{revision}' on repository '#{repository}'." unless newrev =~ /^[0-9a-f]{40}$/

data/lib/capistrano/recipes/deploy/strategy.rb

@@ -3,9 +3,10 @@ module Capistrano
     module Strategy
       def self.new(strategy, config={})
         strategy_file = "capistrano/recipes/deploy/strategy/#{strategy}"
-        require(strategy_file)
-
         strategy_const = strategy.to_s.capitalize.gsub(/_(.)/) { $1.upcase }
+
+        require(strategy_file) unless const_defined?(strategy_const)
+
         if const_defined?(strategy_const)
           const_get(strategy_const).new(config)
         else

data/lib/capistrano/version.rb

@@ -2,10 +2,12 @@ module Capistrano
   class Version
     MAJOR = 2
     MINOR = 15
-    PATCH = 5
+    PATCH = 6
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end
+
+  VERSION = Version.to_s
 end

data/test/version_test.rb

@@ -0,0 +1,11 @@
+require 'capistrano/version'
+
+class VersionTest < Test::Unit::TestCase
+  def test_version_constant_is_not_nil
+    assert_not_nil Capistrano::VERSION
+  end
+
+  def test_version_constant_matches_class_method
+    assert_equal Capistrano::VERSION, Capistrano::Version.to_s
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.15.5
+  version: 2.15.6
 platform: ruby
 authors:
 - Jamis Buck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -225,6 +225,7 @@ files:
 - test/task_definition_test.rb
 - test/transfer_test.rb
 - test/utils.rb
+- test/version_test.rb
 homepage: http://github.com/capistrano/capistrano
 licenses: []
 metadata: {}
@@ -244,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -294,4 +295,4 @@ test_files:
 - test/task_definition_test.rb
 - test/transfer_test.rb
 - test/utils.rb
-has_rdoc: 
+- test/version_test.rb