dump 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf3b51acc57b1248c3c3d607d81c0142af62aeed0c50e70d6d82c81bbbc9504c
-  data.tar.gz: bbda00645cdbb1758d3fc74ccb43345e6e5a41191de26fcc4cc09ec697004ad3
+  metadata.gz: c1716a773254d085e2520a9b6a2e291de3a1c0f9c81cb8e38c47c1c250b915e9
+  data.tar.gz: 70ce34c7214363ad7b67507f6897dc0fba861f08a19cb18631ead57a2c1ab6fd
 SHA512:
-  metadata.gz: 3901bed80cf473406a5a414c0e5bc5d584b53877505f79fc4995975e5deac5f42052b8625fd4535146c2868515459887d6edad9d379369d3597d7d84fabcbb9b
-  data.tar.gz: 3ba56de7b93dd9b39086226b7eadecb589429e03a0adae6ef869ae3a29c2856dc317ef679c2edc62935c73b0b5b0f87a2e83e49e5fc29fdb092c19bf48080a0e
+  metadata.gz: ea32de2024efb6eaecea27fd3f66f00148efdf3003aa26b46153ebb7da3206b34626f3973909af40b952c2d3fe4de239db4851a4ddcaf9c8e763859431e0cb07
+  data.tar.gz: c97a71f269af5ba4604a56d4dce9c885b0c1a85806fa1aef61674a4a1251140525b51b29edb289566c68c6e7bb4a6698ed5b85d11425ca590f045a5f108d9b8b

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

data/.github/workflows/check.yml

@@ -0,0 +1,102 @@
+name: check
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 45 4 * * 4
+jobs:
+  reminder:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '4'
+        bundler-cache: true
+    - run: |
+        curl -fsSL 'https://rubygems.org/api/v1/versions/rails.json' | ruby -rjson -e '
+          next_version = Dir.glob("spec/dummy-*")
+            .map{ Gem::Version.new(_1.split("-")[1] + ".0") }
+            .max
+            .bump
+
+          untested = JSON.load(STDIN)
+            .map{ Gem::Version.new(_1["number"]) }
+            .reject(&:prerelease?)
+            .reject{ _1 < next_version }
+            .sort
+            .map(&:approximate_recommendation)
+            .uniq
+
+          abort "Test versions #{untested.join(", ")}" unless untested.empty?
+        '
+  check:
+    runs-on: ubuntu-latest
+    container: "${{ matrix.container }}"
+    continue-on-error: ${{ startsWith(matrix.container, 'jruby:') }}
+    strategy:
+      matrix:
+        container:
+        - ruby:2.4
+        - ruby:2.5
+        - ruby:2.6
+        - ruby:2.7
+        - ruby:3.0
+        - ruby:3.1
+        - ruby:3.2
+        - ruby:3.3
+        - ruby:3.4
+        - ruby:4.0
+        - jruby:9.4
+        - jruby:10.0
+      fail-fast: false
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_USER: mysql
+          MYSQL_PASSWORD: mysql
+          MYSQL_DATABASE: dump_test
+          MYSQL_ROOT_PASSWORD: password
+        options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
+      postgres:
+        image: postgres:9.5
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: dump_test
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+    - uses: actions/checkout@v6
+    - run: which git || (apt update && apt -y install git)
+    - run: git init
+    - if: ${{ matrix.container >= 'ruby:1.9' && matrix.container < 'ruby:2.3' }}
+      run: |
+        echo "gem: --no-ri --no-rdoc --no-document" > ~/.gemrc
+        gem install rubygems-update --version '< 3'
+        update_rubygems
+        gem install bundler --version '< 2'
+    - run: |
+        tee spec/db/database.yml << YAML
+        sqlite3:
+          adapter: sqlite3
+          database: ':memory:'
+
+        mysql:
+          adapter: mysql2
+          host: mysql
+          database: dump_test
+          username: mysql
+          password: mysql
+          encoding: utf8
+
+        postgresql:
+          adapter: postgresql
+          host: postgres
+          database: dump_test
+          username: postgres
+          password: postgres
+        YAML
+    - run: bundle install --jobs=3 --retry=3
+    - run: RUBYOPT=-rset bundle exec appraisal install --jobs=3 --retry=3
+    - run: bundle exec appraisal rspec

