capistrano 2.12.0 → 2.13.5

data/test/logger_test.rb

@@ -5,7 +5,8 @@ require 'stringio'
 class LoggerTest < Test::Unit::TestCase
   def setup
     @io = StringIO.new
-    @logger = Capistrano::Logger.new(:output => @io)
+    # Turn off formatting for these tests. Formatting is tested in `logger_formatting_test.rb`.
+    @logger = Capistrano::Logger.new(:output => @io, :disable_formatters => true)
   end
 
   def test_logger_should_use_STDERR_by_default
@@ -13,6 +14,16 @@ class LoggerTest < Test::Unit::TestCase
     assert_equal STDERR, logger.device
   end
 
+  def test_logger_should_have_log_level_0
+    logger = Capistrano::Logger.new
+    assert_equal 0, logger.level
+  end
+
+  def test_logger_should_use_level_form_options
+    logger = Capistrano::Logger.new :level => 4
+    assert_equal 4, logger.level
+  end
+
   def test_logger_should_use_output_option_if_output_responds_to_puts
     logger = Capistrano::Logger.new(:output => STDOUT)
     assert_equal STDOUT, logger.device

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70100200770260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100200770260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70100200769760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 2.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70100200769760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &70100200769280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70100200769280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70100200768800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70100200768800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
-  requirement: &70100200768320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,18 +86,28 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70100200768320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70100200767840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70100200767840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -117,6 +147,7 @@ files:
 - lib/capistrano/configuration/connections.rb
 - lib/capistrano/configuration/execution.rb
 - lib/capistrano/configuration/loading.rb
+- lib/capistrano/configuration/log_formatters.rb
 - lib/capistrano/configuration/namespaces.rb
 - lib/capistrano/configuration/roles.rb
 - lib/capistrano/configuration/servers.rb
@@ -153,9 +184,7 @@ files:
 - lib/capistrano/recipes/deploy/strategy/remote.rb
 - lib/capistrano/recipes/deploy/strategy/remote_cache.rb
 - lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb
-- lib/capistrano/recipes/deploy/templates/maintenance.rhtml
 - lib/capistrano/recipes/standard.rb
-- lib/capistrano/recipes/templates/maintenance.rhtml
 - lib/capistrano/role.rb
 - lib/capistrano/server_definition.rb
 - lib/capistrano/shell.rb
@@ -198,6 +227,7 @@ files:
 - test/fixtures/cli_integration.rb
 - test/fixtures/config.rb
 - test/fixtures/custom.rb
+- test/logger_formatting_test.rb
 - test/logger_test.rb
 - test/recipes_test.rb
 - test/role_test.rb
@@ -227,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -267,6 +297,7 @@ test_files:
 - test/fixtures/cli_integration.rb
 - test/fixtures/config.rb
 - test/fixtures/custom.rb
+- test/logger_formatting_test.rb
 - test/logger_test.rb
 - test/recipes_test.rb
 - test/role_test.rb
@@ -276,3 +307,4 @@ test_files:
 - test/task_definition_test.rb
 - test/transfer_test.rb
 - test/utils.rb
+has_rdoc: 

data/lib/capistrano/recipes/deploy/templates/maintenance.rhtml

@@ -1,53 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>System down for maintenance</title>
-
-  <style type="text/css">
-    div.outer {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 500px;
-      height: 300px;
-      margin-left: -260px; 
-      margin-top: -150px;
-    }
-
-    .DialogBody {
-      margin: 0;
-      padding: 10px;
-      text-align: left;
-      border: 1px solid #ccc;
-      border-right: 1px solid #999;
-      border-bottom: 1px solid #999;
-      background-color: #fff;
-    }
-
-    body { background-color: #fff; }
-  </style>
-</head>
-
-<body>
-
-  <div class="outer">
-     <div class="DialogBody" style="text-align: center;">
-       <div style="text-align: center; width: 200px; margin: 0 auto;">
-         <p style="color: red; font-size: 16px; line-height: 20px;">
-           The system is down for <%= reason ? reason : "maintenance" %>
-           as of <%= Time.now.strftime("%H:%M %Z") %>.
-         </p>
-         <p style="color: #666;">
-           It'll be back <%= deadline ? deadline : "shortly" %>.
-         </p>
-       </div>
-     </div>
-  </div>
-
-</body>
-</html>

data/lib/capistrano/recipes/templates/maintenance.rhtml

@@ -1,53 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>System down for maintenance</title>
-
-  <style type="text/css">
-    div.outer {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 500px;
-      height: 300px;
-      margin-left: -260px; 
-      margin-top: -150px;
-    }
-
-    .DialogBody {
-      margin: 0;
-      padding: 10px;
-      text-align: left;
-      border: 1px solid #ccc;
-      border-right: 1px solid #999;
-      border-bottom: 1px solid #999;
-      background-color: #fff;
-    }
-
-    body { background-color: #fff; }
-  </style>
-</head>
-
-<body>
-
-  <div class="outer">
-     <div class="DialogBody" style="text-align: center;">
-       <div style="text-align: center; width: 200px; margin: 0 auto;">
-         <p style="color: red; font-size: 16px; line-height: 20px;">
-           The system is down for <%= reason ? reason : "maintenance" %>
-           as of <%= Time.now.strftime("%H:%M %Z") %>.
-         </p>
-         <p style="color: #666;">
-           It'll be back <%= deadline ? deadline : "shortly" %>.
-         </p>
-       </div>
-     </div>
-  </div>
-
-</body>
-</html>