squasher 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d724bebcea027694c4fd7ae07faefc4e640cd9d
-  data.tar.gz: d7b96e31bb8f2c6bf26ffbad436502e1763a27cc
+  metadata.gz: 1d4dc03c57562e0746d36aebe4a6a8634197d8c9
+  data.tar.gz: a83619cd0c416384c4a818a71350d0c589b13c57
 SHA512:
-  metadata.gz: 576496807d697dfaf1498c6fc63f4b743a5c663efb1559ed477bae63f1b5ad7b9ee9722244fdc2cd2e7b07ee014ec6eba2f7021b56b4f5c9da1b9bff4876861d
-  data.tar.gz: 462a6477e481b454d5eac1f723a46a37cabb4893dd63b774c34582c2f8293d89aa48c24fef88c696831d0ed6f5e34f454e3ddfc15cb82ac5df6b28fbf476e7f2
+  metadata.gz: 5fd8a985155c33c59d532510fe31a3986cad7aaa98584d41afecd17b4b74d0e0ce4c7f7749939a87e0e1b4c9ffc68ab5c64ec44d29e1b9953833b42c2eac091a
+  data.tar.gz: 6516143788c78bb5b959467282bc126981c6065fb4fab37270da8c8c274fb74a3e04d36ed2acdda6b5c5782f5296254fabc7d2ff6cbd88cc8012e5d06b90c715

data/bin/squasher

@@ -16,7 +16,11 @@ parser = OptionParser.new do |config|
     options[:reuse] = true
   end
 
-  config.on('-e', '--engine=PATH') do |value|
+  config.on('-e') do
+    options[:engine] = nil
+  end
+
+  config.on('--engine=PATH') do |value|
     options[:engine] = value
   end
 
@@ -26,9 +30,10 @@ parser = OptionParser.new do |config|
 end
 parser.parse!
 
+Squasher.setup(options)
 case ARGV.first
-when /\A\d{4}/ then Squasher.squash(ARGV.first, options)
-when 'clean' then Squasher.clean(options)
+when /\A\d{4}/ then Squasher.squash(ARGV.first)
+when 'clean' then Squasher.clean
 else
   Squasher.tell(:usage, version: Squasher::VERSION)
 end

data/lib/squasher.rb

@@ -11,15 +11,17 @@ module Squasher
 
   @config = Config.new
 
-  def squash(raw_date, options)
+  def setup(options)
+    options.each { |(k, v)| config.set(k, v) }
+  end
+
+  def squash(raw_date)
     parts = raw_date.to_s.split('/').map(&:to_i)
     date = Time.new(*parts)
-    options.each { |(k, v)| config.set(k, v) }
     Worker.process(date)
   end
 
-  def clean(options)
-    options.each { |(k, v)| config.set(k, v) }
+  def clean
     Cleaner.process
   end
 

data/lib/squasher/version.rb

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

data/spec/lib/cleaner_spec.rb

@@ -15,7 +15,7 @@ describe Squasher::Cleaner do
 
   it 'create a new migration' do
     allow_any_instance_of(Squasher::Cleaner).to receive(:prev_migration).and_return(nil)
-    Squasher.clean({})
+    Squasher.clean
 
     expect(clean_migrations).to include(expected_file)
     File.open(expected_file) do |stream|
@@ -25,7 +25,7 @@ describe Squasher::Cleaner do
   end
 
   it 'update an existing migration' do
-    Squasher.clean({})
+    Squasher.clean
 
     expect(clean_migrations.size).to be(1)
     expect(clean_migrations.first).to eq(expected_file)

data/spec/lib/squasher_spec.rb

@@ -7,7 +7,7 @@ describe Squasher do
 
     def expected_covert(input, expected)
       expect(Squasher::Worker).to receive(:process).with(expected)
-      Squasher.squash(input, [])
+      Squasher.squash(input)
     end
   end
 

data/spec/spec_helper.rb

@@ -21,4 +21,8 @@ Bundler.require
 RSpec.configure do |config|
   config.order = 'random'
   config.include SpecHelpers
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Sergey Pchelintsev
@@ -76,6 +76,7 @@ files:
 - lib/squasher/templates/squasher_clean.rb.erb
 - lib/squasher/version.rb
 - lib/squasher/worker.rb
+- spec/fake_app/config/application.rb
 - spec/fake_app/config/database.yml
 - spec/fake_app/config/invalid_database.yml
 - spec/fake_app/db/migrate/20131205160936_first_migration.rb
@@ -114,6 +115,7 @@ signing_key:
 specification_version: 4
 summary: Squash your old migrations
 test_files:
+- spec/fake_app/config/application.rb
 - spec/fake_app/config/database.yml
 - spec/fake_app/config/invalid_database.yml
 - spec/fake_app/db/migrate/20131205160936_first_migration.rb