combustion 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00e770c8fcc3c15a6918486de7f5dbb93091bb457f28df2cb0123f0d0853f44c
-  data.tar.gz: 4efd8db0a68d99e752f431b0f6d2da7fbc34092c11db254af93b038480811a34
+  metadata.gz: 67e781b7922d6b720d76b442ca930f1e8341e297afd9d677656b24e7a4265e85
+  data.tar.gz: 1b21ce6080deed68c828303b92b1131d822714f1e905c29d97be76753bf82843
 SHA512:
-  metadata.gz: d089a752fd8bc317d4add3cc6da88b648b4bb13feb25b7dabaea4f0a6e31bc042198c3aa7d52fb8206091f2db337ee75f9303fce7fc284cd7aea316727075a2d
-  data.tar.gz: 0c6c9b3e94d5ec4f376f8d2b784b00dcb3e2f247e8b27ed175dbebf88c373141f6dee0b128f4520c2dce5f90841dbaee2dd5ceb903900204a1f6441c1a5a388e
+  metadata.gz: 2edf04f8a1f865ad131bfe324d8258824f03e415fdfef986d310d6e47663f6055cf182d5aa757cefd7563261ada0d70c64c45dff70caba90999fbcb1cababbf9
+  data.tar.gz: b140df7dddbb1960f3a567a1d2987bca21826efeb7be031d612d742888fb67e9c2f50068278925e8a80150e1c1b509cc1412df604c042f6537846003e46daee8

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+dist: xenial
 env:
   matrix:
     - "DB_ADAPTER=sqlite3"
@@ -6,15 +7,17 @@ env:
     - "DB_ADAPTER=mysql2"
 rvm:
   - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
 before_install:
-  - gem update --system
-  - gem install bundler
+  - gem install bundler --version "~> 1.17"
+install:
+  - bundle _1.17.3_ install --jobs=3 --retry=3
 before_script:
   - bundle exec appraisal install
-script: 'bundle exec appraisal rake'
+script: bundle exec appraisal rake
 services:
   - mysql
   - postgresql

data/Appraisals

@@ -5,30 +5,35 @@ if RUBY_VERSION.to_f <= 2.3
     gem "rails", "~> 3.1.12"
     gem "mysql2", "~> 0.3.10"
     gem "pg", "< 1.0"
+    gem "bundler", "~> 1.17"
   end
 
   appraise "rails-3.2" do
     gem "rails", "~> 3.2.22.5"
     gem "mysql2", "~> 0.3.10"
     gem "pg", "< 1.0"
+    gem "bundler", "~> 1.17"
   end
 
   appraise "rails-4.0" do
     gem "rails", "~> 4.0.13"
     gem "mysql2", "~> 0.3.10"
     gem "pg", "< 1.0"
+    gem "bundler", "~> 1.17"
   end
 
   appraise "rails-4.1" do
     gem "rails", "~> 4.1.16"
     gem "mysql2", "~> 0.3.13"
     gem "pg", "< 1.0"
+    gem "bundler", "~> 1.17"
   end
 
   appraise "rails-4.2" do
     gem "rails", "~> 4.2.8"
     gem "mysql2", "~> 0.4.4"
     gem "pg", "< 1.0"
+    gem "bundler", "~> 1.17"
   end
 end
 
@@ -48,3 +53,10 @@ appraise "rails-5.2" do
   gem "rails", "~> 5.2.0"
   gem "mysql2", "~> 0.5.0"
 end
+
+if RUBY_VERSION.to_f >= 2.5
+  appraise "rails-6.0" do
+    gem "rails", "~> 6.0.0.beta1"
+    gem "mysql2", "~> 0.5.0"
+  end
+end

data/Gemfile

@@ -3,3 +3,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem "sqlite3", "~> 1.3.13", :platform => :ruby

data/HISTORY

@@ -1,3 +1,6 @@
+1.1.0 - February 13th 2019
+* Rails 6.0 support.
+
 1.0.0 - October 3rd 2018
 * No functional changes.
 * Added documentation about database preparation options.

data/README.md

@@ -10,10 +10,10 @@ Get the gem into either your gemspec or your Gemfile, depending on how you manag
 
 ```ruby
 # gemspec
-gem.add_development_dependency 'combustion', '~> 1.0'
+gem.add_development_dependency 'combustion', '~> 1.1'
 
 # Gemfile
-gem 'combustion', '~> 1.0'
+gem 'combustion', '~> 1.1'
 ```
 
 In your `spec_helper.rb`, get Combustion to set itself up - which has to happen before you introduce `rspec/rails` and - if being used - `capybara/rails`. Here's an example within context:

data/combustion.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "combustion"
-  s.version     = "1.0.0"
+  s.version     = "1.1.0"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/combustion"

data/lib/combustion/database/reset.rb

@@ -52,12 +52,10 @@ class Combustion::Database::Reset
   # All database configs except Rails default environments
   # that are not currently in use
   def resettable_db_configs
-    unused_environments = RAILS_DEFAULT_ENVIRONMENTS - [Rails.env.to_s]
-    resettable_environments = ActiveRecord::Base.configurations.keys -
-                              unused_environments
+    all_configurations      = ActiveRecord::Base.configurations.to_h
+    unused_environments     = RAILS_DEFAULT_ENVIRONMENTS - [Rails.env.to_s]
+    resettable_environments = all_configurations.keys - unused_environments
 
-    ActiveRecord::Base.configurations.select do |name|
-      resettable_environments.include?(name)
-    end
+    all_configurations.select { |name| resettable_environments.include?(name) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,8 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: combustion
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing