dump 1.1.0 → 1.2.0

data/dump.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dump'
-  s.version     = '1.1.0'
+  s.version     = '1.2.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.authors     = ['Ivan Kuchin']
@@ -10,15 +10,22 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = s.name
 
+  s.metadata = {
+    'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   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 'progress', '~> 3.0', '>= 3.0.1'
+  s.add_dependency 'progress', '~> 3.0', '>= 3.0.1', '!= 3.2.0', '!= 3.2.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'
+  if RUBY_VERSION >= '2.2'
+    s.add_development_dependency 'rubocop', '~> 0.59'
   end
 end

data/lib/dump.rb

@@ -61,13 +61,13 @@ module Dump
 
     def cleanup(options = {})
       unless options[:leave].nil? || /^\d+$/ =~ options[:leave] || options[:leave].downcase == 'none'
-        fail 'LEAVE should be number or "none"'
+        fail ArgumentError, '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' })
+      to_delete.concat(all_dumps.reject{ |dump| dump.ext == 'tgz' })
 
       dumps = Snapshot.list(options)
       leave = (options[:leave] || 5).to_i

data/lib/dump/archive_tar_minitar.rb

@@ -3,6 +3,7 @@ require 'archive/tar/minitar'
 Archive::Tar::Minitar::Reader::EntryStream.class_eval do
   def getbyte
     return nil if @read >= @size
+
     ret = @io.getbyte
     @read += 1 if ret
     ret

data/lib/dump/assets.rb

@@ -5,7 +5,7 @@ require 'dump'
 module Dump
   # Helper for listing assets for dump
   module Assets
-    SPLITTER = /[:,]/
+    SPLITTER = /[:,]/.freeze
 
     class << self
       def assets

data/lib/dump/capistrano.rb

@@ -1,7 +1,7 @@
 require 'capistrano/version'
 
-if defined?(Capistrano::Version) && Capistrano::Version::MAJOR == 2
-  require 'dump/capistrano/v2'
-else
+unless defined?(Capistrano::Version) && Capistrano::Version::MAJOR == 2
   fail 'Capistrano 3 is not yet supported'
 end
+
+require 'dump/capistrano/v2'

data/lib/dump/capistrano/v2.rb

@@ -122,6 +122,7 @@ Capistrano::Configuration.instance(:i_need_this!).load do
     def print_and_return_or_fail
       out = yield
       fail 'Failed creating dump' if out.blank?
+
       print out
       out.strip
     end

data/lib/dump/continious_timeout.rb

@@ -3,9 +3,9 @@
 module Dump
   # Timeout if does not finish or defer in requested time
   module ContiniousTimeout
-    class TimeoutException < ::Exception; end
+    class TimeoutException < RuntimeError; end
 
-    class RestartException < ::Exception; end
+    class RestartException < RuntimeError; end
 
     # Object with defer method
     class Deferer

data/lib/dump/env/filter.rb

@@ -7,11 +7,11 @@ module Dump
     #   '-a,b,c' will pass everything except 'a', 'b' and 'c'
     class Filter
       attr_reader :invert, :values, :transparent
-      def initialize(s, splitter = nil)
-        if s
-          s = s.dup
-          @invert = !!s.sub!(/^-/, '')
-          @values = s.split(splitter || ',').map(&:strip).map(&:downcase).uniq.select(&:present?)
+      def initialize(string, splitter = nil)
+        if string
+          string = string.dup
+          @invert = !!string.sub!(/^-/, '')
+          @values = string.split(splitter || ',').map(&:strip).map(&:downcase).uniq.select(&:present?)
         else
           @transparent = true
         end

data/lib/dump/reader.rb

@@ -131,6 +131,7 @@ module Dump
         Rake::Task['db:create'].invoke
       when !Dump::Env.no?(:migrate_down)
         return unless avaliable_tables.include?('schema_migrations')
+
         find_entry('schema_migrations.dump') do |entry|
           migrated = table_rows('schema_migrations').map{ |row| row['version'] }
 
@@ -164,6 +165,7 @@ module Dump
 
     def read_schema
       return unless restore_schema?
+
       read_entry_to_file('schema.rb') do |f|
         Dump::Env.with_env('SCHEMA' => f.path) do
           Rake::Task['db:schema:load'].invoke
@@ -178,6 +180,7 @@ module Dump
 
     def read_tables
       return if Dump::Env[:restore_tables] && Dump::Env[:restore_tables].empty?
+
       verify_connection
       config[:tables].with_progress('Tables') do |table, rows|
         if (restore_schema? && schema_tables.include?(table)) || Dump::Env.filter(:restore_tables).pass?(table)
@@ -229,8 +232,9 @@ module Dump
 
       if Dump::Env[:restore_assets]
         assets_paths.each do |asset|
-          Dump::Assets.glob_asset_children(asset, '**/*').reverse.each do |child|
+          Dump::Assets.glob_asset_children(asset, '**/*').reverse_each do |child|
             next unless read_asset?(child, Dump.rails_root)
+
             case
             when File.file?(child)
               File.unlink(child)

data/lib/dump/snapshot.rb

@@ -56,16 +56,17 @@ module Dump
     end
 
     def parts
-      @parts ||=
-      if (m = name.match(/^(\d{#{4 + 2 + 2 + 2 + 2 + 2}})(-[^@]+)?((?:@[^@]+)+)?\.(tmp|tgz)$/))
-        {
-          :time => m[1],
-          :desc => m[2] && m[2][1, m[2].length],
-          :tags => m[3] && m[3][1, m[3].length],
-          :ext => m[4],
-        }
-      else
-        {}
+      @parts ||= begin
+        if (m = name.match(/^(\d{#{4 + 2 + 2 + 2 + 2 + 2}})(-[^@]+)?((?:@[^@]+)+)?\.(tmp|tgz)$/))
+          {
+            :time => m[1],
+            :desc => m[2] && m[2][1, m[2].length],
+            :tags => m[3] && m[3][1, m[3].length],
+            :ext => m[4],
+          }
+        else
+          {}
+        end
       end
     end
 
@@ -91,12 +92,13 @@ module Dump
     alias_method :to_s, :name
 
     def size
-      File.size(path) rescue nil
+      File.size?(path)
     end
 
     def human_size
       number = size
       return nil if number.nil?
+
       degree = 0
       symbols = %w[B K M G T]
       while number >= 1000 && degree < symbols.length - 1
@@ -170,13 +172,15 @@ module Dump
         groups = Hash.new{ |hash, key| hash[key] = SortedSet.new }
         tags.to_s.split(',').each do |tag|
           next unless (m = tag.strip.match(/^(\-|\+)?(.*)$/))
+
           type = {'+' => :mandatory, '-' => :forbidden}[m[1]] || :simple
           next unless (cleaned_tag = clean_tag(m[2])).present?
+
           groups[type] << cleaned_tag
         end
         [:simple, :mandatory].each do |type|
           if (clashing = (groups[type] & groups[:forbidden])).present?
-            fail "#{type} tags clashes with forbidden ones: #{clashing}"
+            fail ArgumentError, "#{type} tags clashes with forbidden ones: #{clashing}"
           end
         end
         groups.each_with_object({}){ |(key, value), hsh| hsh[key] = value.to_a }

data/lib/dump/table_manipulation.rb

@@ -10,7 +10,11 @@ module Dump
     end
 
     def verify_connection
-      connection.verify!(0)
+      if connection.method(:verify!).arity == 1
+        connection.verify!(0)
+      else
+        connection.verify!
+      end
     end
 
     def quote_table_name(table)
@@ -37,6 +41,7 @@ module Dump
 
     def fix_sequence!(table)
       return unless connection.respond_to?(:reset_pk_sequence!)
+
       connection.reset_pk_sequence!(table)
     end
 
@@ -118,6 +123,7 @@ module Dump
         until rows.blank?
           rows.each(&block)
           break if rows.count < chunk_size
+
           sql = select_where_primary_key % "> #{rows.last[primary_key].to_i}"
           rows = select_all_by_sql(sql)
         end

data/lib/dump/writer.rb

@@ -42,7 +42,7 @@ module Dump
       Tempfile.open('dump') do |temp|
         yield(temp)
         temp.open
-        stream.tar.add_file_simple(name, :mode => 0100444, :size => temp.length) do |f|
+        stream.tar.add_file_simple(name, :mode => 0o100444, :size => temp.length) do |f|
           f.write(temp.read(4096)) until temp.eof?
         end
       end
@@ -75,14 +75,21 @@ module Dump
           Marshal.dump(column_names, f)
           Progress.step
 
-          type_cast = if columns.first.respond_to?(:type_cast_from_database)
+          type_cast = case
+          when columns.first.respond_to?(:type_cast_from_database)
             proc do |column_name, value|
               columns_by_name[column_name].type_cast_from_database(value)
             end
-          else
+          when columns.first.respond_to?(:type_cast)
             proc do |column_name, value|
               columns_by_name[column_name].type_cast(value)
             end
+          when connection.respond_to?(:lookup_cast_type_from_column)
+            proc do |column_name, value|
+              connection.lookup_cast_type_from_column(columns_by_name[column_name]).deserialize(value)
+            end
+          else
+            fail 'Failed to determine the way to convert values from database input to the appropriate ruby type'
           end
 
           each_table_row(table, row_count) do |row|

data/script/update_readme

@@ -11,7 +11,7 @@ lines = readme.readlines.map(&:rstrip)
 readme.open('w') do |f|
   lines.each do |line|
     line.sub!(/^`(.+?)`.*—.*$/) do
-      key, names = Dump::Env::DICTIONARY.find{ |_key, values| values.include?(Regexp.last_match[1])  }
+      key, names = Dump::Env::DICTIONARY.find{ |_key, values| values.include?(Regexp.last_match[1]) }
       if key
         names = names.map{ |name| "`#{name}`" }.join(', ')
         explanation = Dump::Env::EXPLANATIONS[key]

data/spec/.gitignore

@@ -1,6 +1,8 @@
 /db/database.yml
 
 /dummy-*/.bundle/
+/dummy-*/.ruby-version
+/dummy-*/config/credentials.yml.enc
 /dummy-*/db/*.sqlite3
 /dummy-*/db/*.sqlite3-journal
 /dummy-*/log/*.log

data/spec/cycle_spec.rb

@@ -23,15 +23,12 @@ def use_adapter(adapter)
       ActiveRecord::Base.establish_connection(config.merge('database' => nil))
       ActiveRecord::Base.connection.drop_database config['database']
       ActiveRecord::Base.connection.create_database(config['database'])
-      ActiveRecord::Base.establish_connection(config)
     when /^postgresql/
       ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
       ActiveRecord::Base.connection.drop_database config['database']
       ActiveRecord::Base.connection.create_database(config['database'])
-      ActiveRecord::Base.establish_connection(config)
-    else
-      ActiveRecord::Base.establish_connection(config)
     end
+    ActiveRecord::Base.establish_connection(config)
     load_schema
     yield
   ensure

data/spec/db/schema.rb

@@ -6,7 +6,7 @@ ActiveRecord::Schema.define(:version => 0) do
   end
 
   create_table :another_chickens, :force => true do |t|
-    %w[string text decimal datetime timestamp date ].each do |type|
+    %w[string text decimal datetime timestamp date].each do |type|
       t.column "#{type}_col", type
     end
   end

data/spec/dummy-5.0/.gitignore

@@ -0,0 +1,21 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history

data/spec/dummy-5.0/config.ru

@@ -0,0 +1,5 @@
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application

data/spec/dummy-5.0/config/application.rb

@@ -0,0 +1,25 @@
+require_relative 'boot'
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "action_cable/engine"
+# require "sprockets/railtie"
+# require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Dummy50
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+  end
+end

data/spec/dummy-5.0/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/dummy-5.0/config/cable.yml

@@ -0,0 +1,9 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1

data/spec/dummy-5.0/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3

data/spec/dummy-5.0/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy-5.0/config/environments/development.rb

@@ -0,0 +1,47 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => 'public, max-age=172800'
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+end