data/.github/workflows/rubocop.yml

@@ -0,0 +1,16 @@
+name: rubocop
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: 45 4 * * 4
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '4'
+        bundler-cache: true
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
     - '*.gemspec'
     - 'spec/dummy-*/**/*'
     - 'gemfiles/*.gemfile'
+    - 'vendor/bundle/**/*'
+  NewCops: enable
 
 Bundler/OrderedGems:
   Enabled: false
@@ -21,7 +23,7 @@ Layout/DotPosition:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 Layout/SpaceBeforeBlockBraces:
@@ -37,6 +39,9 @@ Metrics/BlockLength:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
+Style/ArgumentsForwarding:
+  Enabled: false
+
 Style/DoubleNegation:
   Enabled: false
 
@@ -49,15 +54,33 @@ Style/Encoding:
 Style/FormatStringToken:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 
+Style/RedundantArgument:
+  Enabled: false
+
+Style/RedundantBegin:
+  Enabled: false
+
 Style/SafeNavigation:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,58 +1,63 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-11-10 17:16:05 +0100 using RuboCop version 0.60.0.
+# on 2021-07-10 18:10:30 UTC using RuboCop version 1.18.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 3
+# Configuration parameters: IgnoredMethods.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/dump/reader.rb'
     - 'spec/dump/table_manipulation_spec.rb'
 
-# Offense count: 7
+# Offense count: 2
 # Cop supports --auto-correct.
-Lint/UnneededSplatExpansion:
+# Configuration parameters: AllowPercentLiteralArrayArgument.
+Lint/RedundantSplatExpansion:
   Exclude:
     - 'lib/dump.rb'
-    - 'spec/dump/writer_spec.rb'
 
 # Offense count: 20
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 45
+  Max: 47
 
 # Offense count: 11
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 280
+  Max: 278
 
 # Offense count: 3
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 226
 
-# Offense count: 7
+# Offense count: 10
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Max: 17
 
-# Offense count: 30
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 29
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 47
+  Max: 55
 
 # Offense count: 2
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 130
 
-# Offense count: 3
+# Offense count: 6
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 15
+  Max: 18
 
 # Offense count: 3
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: lowercase, uppercase
 Naming/HeredocDelimiterCase:
@@ -71,14 +76,6 @@ Security/YAMLLoad:
   Exclude:
     - 'spec/cycle_spec.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'spec/recipes/dump_spec.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/ExpandPathArguments:
@@ -97,7 +94,7 @@ Style/RescueStandardError:
     - 'lib/dump/reader.rb'
     - 'lib/dump/writer.rb'
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 Style/StderrPuts:
   Exclude:
@@ -107,8 +104,9 @@ Style/StderrPuts:
     - 'lib/dump/writer.rb'
     - 'spec/cycle_spec.rb'
 
-# Offense count: 370
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 86
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 210

data/Appraisals

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-def appgen(gems)
+def appgen(gems) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
   description = gems.map{ |name, version| "#{name} #{version}" }.join(', ')
-  appraise description do
+  appraise "ruby-#{RUBY_VERSION[/\d+\.\d+/]} #{description}" do
     rails_version = gems['rails'][/\d+(\.\d+)+/]
 
     gems.each do |name, version|
@@ -24,16 +24,27 @@ def appgen(gems)
         gem 'activerecord-jdbc-adapter', "~> #{rails_version.scan(/\d+/).take(2).join('')}.0"
       end
     else
-      gem 'sqlite3', '~> 1.3.5'
+      case
+      when rails_version =~ /^[2345]\./
+        gem 'sqlite3', '~> 1.3.5'
+      when RUBY_VERSION < '2.7'
+        gem 'sqlite3', '< 1.6'
+      when RUBY_VERSION < '3.0'
+        gem 'sqlite3', '< 1.7'
+      when rails_version < '7.1'
+        gem 'sqlite3', '~> 1.4'
+      else
+        gem 'sqlite3'
+      end
 
       case
       when rails_version =~ /^2\./
-        gem 'mysql2', '~> 0.3.10'
+        gem 'mysql2', '~> 0.3.13'
         gem 'activerecord-mysql2-adapter'
-      when rails_version =~ /^3\./
-        gem 'mysql2', '~> 0.3.10'
+      when rails_version =~ /^3\.|^4\.[01]\./
+        gem 'mysql2', '~> 0.3.13'
       when rails_version =~ /^4\./
-        gem 'mysql2', '>= 0.3.13', '< 0.5'
+        gem 'mysql2', '~> 0.4.0'
       else
         gem 'mysql2'
       end
@@ -45,27 +56,54 @@ def appgen(gems)
         gem 'pg', '~> 0.11'
       when rails_version =~ /^4\./
         gem 'pg', '~> 0.15'
+      when RUBY_VERSION < '3'
+        gem 'pg', '< 1.6.1'
       else
         gem 'pg'
       end
+
+      if RUBY_VERSION < '2.0'
+        gem 'rake', '< 12.3'
+        gem 'rails-html-sanitizer', '< 1.5' if rails_version >= '4.2'
+      end
+
+      if RUBY_VERSION >= '3.0'
+        gem 'sorted_set'
+        gem 'net-smtp'
+      end
+
+      if RUBY_VERSION >= '3.4'
+        gem 'base64'
+        gem 'bigdecimal'
+        gem 'mutex_m'
+      end
+
+      if RUBY_VERSION < '2.5'
+        gem 'loofah', '< 2.21.0'
+      end
     end
   end
 end
 
-if RUBY_VERSION < '2.0'
-  appgen 'rails' => '~> 2.3'
-end
+appgen 'rails' => '~> 2.3.0' if RUBY_VERSION < '2.0'
 
-if RUBY_VERSION < '2.3'
-  appgen 'rails' => '~> 3.2'
-end
+appgen 'rails' => '~> 3.1.0' if RUBY_VERSION < '2.0'
+appgen 'rails' => '~> 3.2.0' if RUBY_VERSION < '2.4'
 
-if RUBY_VERSION >= '1.9'
-  appgen 'rails' => '~> 4.2'
-end
+appgen 'rails' => '~> 4.0.0' if RUBY_VERSION >= '1.9' && RUBY_VERSION < '2.3'
+appgen 'rails' => '~> 4.1.0' if RUBY_VERSION >= '1.9' && RUBY_VERSION < '2.4'
+appgen 'rails' => '~> 4.2.0' if RUBY_VERSION >= '1.9' && RUBY_VERSION < '2.5'
 
-if RUBY_VERSION >= '2.2'
-  appgen 'rails' => '~> 5.0.0'
-  appgen 'rails' => '~> 5.1.0'
-  appgen 'rails' => '~> 5.2'
-end
+appgen 'rails' => '~> 5.0.0' if RUBY_VERSION >= '2.3' && RUBY_VERSION < '2.5'
+appgen 'rails' => '~> 5.1.0' if RUBY_VERSION >= '2.3' && RUBY_VERSION < '2.6'
+appgen 'rails' => '~> 5.2.0' if RUBY_VERSION >= '2.3' && RUBY_VERSION < '3.0'
+
+appgen 'rails' => '~> 6.0.0' if RUBY_VERSION >= '2.5' && RUBY_VERSION < '3.1'
+appgen 'rails' => '~> 6.1.0' if RUBY_VERSION >= '2.5'
+
+appgen 'rails' => '~> 7.0.0' if RUBY_VERSION >= '2.7'
+appgen 'rails' => '~> 7.1.0' if RUBY_VERSION >= '2.7'
+appgen 'rails' => '~> 7.2.0' if RUBY_VERSION >= '3.1'
+
+appgen 'rails' => '~> 8.0.0' if RUBY_VERSION >= '3.2'
+appgen 'rails' => '~> 8.1.0' if RUBY_VERSION >= '3.2'

data/Gemfile

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'appraisal'
+gem 'rake', '< 12.3' if RUBY_VERSION < '2.0'
 
-if ENV['CHECK_RUBIES']
-  gem 'travis_check_rubies', '~> 0.2'
+gem 'appraisal', *RUBY_VERSION < '2.3' ? ['< 2.3'] : ['>= 2.5']
+
+if RUBY_VERSION >= '4'
+  gem 'benchmark'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2019 Ivan Kuchin
+Copyright (c) 2008-2026 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,14 +1,14 @@
-[![Gem Version](https://img.shields.io/gem/v/dump.svg?style=flat)](https://rubygems.org/gems/dump)
-[![Build Status](https://img.shields.io/travis/toy/dump/master.svg?style=flat)](https://travis-ci.org/toy/dump)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/dump.svg?style=flat)](https://codeclimate.com/github/toy/dump)
+[![Gem Version](https://img.shields.io/gem/v/dump?logo=rubygems)](https://rubygems.org/gems/dump)
+[![Check](https://img.shields.io/github/actions/workflow/status/toy/dump/check.yml?label=check&logo=github)](https://github.com/toy/dump/actions/workflows/check.yml)
+[![Rubocop](https://img.shields.io/github/actions/workflow/status/toy/dump/rubocop.yml?label=rubocop&logo=rubocop)](https://github.com/toy/dump/actions/workflows/rubocop.yml)
 
 # Dump
 
 Rails app rake and capistrano tasks to create and restore dumps of database and assets.
 
-Tested against rails 2.3, 3.1, 3.2, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2.
+Tested against rails `2.3`..`8.1`.
 
-Works with ruby 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5 (rails 4.0 requires at least ruby 1.9), nominally works with jruby (see [travis](https://travis-ci.org/toy/dump)).
+Works with ruby `1.9.3`..`4.0`, nominally works with jruby (see [check workflow](https://github.com/toy/dump/actions/workflows/check.yml)).
 
 ## Install
 
@@ -259,4 +259,4 @@ where myappserver.com is application server carrying assets with database access
 
 ## Copyright
 
-Copyright (c) 2008-2019 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2008-2026 Ivan Kuchin. See LICENSE.txt for details.

data/dump.gemspec

@@ -2,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dump'
-  s.version     = '1.2.1'
+  s.version     = '1.3.0'
   s.summary     = %q{Rails app rake and capistrano tasks to create and restore dumps of database and assets}
-  s.homepage    = "http://github.com/toy/#{s.name}"
+  s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.metadata = {
     'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
     'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
@@ -19,11 +21,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
-  s.add_dependency 'archive-tar-minitar', '= 0.5.2'
+  s.add_dependency 'minitar', '~> 0.6'
   s.add_dependency 'progress', '~> 3.0', '>= 3.0.1', '!= 3.2.0', '!= 3.2.1'
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.2'
-    s.add_development_dependency 'rubocop', '~> 0.59'
+  if RUBY_VERSION >= '2.5' && !defined?(JRUBY_VERSION)
+    s.add_development_dependency 'rubocop', '~> 1.22', '!= 1.22.2'
+    s.add_development_dependency 'rubocop-rspec', '~> 2.0'
   end
 end

data/lib/dump/capistrano/v2.rb

@@ -113,11 +113,9 @@ Capistrano::Configuration.instance(:i_need_this!).load do
       end
     end
 
-    def with_additional_tags(*tags)
+    def with_additional_tags(*tags, &block)
       tags = [tags, Dump::Env[:tags]].flatten.select(&:present?).join(',')
-      Dump::Env.with_env(:tags => tags) do
-        yield
-      end
+      Dump::Env.with_env(:tags => tags, &block)
     end
 
     def print_and_return_or_fail
@@ -159,12 +157,12 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     namespace :local do
-      desc 'Shorthand for dump:local:create' + Dump::Env.explain_variables_for_command(:create)
+      desc "Shorthand for dump:local:create#{Dump::Env.explain_variables_for_command(:create)}"
       task :default, :roles => :db, :only => {:primary => true} do
         local.create
       end
 
-      desc 'Create local dump' + Dump::Env.explain_variables_for_command(:create)
+      desc "Create local dump#{Dump::Env.explain_variables_for_command(:create)}"
       task :create, :roles => :db, :only => {:primary => true} do
         print_and_return_or_fail do
           with_additional_tags('local') do
@@ -173,22 +171,22 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Restore local dump' + Dump::Env.explain_variables_for_command(:restore)
+      desc "Restore local dump#{Dump::Env.explain_variables_for_command(:restore)}"
       task :restore, :roles => :db, :only => {:primary => true} do
         run_local(dump_command(:restore))
       end
 
-      desc 'Versions of local dumps' + Dump::Env.explain_variables_for_command(:versions)
+      desc "Versions of local dumps#{Dump::Env.explain_variables_for_command(:versions)}"
       task :versions, :roles => :db, :only => {:primary => true} do
         print run_local(dump_command(:versions, :show_size => true))
       end
 
-      desc 'Cleanup local dumps' + Dump::Env.explain_variables_for_command(:cleanup)
+      desc "Cleanup local dumps#{Dump::Env.explain_variables_for_command(:cleanup)}"
       task :cleanup, :roles => :db, :only => {:primary => true} do
         print run_local(dump_command(:cleanup))
       end
 
-      desc 'Upload dump' + Dump::Env.explain_variables_for_command(:transfer)
+      desc "Upload dump#{Dump::Env.explain_variables_for_command(:transfer)}"
       task :upload, :roles => :db, :only => {:primary => true} do
         file = Dump::Env.with_env(:summary => nil) do
           last_part_of_last_line(run_local(dump_command(:versions)))
@@ -200,12 +198,12 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     namespace :remote do
-      desc 'Shorthand for dump:remote:create' + Dump::Env.explain_variables_for_command(:create)
+      desc "Shorthand for dump:remote:create#{Dump::Env.explain_variables_for_command(:create)}"
       task :default, :roles => :db, :only => {:primary => true} do
         remote.create
       end
 
-      desc 'Create remote dump' + Dump::Env.explain_variables_for_command(:create)
+      desc "Create remote dump#{Dump::Env.explain_variables_for_command(:create)}"
       task :create, :roles => :db, :only => {:primary => true} do
         print_and_return_or_fail do
           with_additional_tags('remote') do
@@ -214,22 +212,22 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Restore remote dump' + Dump::Env.explain_variables_for_command(:restore)
+      desc "Restore remote dump#{Dump::Env.explain_variables_for_command(:restore)}"
       task :restore, :roles => :db, :only => {:primary => true} do
         run_remote("cd #{current_path}; #{dump_command(:restore, :rake => fetch_rake, :RAILS_ENV => fetch_rails_env, :PROGRESS_TTY => '+')}")
       end
 
-      desc 'Versions of remote dumps' + Dump::Env.explain_variables_for_command(:versions)
+      desc "Versions of remote dumps#{Dump::Env.explain_variables_for_command(:versions)}"
       task :versions, :roles => :db, :only => {:primary => true} do
         print run_remote("cd #{current_path}; #{dump_command(:versions, :rake => fetch_rake, :RAILS_ENV => fetch_rails_env, :PROGRESS_TTY => '+', :show_size => true)}")
       end
 
-      desc 'Cleanup of remote dumps' + Dump::Env.explain_variables_for_command(:cleanup)
+      desc "Cleanup of remote dumps#{Dump::Env.explain_variables_for_command(:cleanup)}"
       task :cleanup, :roles => :db, :only => {:primary => true} do
         print run_remote("cd #{current_path}; #{dump_command(:cleanup, :rake => fetch_rake, :RAILS_ENV => fetch_rails_env, :PROGRESS_TTY => '+')}")
       end
 
-      desc 'Download dump' + Dump::Env.explain_variables_for_command(:transfer)
+      desc "Download dump#{Dump::Env.explain_variables_for_command(:transfer)}"
       task :download, :roles => :db, :only => {:primary => true} do
         file = Dump::Env.with_env(:summary => nil) do
           last_part_of_last_line(run_remote("cd #{current_path}; #{dump_command(:versions, :rake => fetch_rake, :RAILS_ENV => fetch_rails_env, :PROGRESS_TTY => '+')}"))
@@ -241,18 +239,18 @@ Capistrano::Configuration.instance(:i_need_this!).load do
       end
     end
 
-    desc 'Shorthand for dump:local:upload' + Dump::Env.explain_variables_for_command(:transfer)
+    desc "Shorthand for dump:local:upload#{Dump::Env.explain_variables_for_command(:transfer)}"
     task :upload, :roles => :db, :only => {:primary => true} do
       local.upload
     end
 
-    desc 'Shorthand for dump:remote:download' + Dump::Env.explain_variables_for_command(:transfer)
+    desc "Shorthand for dump:remote:download#{Dump::Env.explain_variables_for_command(:transfer)}"
     task :download, :roles => :db, :only => {:primary => true} do
       remote.download
     end
 
     namespace :mirror do
-      desc 'Creates local dump, uploads and restores on remote' + Dump::Env.explain_variables_for_command(:mirror)
+      desc "Creates local dump, uploads and restores on remote#{Dump::Env.explain_variables_for_command(:mirror)}"
       task :up, :roles => :db, :only => {:primary => true} do
         auto_backup = if auto_backup?
           with_additional_tags('auto-backup') do
@@ -272,7 +270,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Creates remote dump, downloads and restores on local' + Dump::Env.explain_variables_for_command(:mirror)
+      desc "Creates remote dump, downloads and restores on local#{Dump::Env.explain_variables_for_command(:mirror)}"
       task :down, :roles => :db, :only => {:primary => true} do
         auto_backup = if auto_backup?
           with_additional_tags('auto-backup') do
@@ -294,12 +292,12 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     namespace :backup do
-      desc 'Shorthand for dump:backup:create' + Dump::Env.explain_variables_for_command(:backup)
+      desc "Shorthand for dump:backup:create#{Dump::Env.explain_variables_for_command(:backup)}"
       task :default, :roles => :db, :only => {:primary => true} do
         backup.create
       end
 
-      desc "Creates remote dump and downloads to local (desc defaults to 'backup')" + Dump::Env.explain_variables_for_command(:backup)
+      desc "Creates remote dump and downloads to local (desc defaults to 'backup')#{Dump::Env.explain_variables_for_command(:backup)}"
       task :create, :roles => :db, :only => {:primary => true} do
         file = with_additional_tags('backup') do
           remote.create
@@ -311,7 +309,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Uploads dump with backup tag and restores it on remote' + Dump::Env.explain_variables_for_command(:backup_restore)
+      desc "Uploads dump with backup tag and restores it on remote#{Dump::Env.explain_variables_for_command(:backup_restore)}"
       task :restore, :roles => :db, :only => {:primary => true} do
         file = with_additional_tags('backup') do
           last_part_of_last_line(run_local(dump_command(:versions)))