squasher 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58e6842c01fedd8c3d14952de14c3cdfe58dcbeb
-  data.tar.gz: c2ec95df798554cc3af0d238ffd5178cf980e789
+SHA256:
+  metadata.gz: b1881315f750432477c45c63915b6118af4f165ba9c00fcf2b253d34d14bf49d
+  data.tar.gz: 22a3270dafb3aafae0b4eabe0720cb069a2aef9718f30150953295bdcd36084b
 SHA512:
-  metadata.gz: 63bd6a06a4b0e3c241d097ce3b96d84d908f3d0ee5ca84aaa8a06139b6b81864b4bb167f8aca9a8134707da98e9bb6ee8cc27d8c8b30be9225192764ae38fb78
-  data.tar.gz: b398fc389ccb9b873e11f75ce94512ae7678c1d94ac47d2bae63ae0415e3d2b3075403eee9cafcb987757d2669f83c95677aeef9278d242e68c6bc4aafd0da4e
+  metadata.gz: 54a095db328fdbf39dac24d7d509271a14e7765d313b36fccdfefc43d6a20d5eb36659884ed90b6fec0fcc901f10182c8ded4bb33bcc37835674107e28a81a93
+  data.tar.gz: 722b7b612648974304e842405b980f628d2939aa8816d918fda4bc0c2ea27209e9ed5dab769d909bbfcc9f825cdae276527c9db90593a33bc742715daca57229

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
@@ -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/render.rb

@@ -49,13 +49,17 @@ module Squasher
     def stream_schema(stream)
       inside_schema = false
 
-      stream.each_line do |line|
+      stream.each_line do |raw_line|
         if inside_schema
           # reach the end of schema
-          break if line.index("end") == 0
-          yield line.gsub(/\A\s{,2}(.*)\s+\z/, '\1')
+          break if raw_line.index("end") == 0
+          line = raw_line.gsub(/\A\s{,2}(.*)\s+\z/, '\1')
+          if line.include?('create_table')
+            line.gsub!(/(create_table.*),.* do/, '\1 do')
+          end
+          yield line
         else
-          inside_schema = true if line.include?("ActiveRecord::Schema")
+          inside_schema = true if raw_line.include?("ActiveRecord::Schema")
         end
       end
     end

data/lib/squasher/version.rb

@@ -1,3 +1,3 @@
 module Squasher
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 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,6 +49,20 @@ 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))
     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

@@ -46,7 +46,7 @@ describe Squasher::Worker do
     File.open(new_migration_path) do |stream|
       content = stream.read
       expect(content).to include("InitSchema")
-      expect(content).to include('create_table "managers", :force => true do |t|')
+      expect(content).to include('create_table "managers" do |t|')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Sergey Pchelintsev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2022-11-15 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: