squasher 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60335f7e6ad04a4db267dd1ad99152aa02d79242
-  data.tar.gz: 4c17e356d84255ae3177094facf40904845e8223
+  metadata.gz: 3d724bebcea027694c4fd7ae07faefc4e640cd9d
+  data.tar.gz: d7b96e31bb8f2c6bf26ffbad436502e1763a27cc
 SHA512:
-  metadata.gz: 74cd4d6ba164431b5ab92d2a57af1ac197a3cf66b790332386d29c0e305c448b4063e9119f7d22b9623a7d4145d387de7ac77ef38dfeaa216baafe86b716c20f
-  data.tar.gz: f6b728c61110d26e8fa647b58b8e37a02ceac6ac32f74fb6111eec377f475d983faa59d74be91ce633447e82c40fd2a2625b19fba1fd48c1d229c355c4baa735
+  metadata.gz: 576496807d697dfaf1498c6fc63f4b743a5c663efb1559ed477bae63f1b5ad7b9ee9722244fdc2cd2e7b07ee014ec6eba2f7021b56b4f5c9da1b9bff4876861d
+  data.tar.gz: 462a6477e481b454d5eac1f723a46a37cabb4893dd63b774c34582c2f8293d89aa48c24fef88c696831d0ed6f5e34f454e3ddfc15cb82ac5df6b28fbf476e7f2

data/README.md

@@ -59,19 +59,19 @@ You can tell `squasher` a more detailed date, for example:
 
 ### Options
 
-`-d` - execute in **dry** mode - test a squashing process without deleting old migrations. The final output will be
+`-d/--dry` - execute in **dry** mode - test a squashing process without deleting old migrations. The final output will be
 printed in the console.
 
-`-r` - reuse a database from previous squashing process. The option can be used in the next cases:
+`-r/--reuse` - reuse a database from previous squashing process. The option can be used in the next cases:
   - you've run squasher in **dry** mode before and there were no errors
   - you're squashing migrations gradually. For example, you want to squash migrations from 2013 till 2015, but the
 process breaks in a migration from 2014. In this situation you squash till 2014, save the squasher's
 database at the end, make a patch in the broken migration and run again the suite with `-r` option. As the result
 squasher will not need to create the db schema and all data from the previous migrations will be there.
 
-`-e` - tell squasher that you are squashing a Rails engine. To squash migrations you need to configure a dummy app. If your dummy app located outside the engine's folder provide path to it as the next argument `squasher -e ../my-engine-app 2016`
+`-e/--engine` - tell squasher that you are squashing a Rails engine. To squash migrations you need to configure a dummy app. If your dummy app located outside the engine's folder provide path to it as the next argument `squasher --engine ../my-engine-app 2016`
 
-`-m` - for correct work with Rails 5 specify a migration version like `squasher -m 5.0 ...`
+`-m/--migration` - for correct work with Rails 5 specify a migration version like `squasher -m 5.0 ...`
 
 ## Requirements
 
@@ -79,6 +79,10 @@ It works and was tested on Ruby 2.0+ and Rails 3.1+. It also requires a valid de
 If an old migration inserted data (created ActiveRecord model records) you will lose this code in the squashed migration, **BUT** `squasher` will ask you to leave a tmp database which will have all data that was inserted while migrating. Using this database you could add that data as another migration, or into `config/seed.rb` (the expected place for this stuff).
 
 ## Changelog
+- 0.5.1
+  - Fix work on Windows machines ([@tobmatth](https://github.com/tobmatth))
+- 0.5.0
+  - Rework command line integration. Fix clean process with Rails 5
 - 0.4.0
   - Support rails versioned migrations which were introduced in Rails 5
 - 0.3.1

data/lib/squasher.rb

@@ -26,7 +26,8 @@ module Squasher
   def rake(command, description = nil)
     tell(description) if description
     config.in_app_root do
-      system("RAILS_ENV=development DISABLE_DATABASE_ENVIRONMENT_CHECK=1 bundle exec rake #{ command }")
+      env = { 'RAILS_ENV' => 'development', 'DISABLE_DATABASE_ENVIRONMENT_CHECK' => '1' }
+      system(env, "bundle exec rake #{ command }")
     end
   end
 
@@ -39,6 +40,10 @@ module Squasher
     message = messages.fetch(key.to_s)
     message = message.join("\n") if message.is_a?(Array)
     message = colorize(message)
+    print(message, options)
+  end
+
+  def print(message, options = {})
     puts message % options
   end
 

data/lib/squasher/version.rb

@@ -1,3 +1,3 @@
 module Squasher
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/squasher/worker.rb

@@ -18,7 +18,7 @@ module Squasher
       result = under_squash_env do
         if Squasher.config.set?(:dry)
           Squasher.tell(:dry_mode_finished)
-          puts Render.render(:init_schema, config)
+          Squasher.print(Render.render(:init_schema, config))
         else
           path = config.migration_file(finish_timestamp, :init_schema)
           File.open(path, 'wb') { |io| io << Render.render(:init_schema, config) }

data/spec/lib/squasher_spec.rb

@@ -10,4 +10,40 @@ describe Squasher do
       Squasher.squash(input, [])
     end
   end
+
+  context '.rake' do
+    before do
+      allow_any_instance_of(Object).to receive(:system)
+    end
+
+    context 'when given a description' do
+      it 'outputs it' do
+        expect(Squasher).to receive(:tell).with('description')
+        Squasher.rake('db:migrate', 'description')
+      end
+    end
+
+    it 'switches to the app root before running a given command' do
+      allow(Dir).to receive(:pwd) { fake_root }
+      expect(Dir).to receive(:chdir).with(fake_root)
+      Squasher.rake('db:migrate')
+    end
+
+    it 'runs a given command' do
+      expect_any_instance_of(Object).to receive(:system).with(anything, /db:migrate/)
+      Squasher.rake('db:migrate')
+    end
+
+    it 'sets the Rails environment to development' do
+      expect_any_instance_of(Object).to receive(:system)
+        .with(hash_including('RAILS_ENV' => 'development'), /db:migrate/)
+      Squasher.rake('db:migrate')
+    end
+
+    it 'disables database environment check' do
+      expect_any_instance_of(Object).to receive(:system)
+        .with(hash_including('DISABLE_DATABASE_ENVIRONMENT_CHECK' => '1'), /db:migrate/)
+      Squasher.rake('db:migrate')
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ module Squasher
       File.join(File.dirname(__FILE__), 'fake_app')
     end
   end
+
+  def puts(*)
+  end
 end
 
 require 'bundler/setup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sergey Pchelintsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-03 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler