dump 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzE3NmQ3MTRjN2QwOWJlMGNkMTMzNWZjMDcxOTQ5ZGNjYzBkYzJhZg==
-  data.tar.gz: !binary |-
-    NzFjNTA5MjgzOTEzMzczMjg4ZDYzYTg5NWVhZDRjN2Y3OTIzZWNiNg==
-SHA512:
-  metadata.gz: !binary |-
-    MjkyOWRmMTZmMGVlNDNlZjUzYzAwMzdkZjAyNWE1MmIyZGQ2MzVmZTMxMjgy
-    MzY1OTBkZTA0ZWIxNTZlMmU1NTE5YTA3MDZkMjM3MjBjNzM3ZWViZGI1Y2U2
-    MDAwNTg4MmE2MzE5YzMwMGY3NDlkMWU2MjY0ZmQyMjkxZjE1OGM=
-  data.tar.gz: !binary |-
-    ZTQ0ZmVmOWQ0YzVkNzcyMDdiYzQ4ZDI0YTY0YmYzNjczMjlmNDM3ZDBiZDdm
-    YzAzNWI4ODI0OWUzZTE1MGRlMmQ2NWUxYWI2ZWZiMjcyMzY5YzA1OTYwM2Qw
-    YzVmMDc5MzA2NzQ3OTc1NjM4MGYzYTE5ZTczMzc1ZDY1ZWY1ZGQ=
+--- 
+SHA1: 
+  metadata.gz: aeeda9548f8d471316521b37c274e7e5692f9b60
+  data.tar.gz: f15ddf0ed0bc6f906102839da2935fe35a186ca6
+SHA512: 
+  metadata.gz: 3da9dbc8c63515701f19ac328b849fd979d22973da53f82cb826a1b49ee8c4f3bcc5a605f6d93b0a46001d0d5826377565de4ecf2fdb0976732fead37a3389b9
+  data.tar.gz: 82a717b71def2345689c3d13f98cc54790e9a6bdb13f2370293d4dfc46ad63916cc15202945d4ad68d64ca4160a903877349acb40ed7b5bebe47715e263c999b

data/.rubocop_todo.yml

@@ -21,7 +21,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 386
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 209
+  Max: 210
 
 # Offense count: 28
 # Configuration parameters: CountComments.

data/Gemfile

@@ -10,7 +10,12 @@ if defined?(JRUBY_VERSION)
 else
   gem 'sqlite3'
   gem 'mysql2'
-  gem 'pg'
+  if RUBY_VERSION == '1.8.7'
+    gem 'pg', '0.17.1'
+    gem 'i18n', '0.6.11'
+  else
+    gem 'pg'
+  end
   if rails_version =~ /(^|[^.\d])(2|3\.0)\.\d+/
     gem 'activerecord-mysql2-adapter'
   end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Ivan Kuchin
+Copyright (c) 2008-2015 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

@@ -2,7 +2,7 @@
 [![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/github/toy/dump.svg?style=flat)](https://codeclimate.com/github/toy/dump)
 
-# DumpRake
+# Dump
 
 Rails app rake and capistrano tasks to create and restore dumps of database and assets.
 
@@ -259,4 +259,4 @@ where myappserver.com is application server carrying assets with database access
 
 ## Copyright
 
-Copyright (c) 2008-2014 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2008-2015 Ivan Kuchin. See LICENSE.txt for details.

data/dump.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dump'
-  s.version     = '1.0.5'
+  s.version     = '1.0.6'
   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.authors     = ['Ivan Kuchin']
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_dependency 'archive-tar-minitar', '= 0.5.2'
-  s.add_dependency 'progress', '~> 2.4.0'
+  s.add_dependency 'progress', '~> 3.0', '>= 3.0.1'
   s.add_development_dependency 'rspec', '~> 3.0'
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
     s.add_development_dependency 'rubocop', '~> 0.27'

data/lib/dump.rb

@@ -1,4 +1,88 @@
-# Namespace for railtie
+# encoding: UTF-8
+
+require 'fileutils'
+
+require 'rake'
+require 'progress'
+
+require 'dump/rails_root'
+require 'dump/snapshot'
+require 'dump/reader'
+require 'dump/writer'
+require 'dump/env'
+
+require 'dump/railtie' if defined?(Rails::Railtie)
+
+# Main interface
 module Dump
-  require 'dump/railtie' if defined?(Rails)
+  class << self
+    def versions(options = {})
+      Snapshot.list(options).each do |dump|
+        if Dump::Env[:show_size] || $stdout.tty?
+          puts "#{dump.human_size.to_s.rjust(7)}\t#{dump}"
+        else
+          puts dump
+        end
+        begin
+          case options[:summary].to_s.downcase[0, 1]
+          when *%w[1 t y]
+            puts Reader.summary(dump.path)
+            puts
+          when *%w[2 s]
+            puts Reader.summary(dump.path, :schema => true)
+            puts
+          end
+        rescue => e
+          $stderr.puts "Error reading dump: #{e}"
+          $stderr.puts
+        end
+      end
+    end
+
+    def create(options = {})
+      dump = Snapshot.new(options.merge(:dir => File.join(rails_root, 'dump')))
+
+      Writer.create(dump.tmp_path)
+
+      File.rename(dump.tmp_path, dump.tgz_path)
+      puts File.basename(dump.tgz_path)
+    end
+
+    def restore(options = {})
+      dump = Snapshot.list(options).last
+
+      if dump
+        Reader.restore(dump.path)
+      else
+        $stderr.puts 'Avaliable versions:'
+        $stderr.puts Snapshot.list
+      end
+    end
+
+    def cleanup(options = {})
+      unless options[:leave].nil? || /^\d+$/ =~ options[:leave] || options[:leave].downcase == 'none'
+        fail 'LEAVE should be number or "none"'
+      end
+
+      to_delete = []
+
+      all_dumps = Snapshot.list(options.merge(:all => true))
+      to_delete.concat(all_dumps.select{ |dump| dump.ext != 'tgz' })
+
+      dumps = Snapshot.list(options)
+      leave = (options[:leave] || 5).to_i
+      to_delete.concat(dumps[0, dumps.length - leave]) if dumps.length > leave
+
+      to_delete.each do |dump|
+        dump.lock do
+          begin
+            dump.path.unlink
+            puts "Deleted #{dump.path}"
+          rescue => e
+            $stderr.puts "Can not delete #{dump.path} — #{e}"
+          end
+        end
+      end
+    end
+  end
 end

data/lib/{dump_rake → dump}/assets.rb

@@ -1,18 +1,20 @@
 # encoding: UTF-8
 
-class DumpRake
+require 'dump'
+
+module Dump
   # Helper for listing assets for dump
   module Assets
     SPLITTER = /[:,]/
 
     class << self
       def assets
-        File.readlines(File.join(DumpRake::RailsRoot, 'config/assets')).map(&:strip).grep(/^[^#]/).join(':')
+        File.readlines(File.join(Dump.rails_root, 'config/assets')).map(&:strip).grep(/^[^#]/).join(':')
       end
 
       def glob_asset_children(asset, glob)
-        path = File.expand_path(asset, DumpRake::RailsRoot)
-        if path[0, DumpRake::RailsRoot.length] == DumpRake::RailsRoot # asset must be in rails root
+        path = File.expand_path(asset, Dump.rails_root)
+        if path[0, Dump.rails_root.length] == Dump.rails_root # asset must be in rails root
           Dir[File.join(path, glob)]
         else
           []

data/lib/dump/capistrano/v2.rb

@@ -3,8 +3,8 @@
 require 'fileutils'
 require 'shellwords'
 
-require 'dump_rake/continious_timeout'
-require 'dump_rake/env'
+require 'dump/continious_timeout'
+require 'dump/env'
 
 require 'active_support/core_ext/object/blank'
 
@@ -16,9 +16,9 @@ Capistrano::Configuration.instance(:i_need_this!).load do
       rake = env.delete(:rake) || 'rake'
 
       # stringify_keys! from activesupport
-      DumpRake::Env.stringify!(env)
+      Dump::Env.stringify!(env)
 
-      env.update(DumpRake::Env.for_command(command, true))
+      env.update(Dump::Env.for_command(command, true))
 
       cmd = %W[-s dump:#{command}]
       cmd += env.sort.map{ |key, value| "#{key}=#{value}" }
@@ -70,7 +70,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
           end
         end
       when :sftp, :scp
-        DumpRake::ContiniousTimeout.timeout 15 do |thread|
+        Dump::ContiniousTimeout.timeout 15 do |thread|
           transfer(direction, from, to, :via => via) do |_channel, _path, transfered, total|
             thread.defer
             progress = if transfered < total
@@ -87,7 +87,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     def do_transfer(direction, from, to)
-      via = DumpRake::Env[:transfer_via]
+      via = Dump::Env[:transfer_via]
       case via && via.downcase
       when nil
         if got_rsync?
@@ -113,8 +113,8 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     def with_additional_tags(*tags)
-      tags = [tags, DumpRake::Env[:tags]].flatten.select(&:present?).join(',')
-      DumpRake::Env.with_env(:tags => tags) do
+      tags = [tags, Dump::Env[:tags]].flatten.select(&:present?).join(',')
+      Dump::Env.with_env(:tags => tags) do
         yield
       end
     end
@@ -153,16 +153,16 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     def auto_backup?
-      !DumpRake::Env.no?(:backup)
+      !Dump::Env.no?(:backup)
     end
 
     namespace :local do
-      desc 'Shorthand for dump:local:create' << DumpRake::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' << DumpRake::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
@@ -171,24 +171,24 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Restore local dump' << DumpRake::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' << DumpRake::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' << DumpRake::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' << DumpRake::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 = DumpRake::Env.with_env(:summary => nil) do
+        file = Dump::Env.with_env(:summary => nil) do
           last_part_of_last_line(run_local(dump_command(:versions)))
         end
         if file
@@ -198,12 +198,12 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     namespace :remote do
-      desc 'Shorthand for dump:remote:create' << DumpRake::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' << DumpRake::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
@@ -212,24 +212,24 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Restore remote dump' << DumpRake::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' << DumpRake::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' << DumpRake::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' << DumpRake::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 = DumpRake::Env.with_env(:summary => nil) 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 => '+')}"))
         end
         if file
@@ -239,18 +239,18 @@ Capistrano::Configuration.instance(:i_need_this!).load do
       end
     end
 
-    desc 'Shorthand for dump:local:upload' << DumpRake::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' << DumpRake::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' << DumpRake::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
@@ -262,7 +262,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
             local.create
           end
           if file.present?
-            DumpRake::Env.with_clean_env(:like => file) do
+            Dump::Env.with_clean_env(:like => file) do
               local.upload
               remote.restore
             end
@@ -270,7 +270,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
         end
       end
 
-      desc 'Creates remote dump, downloads and restores on local' << DumpRake::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
@@ -282,7 +282,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
             remote.create
           end
           if file.present?
-            DumpRake::Env.with_clean_env(:like => file) do
+            Dump::Env.with_clean_env(:like => file) do
               remote.download
               local.restore
             end
@@ -292,30 +292,30 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     end
 
     namespace :backup do
-      desc 'Shorthand for dump:backup:create' << DumpRake::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')" << DumpRake::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
         end
         if file.present?
-          DumpRake::Env.with_clean_env(:like => file) do
+          Dump::Env.with_clean_env(:like => file) do
             remote.download
           end
         end
       end
 
-      desc 'Uploads dump with backup tag and restores it on remote' << DumpRake::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)))
         end
         if file.present?
-          DumpRake::Env.with_clean_env(:like => file) do
+          Dump::Env.with_clean_env(:like => file) do
             local.upload
             remote.restore
           end

data/lib/{dump_rake → dump}/continious_timeout.rb

@@ -1,6 +1,6 @@
 # based on Timeout
 
-class DumpRake
+module Dump
   # Timeout if does not finish or defer in requested time
   module ContiniousTimeout
     class TimeoutException < ::Exception; end

data/lib/{dump_rake → dump}/env.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-require 'dump_rake/env/filter'
+require 'dump/env/filter'
 
-class DumpRake
+module Dump
   # Working with environment variables
   module Env
     DICTIONARY = {
@@ -20,7 +20,7 @@ class DumpRake
       :restore_tables => %w[RESTORE_TABLES],
       :restore_assets => %w[RESTORE_ASSETS],
       :show_size => %w[SHOW_SIZE], # internal
-    }.freeze unless defined? DICTIONARY
+    }.freeze
 
     EXPLANATIONS = {
       :desc => 'free form description of dump',
@@ -36,7 +36,7 @@ class DumpRake
       :restore_schema => 'don\'t read/change schema if you pass "0", "no" or "false" (useful to just restore data for table; note that schema info tables are also not restored)',
       :restore_tables => 'works as TABLES, but for restoring',
       :restore_assets => 'works as ASSETS, but for restoring',
-    }.freeze unless defined? EXPLANATIONS
+    }.freeze
 
     class << self
       def with_env(hash)