squasher 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c691bc42a70dbb727f6c865fc4ed20fccdaa5b
-  data.tar.gz: 44f0be362840e69d663491d6596adf24bd45e541
+  metadata.gz: 60335f7e6ad04a4db267dd1ad99152aa02d79242
+  data.tar.gz: 4c17e356d84255ae3177094facf40904845e8223
 SHA512:
-  metadata.gz: 69f6385a5155b6eb0c6893822ec8aedf055fdd566fb6cc10a35482cdc5f9dbf26c4234b2a7679b255ebb2784cae0190ede0d7daf7192d069fcb05ef5a06ac0b4
-  data.tar.gz: 378315cdd0c0e263611fee16c32b4e2952f89333550b8698232eac8e3485163ab08b67873c247e215a3d267bb6f5dced5ce02ccbd6fb234653b312a6f62e20c7
+  metadata.gz: 74cd4d6ba164431b5ab92d2a57af1ac197a3cf66b790332386d29c0e305c448b4063e9119f7d22b9623a7d4145d387de7ac77ef38dfeaa216baafe86b716c20f
+  data.tar.gz: f6b728c61110d26e8fa647b58b8e37a02ceac6ac32f74fb6111eec377f475d983faa59d74be91ce633447e82c40fd2a2625b19fba1fd48c1d229c355c4baa735

data/.travis.yml

@@ -8,3 +8,5 @@ rvm:
   - 2.2
   - 2.1
   - 2.0
+notifications:
+  email: false

data/bin/squasher

@@ -1,10 +1,34 @@
 #!/usr/bin/env ruby
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'optparse'
 require 'squasher'
 
-if ARGV[0] == 'clean'
-  Squasher.clean
-elsif ARGV[-1] =~ /\A\d{4}/
-  Squasher.squash(ARGV[-1], ARGV[0...-1])
+options = {}
+parser = OptionParser.new do |config|
+  config.on('-v', '--version', '-h', '--help')
+
+  config.on('-d', '--dry') do
+    options[:dry] = true
+  end
+
+  config.on('-r', '--reuse') do
+    options[:reuse] = true
+  end
+
+  config.on('-e', '--engine=PATH') do |value|
+    options[:engine] = value
+  end
+
+  config.on('-m', '--migration', '=VERSION') do |value|
+    options[:migration] = value
+  end
+end
+parser.parse!
+
+case ARGV.first
+when /\A\d{4}/ then Squasher.squash(ARGV.first, options)
+when 'clean' then Squasher.clean(options)
 else
-  Squasher.tell(:usage)
+  Squasher.tell(:usage, version: Squasher::VERSION)
 end

data/lib/squasher.rb

@@ -4,6 +4,7 @@ module Squasher
   autoload :Cleaner, 'squasher/cleaner'
   autoload :Config,  'squasher/config'
   autoload :Render,  'squasher/render'
+  autoload :VERSION, 'squasher/version'
   autoload :Worker,  'squasher/worker'
 
   attr_reader :config
@@ -13,28 +14,12 @@ module Squasher
   def squash(raw_date, options)
     parts = raw_date.to_s.split('/').map(&:to_i)
     date = Time.new(*parts)
-
-    options.reduce([]) do |acc, arg|
-      if arg.index('-') == 0
-        arg = arg.gsub('-', '').to_sym
-        unless Config::OPTIONS.include?(arg)
-          tell(:wrong_option, arg: arg)
-          error(:usage)
-        end
-        acc.push([arg])
-      elsif acc.empty?
-        tell(:invalid_param, arg: arg)
-        error(:usage)
-      else
-        acc.last[1] = arg
-      end
-      acc
-    end.each { |(k, v)| config.set(k, v) }
-
+    options.each { |(k, v)| config.set(k, v) }
     Worker.process(date)
   end
 
-  def clean
+  def clean(options)
+    options.each { |(k, v)| config.set(k, v) }
     Cleaner.process
   end
 

data/lib/squasher/cleaner.rb

@@ -13,11 +13,10 @@ module Squasher
 
       migration_file = config.migration_file(now_timestamp, MIGRATION_NAME)
       if prev_migration
-        FileUtils.mv(prev_migration, migration_file)
-      else
-        File.open(migration_file, 'wb') do |stream|
-          stream << ::Squasher::Render.render(MIGRATION_NAME, config)
-        end
+        FileUtils.rm(prev_migration)
+      end
+      File.open(migration_file, 'wb') do |stream|
+        stream << ::Squasher::Render.render(MIGRATION_NAME, config)
       end
       Squasher.rake("db:migrate", :db_cleaning)
     end

data/lib/squasher/config.rb

@@ -4,8 +4,6 @@ require 'erb'
 
 module Squasher
   class Config
-    OPTIONS = [:d, :r, :e, :m].freeze
-
     module Render
       extend self
 
@@ -45,7 +43,7 @@ module Squasher
     end
 
     def set(key, value)
-      if key == :e
+      if key == :engine
         base = value.nil? ? @root_path : File.expand_path(value, @root_path)
         list = Dir.glob(File.join(base, '**', '*', 'config', 'application.rb'))
         case list.size
@@ -56,7 +54,7 @@ module Squasher
         else
           Squasher.error(:multi_dummy_case, base: base)
         end
-      elsif key == :m
+      elsif key == :migration
         Squasher.error(:invalid_migration_version, value: value) unless value.to_s =~ /\A\d.\d\z/
         @migration_version = "[#{value}]"
       else
@@ -64,7 +62,7 @@ module Squasher
       end
     end
 
-    def with?(k)
+    def set?(k)
       @flags.include?(k)
     end
 

data/lib/squasher/messages.yml

@@ -15,7 +15,9 @@ db_migrate: Squasher is applying migrations on a tmp database
 db_cleaning: Squasher is applying the clean migration
 db_reuse: Squasher is reusing the database from the previous squashing
 usage:
-- "Example usage:"
+- "Squasher %{version}"
+- ""
+- "Examples of usage:"
 - "  :green<squasher> [options] :yellow<year[/month][/day]> => squash migrations prior to a specified date"
 - "  :green<squasher> :yellow<clean>                        => generate or update a cleaning migration and apply it"
 - "  :green<squasher> :yellow<info>                         => show the message\n"

data/lib/squasher/version.rb

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

data/lib/squasher/worker.rb

@@ -16,7 +16,7 @@ module Squasher
       check!
 
       result = under_squash_env do
-        if Squasher.config.with?(:d)
+        if Squasher.config.set?(:dry)
           Squasher.tell(:dry_mode_finished)
           puts Render.render(:init_schema, config)
         else
@@ -66,7 +66,7 @@ module Squasher
 
     def under_squash_env
       config.stub_dbconfig do
-        if Squasher.config.with?(:r)
+        if Squasher.config.set?(:reuse)
           Squasher.tell(:db_reuse)
         else
           return unless Squasher.rake("db:drop db:create", :db_create)

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/config_spec.rb

@@ -58,7 +58,7 @@ describe Squasher::Config do
 
   specify "generate versioned migrations" do
     config = Squasher::Config.new
-    config.set(:m, '5.1')
+    config.set(:migration, '5.1')
     content = Squasher::Render.render(:init_schema, config)
     expect(content).to include('ActiveRecord::Migration[5.1]')
   end

data/spec/lib/worker_spec.rb

@@ -56,7 +56,7 @@ describe Squasher::Worker do
     end
 
     specify 'the dry mode' do
-      Squasher.config.set(:d, nil)
+      Squasher.config.set(:dry, nil)
       worker = described_class.new(Time.new(2014))
       allow(worker).to receive(:under_squash_env).and_yield.and_return(true)
       expect(Squasher).to receive(:tell).with(:dry_mode_finished).and_call_original
@@ -67,7 +67,7 @@ describe Squasher::Worker do
     end
 
     specify 'reuse of an existing database' do
-      Squasher.config.set(:r, nil)
+      Squasher.config.set(:reuse, nil)
       worker = described_class.new(Time.new(2014))
       expect(Squasher).to receive(:tell).with(:db_reuse).and_call_original
       expect(Squasher).not_to receive(:rake).with("db:drop db:create", :db_create)

data/squasher.gemspec

@@ -1,11 +1,11 @@
 # encoding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'squasher/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "squasher"
-  spec.version       = "0.4.0"
+  spec.version       = Squasher::VERSION
   spec.authors       = ["Sergey Pchelintsev"]
   spec.email         = ["linz.sergey@gmail.com"]
   spec.description   = %q{Squash your old migrations}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sergey Pchelintsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - lib/squasher/render.rb
 - lib/squasher/templates/init_schema.rb.erb
 - lib/squasher/templates/squasher_clean.rb.erb
+- lib/squasher/version.rb
 - lib/squasher/worker.rb
 - spec/fake_app/config/database.yml
 - spec/fake_app/config/invalid_database.yml