dump 1.2.1 → 1.3.0

data/lib/dump/continious_timeout.rb

@@ -23,12 +23,10 @@ module Dump
     def self.timeout(sec)
       x = Thread.current
       y = Thread.start do
-        1.times do
-          begin
-            sleep sec
-          rescue RestartException
-            retry
-          end
+        begin
+          sleep sec
+        rescue RestartException
+          retry
         end
         x.raise TimeoutException, 'execution expired' if x.alive?
       end

data/lib/dump/env/filter.rb

@@ -8,6 +8,7 @@ module Dump
     #   '-a,b,c' will pass everything except 'a', 'b' and 'c'
     class Filter
       attr_reader :invert, :values, :transparent
+
       def initialize(string, splitter = nil)
         if string
           string = string.dup

data/lib/dump/env.rb

@@ -44,7 +44,7 @@ module Dump
         old = {}
         hash.each do |key, value|
           key = DICTIONARY[key].first if DICTIONARY[key]
-          old[key] = ENV[key]
+          old[key] = ENV.fetch(key, nil)
           ENV[key] = value
         end
         begin
@@ -58,7 +58,7 @@ module Dump
 
       def with_clean_env(hash = {}, &block)
         empty_env = {}
-        DICTIONARY.keys.each{ |key| empty_env[key] = nil }
+        DICTIONARY.each_key{ |key| empty_env[key] = nil }
         with_env(empty_env.merge(hash), &block)
       end
 
@@ -66,7 +66,7 @@ module Dump
         if DICTIONARY[key]
           ENV.values_at(*DICTIONARY[key]).compact.first
         else
-          ENV[key]
+          ENV.fetch(key, nil)
         end
       end
 
@@ -126,10 +126,10 @@ module Dump
       end
 
       def explain_variables_for_command(command)
-        ".\n" +
-          variable_names_for_command(command).map do |variable_name|
-            "  #{DICTIONARY[variable_name].join(', ')} — #{EXPLANATIONS[variable_name]}\n"
-          end.join('')
+        lines = variable_names_for_command(command).map do |variable_name|
+          "  #{DICTIONARY[variable_name].join(', ')} — #{EXPLANATIONS[variable_name]}\n"
+        end
+        ".\n#{lines.join('')}"
       end
 
     private

data/lib/dump/reader.rb

@@ -89,11 +89,9 @@ module Dump
     end
 
     def open
-      Zlib::GzipReader.open(path) do |gzip|
-        Archive::Tar::Minitar.open(gzip, 'r') do |stream|
-          @stream = stream
-          yield(self)
-        end
+      Archive::Tar::Minitar.open(Zlib::GzipReader.open(path), 'r') do |stream|
+        @stream = stream
+        yield(self)
       end
     end
 

data/lib/dump/snapshot.rb

@@ -9,14 +9,15 @@ module Dump
   # Base class for dump
   class Snapshot
     include TableManipulation
+
     def self.list(options = {})
       dumps = Dir[File.join(Dump.rails_root, 'dump', options[:all] ? '*.*' : '*.tgz')].sort.select{ |path| File.file?(path) }.map{ |path| new(path) }
       dumps = dumps.select{ |dump| dump.name[options[:like]] } if options[:like]
       if options[:tags]
         tags = get_filter_tags(options[:tags])
-        dumps = dumps.select{ |dump| (dump.tags & tags[:simple]).present? } if tags[:simple].present?
-        dumps = dumps.select{ |dump| (dump.tags & tags[:mandatory]) == tags[:mandatory] } if tags[:mandatory].present?
-        dumps = dumps.reject{ |dump| (dump.tags & tags[:forbidden]).present? } if tags[:forbidden].present?
+        dumps = dumps.select{ |dump| tags[:any].intersect?(dump.tags.to_set) } if tags[:any].present?
+        dumps = dumps.select{ |dump| tags[:all].subset?(dump.tags.to_set) } if tags[:all].present?
+        dumps = dumps.reject{ |dump| tags[:none].intersect?(dump.tags.to_set) } if tags[:none].present?
       end
       dumps
     end
@@ -57,17 +58,15 @@ module Dump
     end
 
     def parts
-      @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
+      @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
+        {}
       end
     end
 
@@ -92,7 +91,7 @@ module Dump
     end
     alias_method :to_s, :name
 
-    def size
+    def size # rubocop:disable Naming/PredicateMethod
       File.size?(path)
     end
 
@@ -114,14 +113,8 @@ module Dump
     end
 
     def lock
-      lock = File.open(path, 'r')
-      begin
-        if lock.flock(File::LOCK_EX | File::LOCK_NB)
-          yield
-        end
-      ensure
-        lock.flock(File::LOCK_UN)
-        lock.close
+      File.open(path, 'r') do |lock|
+        yield if lock.flock(File::LOCK_EX | File::LOCK_NB)
       end
     rescue Errno::ENOENT
       nil
@@ -162,7 +155,7 @@ module Dump
       end
 
       def clean_tag(tag)
-        clean_str(tag).downcase.sub(/^\-+/, '')[0, 20].strip
+        clean_str(tag).downcase.sub(/^-+/, '')[0, 20].strip
       end
 
       def clean_tags(tags)
@@ -170,21 +163,21 @@ module Dump
       end
 
       def get_filter_tags(tags)
-        groups = Hash.new{ |hash, key| hash[key] = SortedSet.new }
+        groups = Hash.new{ |hash, key| hash[key] = Set.new }
         tags.to_s.split(',').each do |tag|
-          next unless (m = tag.strip.match(/^(\-|\+)?(.*)$/))
+          next unless (m = tag.strip.match(/^(-|\+)?(.*)$/))
 
-          type = {'+' => :mandatory, '-' => :forbidden}[m[1]] || :simple
+          type = {'+' => :all, '-' => :none}[m[1]] || :any
           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 ArgumentError, "#{type} tags clashes with forbidden ones: #{clashing}"
+        [:any, :all].each do |type|
+          if (clashing = (groups[type] & groups[:none])).present?
+            fail ArgumentError, "#{type} tags clashes with none ones: #{clashing}"
           end
         end
-        groups.each_with_object({}){ |(key, value), hsh| hsh[key] = value.to_a }
+        groups
       end
     end
     include CleanNParse

data/lib/dump/table_manipulation.rb

@@ -5,7 +5,7 @@ require 'dump/env'
 module Dump
   # Methods to work with db using ActiveRecord
   module TableManipulation
-  protected # rubocop:disable Layout/IndentationWidth
+  protected
 
     def schema_tables
       %w[schema_info schema_migrations]
@@ -153,14 +153,14 @@ module Dump
         "#{quote_table_name(table)}.#{quote_column_name(primary_key)}"
       case connection.adapter_name.downcase
       when 'sqlserver'
-        "SELECT TOP #{chunk_size} * FROM #{quote_table_name(table)}" \
-          " WHERE #{quoted_primary_key} %s" \
-          " ORDER BY #{quoted_primary_key} ASC"
+        "SELECT TOP #{chunk_size} * FROM #{quote_table_name(table)} " \
+        "WHERE #{quoted_primary_key} %s " \
+        "ORDER BY #{quoted_primary_key} ASC"
       else
-        "SELECT * FROM #{quote_table_name(table)}" \
-          " WHERE #{quoted_primary_key} %s" \
-          " ORDER BY #{quoted_primary_key} ASC" \
-          " LIMIT #{chunk_size}"
+        "SELECT * FROM #{quote_table_name(table)} " \
+        "WHERE #{quoted_primary_key} %s " \
+        "ORDER BY #{quoted_primary_key} ASC " \
+        "LIMIT #{chunk_size}"
       end
     end
   end

data/lib/dump/writer.rb

@@ -28,14 +28,13 @@ module Dump
 
     def open
       Pathname.new(path).dirname.mkpath
-      Zlib::GzipWriter.open(path) do |gzip|
-        gzip.mtime = Time.utc(2000)
-        lock do
-          Archive::Tar::Minitar.open(gzip, 'w') do |stream|
-            @stream = stream
-            @config = {:tables => {}}
-            yield(self)
-          end
+      gzip = Zlib::GzipWriter.open(path)
+      gzip.mtime = Time.utc(2000)
+      lock do
+        Archive::Tar::Minitar.open(gzip, 'w') do |stream|
+          @stream = stream
+          @config = {:tables => {}}
+          yield(self)
         end
       end
     end
@@ -68,32 +67,15 @@ module Dump
     def write_table(table)
       row_count = table_row_count(table)
       config[:tables][table] = row_count
-      Progress.start(table, 1 + row_count) do
+      Progress.start(table, row_count + 1) do
         create_file("#{table}.dump") do |f|
           columns = table_columns(table)
           column_names = columns.map(&:name).sort
-          columns_by_name = columns.index_by(&:name)
+          type_cast = type_caster(columns)
 
           Marshal.dump(column_names, f)
           Progress.step
 
-          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
-          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|
             values = column_names.map do |column_name|
               type_cast.call(column_name, row[column_name])
@@ -141,5 +123,36 @@ module Dump
     rescue
       []
     end
+
+  private
+
+    def type_caster(columns)
+      columns_by_name = columns.index_by(&:name)
+
+      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
+      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
+      when columns.first.respond_to?(:fetch_cast_type)
+        proc do |column_name, value|
+          columns_by_name[column_name].fetch_cast_type(connection).deserialize(value)
+        end
+      when columns.first.respond_to?(:cast_type)
+        proc do |column_name, value|
+          columns_by_name[column_name].cast_type.deserialize(value)
+        end
+      else
+        fail 'Failed to determine the way to convert values from database input to the appropriate ruby type'
+      end
+    end
   end
 end

data/lib/tasks/assets.rake

@@ -7,7 +7,7 @@ task :assets do
 end
 
 namespace :assets do
-  desc 'Delete assets' + Dump::Env.explain_variables_for_command(:assets)
+  desc "Delete assets#{Dump::Env.explain_variables_for_command(:assets)}"
   task :delete => :assets do
     ENV['ASSETS'].split(':').each do |asset|
       Dump::Assets.glob_asset_children(asset, '*').each do |child|

data/lib/tasks/dump.rake

@@ -2,26 +2,26 @@
 
 require 'dump'
 
-desc 'Short for dump:create' + Dump::Env.explain_variables_for_command(:create)
+desc "Short for dump:create#{Dump::Env.explain_variables_for_command(:create)}"
 task :dump => 'dump:create'
 
 namespace :dump do
-  desc 'Show avaliable versions' + Dump::Env.explain_variables_for_command(:versions)
+  desc "Show avaliable versions#{Dump::Env.explain_variables_for_command(:versions)}"
   task :versions => :environment do
     Dump.versions(Dump::Env.for_command(:versions))
   end
 
-  desc 'Create dump' + Dump::Env.explain_variables_for_command(:create)
+  desc "Create dump#{Dump::Env.explain_variables_for_command(:create)}"
   task :create => :environment do
     Dump.create(Dump::Env.for_command(:create))
   end
 
-  desc 'Restore dump' + Dump::Env.explain_variables_for_command(:restore)
+  desc "Restore dump#{Dump::Env.explain_variables_for_command(:restore)}"
   task :restore => :environment do
     Dump.restore(Dump::Env.for_command(:restore))
   end
 
-  desc 'Cleanup dumps' + Dump::Env.explain_variables_for_command(:cleanup)
+  desc "Cleanup dumps#{Dump::Env.explain_variables_for_command(:cleanup)}"
   task :cleanup => :environment do
     Dump.cleanup(Dump::Env.for_command(:cleanup))
   end

data/spec/.gitignore

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

data/spec/cycle_spec.rb

@@ -10,7 +10,7 @@ end
 ActiveRecord::Base.logger = Logger.new(File.join(Dump.rails_root, 'log/dump.log'))
 
 def database_configs
-  YAML.load(IO.read(File.expand_path('../db/database.yml', __FILE__)))
+  YAML.load_file(File.expand_path('../db/database.yml', __FILE__))
 end
 
 def adapters
@@ -24,7 +24,7 @@ def use_adapter(adapter)
     when /^mysql/
       ActiveRecord::Base.establish_connection(config.merge('database' => nil))
       ActiveRecord::Base.connection.drop_database config['database']
-      ActiveRecord::Base.connection.create_database(config['database'])
+      ActiveRecord::Base.connection.create_database(config['database'], :charset => 'utf8')
     when /^postgresql/
       ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
       ActiveRecord::Base.connection.drop_database config['database']
@@ -102,22 +102,18 @@ def reset_rake!
   Rake::Task.define_task('db:schema:dump') do
     File.open(schema_path, 'r') do |r|
       if ENV['SCHEMA']
-        File.open(ENV['SCHEMA'], 'w') do |w|
-          w.write(r.read)
-        end
+        File.write(ENV.fetch('SCHEMA', nil), r.read)
       end
     end
   end
   Rake::Task.define_task('db:schema:load') do
-    load(ENV['SCHEMA'])
+    load(ENV.fetch('SCHEMA', nil))
   end
 end
 
-def call_rake
+def call_rake(&block)
   reset_rake!
-  grab_output do
-    yield
-  end
+  grab_output(&block)
 end
 
 def call_rake_create(*args)
@@ -171,9 +167,7 @@ describe 'full cycle' do
           expect(chicken_data).to eq(saved_chicken_data)
         end
       end
-    end
 
-    adapters.each do |adapter|
       it "does not break id incrementing using #{adapter}" do
         use_adapter(adapter) do
           create_chickens!(:random => 100)
@@ -185,7 +179,7 @@ describe 'full cycle' do
       end
     end
 
-    adapters.combination(2) do |adapter_src, adapter_dst|
+    adapters.permutation(2) do |adapter_src, adapter_dst|
       it "dumps using #{adapter_src} and restores using #{adapter_dst}" do
         saved_chicken_data = nil
         use_adapter(adapter_src) do
@@ -213,16 +207,14 @@ describe 'full cycle' do
           dump_path = File.join(Dump.rails_root, 'dump', dump_name)
 
           data = []
-          Zlib::GzipReader.open(dump_path) do |gzip|
-            Archive::Tar::Minitar.open(gzip, 'r') do |stream|
-              stream.each do |entry|
-                entry_data = if entry.full_name == 'schema.rb'
-                  entry.read
-                else
-                  Marshal.load(entry.read)
-                end
-                data << [entry.full_name, entry_data]
+          Archive::Tar::Minitar.open(Zlib::GzipReader.open(dump_path), 'r') do |stream|
+            stream.each do |entry|
+              entry_data = if entry.full_name == 'schema.rb'
+                entry.read
+              else
+                Marshal.load(entry.read)
               end
+              data << [entry.full_name, entry_data]
             end
           end
           dumps << {:path => dump_path, :data => data.sort}

data/spec/dummy-2.3/config/initializers/abstract_mysql2_adapter.rb

@@ -0,0 +1,4 @@
+# https://stackoverflow.com/a/40758542/96823
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter::NATIVE_DATABASE_TYPES[:primary_key] = 'int(11) auto_increment PRIMARY KEY'

data/spec/dummy-3.1/config/initializers/abstract_mysql2_adapter.rb

@@ -0,0 +1,4 @@
+# https://stackoverflow.com/a/40758542/96823
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter::NATIVE_DATABASE_TYPES[:primary_key] = 'int(11) auto_increment PRIMARY KEY'

data/spec/dummy-3.2/config/initializers/abstract_mysql2_adapter.rb

@@ -0,0 +1,4 @@
+# https://stackoverflow.com/a/40758542/96823
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter::NATIVE_DATABASE_TYPES[:primary_key] = 'int(11) auto_increment PRIMARY KEY'

data/spec/dummy-4.0/config/initializers/abstract_mysql2_adapter.rb

@@ -0,0 +1,4 @@
+# https://stackoverflow.com/a/40758542/96823
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter::NATIVE_DATABASE_TYPES[:primary_key] = 'int(11) auto_increment PRIMARY KEY'

data/spec/dummy-4.1/config/initializers/abstract_mysql2_adapter.rb

@@ -0,0 +1,4 @@
+# https://stackoverflow.com/a/40758542/96823
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter::NATIVE_DATABASE_TYPES[:primary_key] = 'int(11) auto_increment PRIMARY KEY'

data/spec/dummy-4.2/config/initializers/abstract_mysql2_adapter.rb

@@ -0,0 +1,4 @@
+# https://stackoverflow.com/a/40758542/96823
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter::NATIVE_DATABASE_TYPES[:primary_key] = 'int(11) auto_increment PRIMARY KEY'

data/spec/dummy-6.0/.gitignore

@@ -0,0 +1,28 @@
+# 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 uploaded files in development.
+/storage/*
+!/storage/.keep
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key

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

@@ -0,0 +1,35 @@
+require_relative 'boot'
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_mailbox/engine"
+require "action_text/engine"
+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 Dummy60
+  class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 6.0
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+
+    # Don't generate system test files.
+    config.generators.system_tests = nil
+  end
+end

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

@@ -0,0 +1,5 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+
+require 'logger' # fix rails relying on concurrent-ruby < 1.3.5 to require logger?

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

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: dummy_6_0_production

data/spec/{dummy-3.0 → dummy-6.0}/config/database.yml

@@ -1,22 +1,25 @@
-# SQLite version 3.x
+# SQLite. Versions 3.8.0 and up are supported.
 #   gem install sqlite3
-development:
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
   adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 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:
-  adapter: sqlite3
+  <<: *default
   database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
 production:
-  adapter: sqlite3
+  <<: *default
   database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

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

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