Merge pull request #83 from ojab/rails-6

rails-6 support

Author: jenseng

.gitignore

@@ -1,5 +1,6 @@
 /Gemfile.lock
 /gemfiles/*.lock
+/gemfiles/.bundle
 /*.gem
 /pkg
 /tmp

.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
+services:
+  - mysql
+  - postgresql
 env: DB_CONFIG=travis
 rvm:
   - 2.3.8
@@ -9,11 +12,18 @@ gemfile:
   - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_5.1.gemfile
   - gemfiles/activerecord_5.2.gemfile
+  - gemfiles/activerecord_6.0.gemfile
   - gemfiles/activerecord_edge.gemfile
 matrix:
   exclude:
+  - gemfile: gemfiles/activerecord_6.0.gemfile
+    rvm: 2.3.8
+  - gemfile: gemfiles/activerecord_6.0.gemfile
+    rvm: 2.4.5
   - gemfile: gemfiles/activerecord_edge.gemfile
-    rvm: 2.3.7
+    rvm: 2.3.8
+  - gemfile: gemfiles/activerecord_edge.gemfile
+    rvm: 2.4.5
   allow_failures:
     - gemfile: gemfiles/activerecord_edge.gemfile
 bundler_args: --without development

Appraisals

@@ -19,10 +19,17 @@ appraise "activerecord-5.2" do
   gem "sqlite3", "~> 1.3.6"
 end
 
+appraise "activerecord-6.0" do
+  gem "activerecord", "~> 6.0.0"
+  gem "mysql2", "~> 0.4.10"
+  gem "pg", ">= 0.18", "< 2.0"
+  gem "sqlite3", "~> 1.4.0"
+end
+
 appraise "activerecord-edge" do
   gem "arel", github: "rails/arel"
   gem "activerecord", github: "rails/rails"
   gem "mysql2", "~> 0.4.10"
   gem "pg", ">= 0.18", "< 2.0"
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3", "~> 1.4.0"
 end

gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "mysql2", "~> 0.4.10"
+gem "pg", ">= 0.18", "< 2.0"
+gem "sqlite3", "~> 1.4.0"
+
+group :development do
+  gem "appraisal"
+  gem "byebug"
+end
+
+group :test do
+  gem "rake", "~> 10.0"
+  gem "rspec", "~> 2.14.0"
+end
+
+gemspec path: "../"

gemfiles/activerecord_edge.gemfile

@@ -6,7 +6,7 @@ gem "arel", :github => "rails/arel"
 gem "activerecord", :github => "rails/rails"
 gem "mysql2", "~> 0.4.10"
 gem "pg", ">= 0.18", "< 2.0"
-gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.4.0"
 
 group :development do
   gem "appraisal"

hairtrigger.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.files = %w(LICENSE.txt Rakefile README.md) + Dir['lib/**/*.rb'] + Dir['lib/**/*.rake']
 
-  s.add_dependency 'activerecord', '>= 5.0', '< 6.0'
+  s.add_dependency 'activerecord', '>= 5.0', '< 7'
   s.add_dependency 'ruby_parser', '~> 3.10'
   s.add_dependency 'ruby2ruby', '~> 2.4'
 end

lib/hair_trigger.rb

@@ -40,13 +40,19 @@ def models
 
     def migrator
       version = ActiveRecord::VERSION::STRING
-      if version >= "5.2."
+      if version >= "6.0."
+        migrations = ActiveRecord::MigrationContext.new(migration_path, ActiveRecord::SchemaMigration).migrations
+      elsif version >= "5.2."
         migrations = ActiveRecord::MigrationContext.new(migration_path).migrations
       else # version >= "4.0."
         migrations = ActiveRecord::Migrator.migrations(migration_path)
       end
 
-      ActiveRecord::Migrator.new(:up, migrations)
+      if version >= "6.0."
+        ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration)
+      else
+        ActiveRecord::Migrator.new(:up, migrations)
+      end
     end
 
     def current_migrations(options = {})

spec/spec_helper.rb

@@ -75,7 +75,9 @@ def initialize_db
 
   def migrate_db
     ActiveRecord::Migration.verbose = false
-    if ActiveRecord::VERSION::STRING >= "5.2"
+    if ActiveRecord::VERSION::STRING >= "6.0"
+      ActiveRecord::MigrationContext.new(HairTrigger.migration_path, ActiveRecord::SchemaMigration).migrate
+    elsif ActiveRecord::VERSION::STRING >= "5.2"
       ActiveRecord::MigrationContext.new(HairTrigger.migration_path).migrate
     else
       ActiveRecord::Migrator.migrate(HairTrigger.migration_path)