squasher 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf0d8f8b39a17c546b7c41e4b1a1fd0270e48a41
-  data.tar.gz: ef9dbd8730c1b69ba92239aee084dcfd5f29638c
+SHA256:
+  metadata.gz: 1c3cc21150f68603733fa84c85d9a50c6d9b08ea34f7c5724341c3b116db2274
+  data.tar.gz: 13d90d21f1d5770b31ed3d334535e94334e1939cb78ca48d61482aa4d312a65c
 SHA512:
-  metadata.gz: ada8df65280932e7ea471d16036ec085eb0f1f5c8e608584cb9230f753347d8375c1fa4abcdaa7358f196781c65e2147157abece5005884f528979f053924199
-  data.tar.gz: ef96d4e8bd32439cf2502af47a0ef457f2d2ea2d08a46117b44a158de8732e1232e8e15499b785fa377e37ba32f778c33f974950b2a0fb52f85175ecdf1b43e3
+  metadata.gz: 49013a339324ae6f10fcc30e39c140d989b7fa9a7a208442f46ba70cea1be57792c990972fd9cd9448b33d35b8cbd17a37945276d7472e9c5da86d1868ceed8b
+  data.tar.gz: 14727bb5d71d889d728fee2458479d50a5a1a4a000b4e8b7eabe6cdfca1a672251f6cfd026ad8e52666d2fe066cf80e8ba567274df697927e0847ec090e74548

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+- 0.7.0
+  - Support the presence of multiverse ([@mlohbihler](https://github.com/mlohbihler))
 - 0.6.1
   - Escape regexp in sql mode ([@mpospelov](https://github.com/mpospelov))
 - 0.6.0

data/README.md

@@ -6,6 +6,9 @@
 
 Squasher compresses old ActiveRecord migrations. If you work on a big project with lots of migrations, every `rake db:migrate` might take a few seconds, or creating of a new database might take a few minutes. That's because ActiveRecord loads all those migration files. Squasher removes all the migrations and creates a single migration with the final database state of the specified date (the new migration will look like a schema).
 
+## Attention
+Prior to 0.6.2 squasher could damage your real data as generate "force" tables. Please upgrade to 0.6.2+ & manually clean "force" tag from the init migration
+
 ## Installation
 
 You don't have to add it into your Gemfile. Just a standalone installation:

data/bin/squasher

@@ -32,6 +32,10 @@ parser = OptionParser.new do |config|
     options[:engine] = value
   end
 
+  config.on('--databases=DB_KEY,...', 'alternate database configuration keys to be included dbconfig (for multiverse)') do |value|
+    options[:databases] = value&.split(",")
+  end
+
   config.on('-v', '--version', '-h', '--help', 'show this message')
 end
 parser.parse!

data/lib/squasher/cleaner.rb

@@ -36,7 +36,7 @@ module Squasher
     end
 
     def now_timestamp
-      Time.now.strftime("%Y%m%d%H%M%S")
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
     end
   end
 end

data/lib/squasher/config.rb

@@ -39,6 +39,7 @@ module Squasher
       @root_path = Dir.pwd.freeze
       @migrations_folder = File.join(@root_path, 'db', 'migrate')
       @flags = []
+      @databases = []
       set_app_path(@root_path)
     end
 
@@ -60,6 +61,8 @@ module Squasher
       elsif key == :sql
         @schema_file = File.join(@app_path, 'db', 'structure.sql')
         @flags << key
+      elsif key == :databases
+        @databases = value
       else
         @flags << key
       end
@@ -78,7 +81,7 @@ module Squasher
     end
 
     def migrations_folder?
-      Dir.exists?(migrations_folder)
+      Dir.exist?(migrations_folder)
     end
 
     def dbconfig?
@@ -90,7 +93,7 @@ module Squasher
 
       list = [dbconfig_file, schema_file]
       list.each do |file|
-        next unless File.exists?(file)
+        next unless File.exist?(file)
         FileUtils.mv file, "#{ file }.sq"
       end
 
@@ -100,7 +103,7 @@ module Squasher
 
     ensure
       list.each do |file|
-        next unless File.exists?("#{ file }.sq")
+        next unless File.exist?("#{ file }.sq")
         FileUtils.mv "#{ file }.sq", file
       end
     end
@@ -115,7 +118,7 @@ module Squasher
 
     def dbconfig
       return @dbconfig if defined?(@dbconfig)
-      return @dbconfig = nil unless File.exists?(dbconfig_file)
+      return @dbconfig = nil unless File.exist?(dbconfig_file)
 
       @dbconfig = nil
 
@@ -123,6 +126,7 @@ module Squasher
         content, soft_error = Render.process(dbconfig_file)
         if content.has_key?('development')
           @dbconfig = { 'development' => content['development'].merge('database' => 'squasher') }
+          @databases&.each { |database| @dbconfig[database] = content[database] }
         end
       rescue
       end

data/lib/squasher/version.rb

@@ -1,3 +1,3 @@
 module Squasher
-  VERSION = "0.6.2"
+  VERSION = "0.7.1"
 end

data/lib/squasher.rb

@@ -46,7 +46,7 @@ module Squasher
   end
 
   def print(message, options = {})
-    puts message % options
+    puts options.empty? ? message : message % options
   end
 
   def error(*args)

data/spec/fake_app/config/database.yml

@@ -16,3 +16,7 @@ another_test:
   database: another_test
   user: root
   password: password
+multiverse-database:
+  database: multiverse-database
+  user: multiverse-user
+  password: multiverse-password

data/spec/lib/cleaner_spec.rb

@@ -5,7 +5,7 @@ describe Squasher::Cleaner do
   let(:expected_file) { File.join(fake_root, 'db', 'migrate', '20140102030405_squasher_clean.rb') }
 
   before do
-    allow(Time).to receive(:now).and_return(Time.new(2014, 1, 2, 3, 4, 5))
+    allow(Time).to receive(:now).and_return(Time.utc(2014, 1, 2, 3, 4, 5))
     allow(Squasher).to receive(:rake).with("db:migrate", :db_cleaning)
   end
 

data/spec/lib/config_spec.rb

@@ -49,8 +49,22 @@ describe Squasher::Config do
       end
     end
 
+    it 'includes other database definitions provided in the command line' do
+      config.set(:databases, ["multiverse-database"])
+      config.stub_dbconfig do
+        File.open(File.join(fake_root, 'config', 'database.yml')) do |stream|
+          content = YAML.load(stream.read)
+          expect(content["development"]["database"]).to eq("squasher")
+          expect(content["development"]["encoding"]).to eq("utf-8")
+          expect(content["multiverse-database"]["database"]).to eq("multiverse-database")
+          expect(content["multiverse-database"]["user"]).to eq("multiverse-user")
+          expect(content).not_to have_key("another_development")
+        end
+      end
+    end
+
     def file_exists?(*parts)
-      File.exists?(File.join(fake_root, *parts))
+      File.exist?(File.join(fake_root, *parts))
     end
   end
 

data/spec/lib/squasher_spec.rb

@@ -46,4 +46,12 @@ describe Squasher do
       Squasher.rake('db:migrate')
     end
   end
+
+  context '.print' do
+    context 'when options are empty' do
+      it 'prints the message without error' do
+        Squasher.print('asdf % asdf', {})
+      end
+    end
+  end
 end

data/spec/lib/worker_spec.rb

@@ -42,7 +42,7 @@ describe Squasher::Worker do
 
     worker.process
 
-    expect(File.exists?(new_migration_path)).to be_truthy
+    expect(File.exist?(new_migration_path)).to be_truthy
     File.open(new_migration_path) do |stream|
       content = stream.read
       expect(content).to include("InitSchema")
@@ -69,7 +69,7 @@ describe Squasher::Worker do
       expect(Squasher).to receive(:ask).with(:apply_clean).and_return(false)
       worker.process
 
-      expect(File.exists?(new_migration_path)).to be_truthy
+      expect(File.exist?(new_migration_path)).to be_truthy
       File.open(new_migration_path) do |stream|
         content = stream.read
         expect(content.strip).to eq(%q{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Sergey Pchelintsev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ homepage: https://github.com/jalkoby/squasher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Squash your old migrations
 test_files: