squasher 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcde2fe7af3cc7854dfa744fc92bbe03ea5657c
-  data.tar.gz: 5859b87e2dd11e1edffcb09aa8b070b2bf7fdaf2
+  metadata.gz: 32c691bc42a70dbb727f6c865fc4ed20fccdaa5b
+  data.tar.gz: 44f0be362840e69d663491d6596adf24bd45e541
 SHA512:
-  metadata.gz: 608e982702c3c8de252fbaad554a094fd072a322de12ad957bed80b6928860c1a1d94ca5257ff13f7eee43a6b0b1c458e735a7177baf861f97f1afca2988099f
-  data.tar.gz: 809912cb74e444f34b6fe534c961c23f03f9194bd554087172bea39560e2aa7d8e03afdeb32916be0ec4dfef6e5b2a222ce944b3c6b1d5044d6b04f4a5e7d066
+  metadata.gz: 69f6385a5155b6eb0c6893822ec8aedf055fdd566fb6cc10a35482cdc5f9dbf26c4234b2a7679b255ebb2784cae0190ede0d7daf7192d069fcb05ef5a06ac0b4
+  data.tar.gz: 378315cdd0c0e263611fee16c32b4e2952f89333550b8698232eac8e3485163ab08b67873c247e215a3d267bb6f5dced5ce02ccbd6fb234653b312a6f62e20c7

data/README.md

@@ -19,13 +19,13 @@ If you want to share it with your rails/sinatra/etc app add the below:
 ```ruby
 # Yep, the missing group in most Gemfiles where all utilities should be!
 group :tools do
-  gem 'squasher', '>= 0.3.0'  
+  gem 'squasher', '>= 0.3.0'
   gem 'capistrano'
   gem 'rubocop'
 end
 ```
 
-Don't forget to run `bundle`. 
+Don't forget to run `bundle`.
 
 To integrate `squasher` with your app even more do the below:
 
@@ -71,12 +71,18 @@ squasher will not need to create the db schema and all data from the previous mi
 
 `-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`
 
+`-m` - for correct work with Rails 5 specify a migration version like `squasher -m 5.0 ...`
+
 ## Requirements
 
 It works and was tested on Ruby 2.0+ and Rails 3.1+. It also requires a valid development configuration in `config/database.yml` and using Ruby format in `db/schema.rb` (default Rails use-case).
 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.4.0
+  - Support rails versioned migrations which were introduced in Rails 5
+- 0.3.1
+  - fix init migration generation
 - 0.3.0
   - **rails engines support** ([@JakeTheSnake3p0](https://github.com/JakeTheSnake3p0))
   - move messages from JSON file to YAML

data/lib/squasher/config.rb

@@ -4,7 +4,7 @@ require 'erb'
 
 module Squasher
   class Config
-    OPTIONS = [:d, :r, :e].freeze
+    OPTIONS = [:d, :r, :e, :m].freeze
 
     module Render
       extend self
@@ -35,7 +35,7 @@ module Squasher
       end
     end
 
-    attr_reader :schema_file
+    attr_reader :schema_file, :migration_version
 
     def initialize
       @root_path = Dir.pwd.freeze
@@ -56,6 +56,9 @@ module Squasher
         else
           Squasher.error(:multi_dummy_case, base: base)
         end
+      elsif key == :m
+        Squasher.error(:invalid_migration_version, value: value) unless value.to_s =~ /\A\d.\d\z/
+        @migration_version = "[#{value}]"
       else
         @flags << key
       end

data/lib/squasher/messages.yml

@@ -23,8 +23,10 @@ usage:
 - "  :yellow<-d>              => execute in :blue<`dry`> mode - test a squashing process without removing old migrations"
 - "  :yellow<-r>              => reuse a database from the previous squashing"
 - "  :yellow<-e> [dummy-root] => execute in :blue<`engine`> mode - requires a dummy app"
+- "  :yellow<-m> 5.0          => specify the rails migration version (added in Rails 5)"
 wrong_option: "You provided a wrong option :red<%{arg}>\n\n"
 invalid_param: "You provided a wrong param :red<%{arg}>\n\n"
 dry_mode_finished: "The `dry` mode is finished. Below the init schema's content:"
 cannot_find_dummy: "Squasher can't find a dummy app inside :yellow<%{base}>"
 multi_dummy_case: "Squasher found a few config/application.rb inside :yellow<%{base}>. Please specify the path more precisely"
+invalid_migration_version: The provided rails migration version `%{value}` is invalid. It should be like `5.0`

data/lib/squasher/templates/init_schema.rb.erb

@@ -1,4 +1,4 @@
-class InitSchema < ActiveRecord::Migration
+class InitSchema < ActiveRecord::Migration<%= @config.migration_version %>
   def up
 <%- each_schema_line do |line| -%>
 <%= line.strip.empty? ? '' : "    #{line}" %>

data/lib/squasher/templates/squasher_clean.rb.erb

@@ -1,4 +1,4 @@
-class SquasherClean < ActiveRecord::Migration
+class SquasherClean < ActiveRecord::Migration<%= @config.migration_version %>
   class SchemaMigration < ActiveRecord::Base
   end
 

data/spec/lib/config_spec.rb

@@ -55,4 +55,11 @@ describe Squasher::Config do
   end
 
   specify { expect(config.migration_file(1230, :sample)).to eq(File.join(fake_root, 'db', 'migrate', '1230_sample.rb')) }
+
+  specify "generate versioned migrations" do
+    config = Squasher::Config.new
+    config.set(:m, '5.1')
+    content = Squasher::Render.render(:init_schema, config)
+    expect(content).to include('ActiveRecord::Migration[5.1]')
+  end
 end

data/squasher.gemspec

@@ -1,13 +1,13 @@
-# coding: utf-8
+# encoding: utf-8
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "squasher"
-  spec.version       = "0.3.1"
+  spec.version       = "0.4.0"
   spec.authors       = ["Sergey Pchelintsev"]
-  spec.email         = ["mail@sergeyp.me"]
+  spec.email         = ["linz.sergey@gmail.com"]
   spec.description   = %q{Squash your old migrations}
   spec.summary       = %q{Squash your old migrations}
   spec.homepage      = "https://github.com/jalkoby/squasher"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squasher
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sergey Pchelintsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,7 @@ dependencies:
         version: 3.3.0
 description: Squash your old migrations
 email:
-- mail@sergeyp.me
+- linz.sergey@gmail.com
 executables:
 - squasher
 extensions: []