combustion 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f28e971887ec1b8cccd6708b6a5959fd16dc5afb5e3a1983f002385c3ecbf7a8
-  data.tar.gz: b7b4126b5923c1aa847fac7a4b8a2d43d0f8e06aed9fe21cfe62a11c9c5991ba
+  metadata.gz: 0c1a369737ff21b225eee681a7ca0258f87a6141870885bc7cf4ce29ef6fd10c
+  data.tar.gz: 88f61f3c7f3d7f57b71f5be4a351c1bd93c374a81c5fcf76d8f2e6eae299de77
 SHA512:
-  metadata.gz: ff71dda123358ad658f97c536a7a9e1b8d16d2fc8d00518d126677bb408fb3947ec13e428fd335d3be77bad71a0d6f706dc9b0cc3f681e8b0375c29ff447027c
-  data.tar.gz: 66eaf6b8b3959dc114326a5b7fc73ead3b47a96a11a9bb21c528efcba59349a07eae6ed09430af2fa2f744e74100f99557cc8bf5f71b970fa144e504268c22bb
+  metadata.gz: c5133bd2a0a3359d5562e0a62cd0561d63f7ce067bcf52773a48e09c1d54e1a7bdf2186683e87f82b98524f129a3e5c29aae792ccb0d1efd2f49abdfe556773f
+  data.tar.gz: 59f5f629ab28a8c6578e03617cedaec720a289917d4a1a37b1b713f63e0caf826aafe6f4addd8d0f78fb213abd173a6657b57cb4a9f87c764bcfd1f8a69571be

data/.rubocop.yml

@@ -4,18 +4,22 @@ inherit_from:
 AllCops:
   TargetRubyVersion: 2.2
 
+Bundler/OrderedGems:
+  Exclude:
+    - 'gemfiles/*'
+
 Layout/DotPosition:
   EnforcedStyle: trailing
 
 Layout/CaseIndentation:
   EnforcedStyle: end
 
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
 Layout/IndentHeredoc:
   Enabled: false
 
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
 Metrics/BlockLength:
   Exclude:
     - 'combustion.gemspec'
@@ -26,6 +30,10 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'gemfiles/*'
+
 Style/MultilineTernaryOperator:
   Exclude:
     - 'spec/dummy/db/migrate/*.rb'

data/.travis.yml

@@ -5,10 +5,10 @@ env:
     - "DB_ADAPTER=postgresql"
     - "DB_ADAPTER=mysql2"
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 before_install:
   - gem update --system
   - gem install bundler

data/Appraisals

@@ -27,20 +27,24 @@ if RUBY_VERSION.to_f <= 2.3
 
   appraise "rails-4.2" do
     gem "rails", "~> 4.2.8"
+    gem "mysql2", "~> 0.4.4"
     gem "pg", "< 1.0"
   end
 end
 
 appraise "rails-5.0" do
   gem "rails", "~> 5.0.2"
+  gem "mysql2", "~> 0.4.4"
   gem "pg", "< 1.0"
 end
 
 appraise "rails-5.1" do
   gem "rails", "~> 5.1.0"
+  gem "mysql2", "~> 0.4.4"
   gem "pg", "< 1.0"
 end
 
 appraise "rails-5.2" do
-  gem "rails", "~> 5.2.0.rc1"
+  gem "rails", "~> 5.2.0"
+  gem "mysql2", "~> 0.5.0"
 end

data/HISTORY

@@ -1,3 +1,6 @@
+0.9.1 - April 25th 2018
+* Fix Rails 5.2 compatibility by not setting the deprecated secret_token configuration option.
+
 0.9.0 - March 26th 2018
 * Only reset databases that are either custom or the current one (Moritz Winter).
 * More consistency around environment handling (rather than presuming it's always the test environment).

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', '~> 0.9.0'
+gem.add_development_dependency 'combustion', '~> 0.9.1'
 
 # Gemfile
-gem 'combustion', '~> 0.9.0', :group => :test
+gem 'combustion', '~> 0.9.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     = "0.9.0"
+  s.version     = "0.9.1"
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = "https://github.com/pat/combustion"
@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pg"
   s.add_development_dependency "rails"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rubocop", "~> 0.50.0"
+  s.add_development_dependency "rubocop", "~> 0.54.0"
   s.add_development_dependency "sqlite3"
 end

data/gemfiles/rails_3.1.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.1.12"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.22.5"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 4.0.13"
 gem "mysql2", "~> 0.3.10"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -4,5 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 4.1.16"
 gem "mysql2", "~> 0.3.13"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -3,5 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.2.8"
+gem "mysql2", "~> 0.4.4"
+gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -3,6 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 5.0.2"
+gem "mysql2", "~> 0.4.4"
 gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.1.gemfile

@@ -3,6 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 5.1.0"
+gem "mysql2", "~> 0.4.4"
 gem "pg", "< 1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.2.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 5.2.0.rc1"
+gem "rails", "~> 5.2.0"
+gem "mysql2", "~> 0.5.0"
 
 gemspec :path => "../"

data/lib/combustion.rb

@@ -5,7 +5,6 @@ require "active_support/dependencies"
 
 module Combustion
   module Configurations
-    #
   end
 
   mattr_accessor :path, :schema_format, :setup_environment

data/lib/combustion/application.rb

@@ -6,17 +6,16 @@ Rails.env = ENV["RAILS_ENV"] || "test"
 
 module Combustion
   class Application < Rails::Application
+    version = Rails.version.to_f
+
     # Core Settings
     config.cache_classes               = true
     config.consider_all_requests_local = true
-    config.secret_token                = Digest::SHA1.hexdigest Time.now.to_s
     config.eager_load                  = Rails.env.production?
 
-    if Rails.version.to_f >= 4.0
-      config.secret_key_base = SecureRandom.hex
-    else
-      config.whiny_nils = true
-    end
+    config.secret_key_base = SecureRandom.hex if version >= 4.0
+    config.whiny_nils      = true             if version < 4.0
+    config.secret_token = Digest::SHA1.hexdigest Time.now.to_s if version < 5.2
 
     # ActiveSupport Settings
     config.active_support.deprecation = :stderr

data/lib/combustion/database.rb

@@ -2,7 +2,6 @@
 
 module Combustion
   module Databases
-    #
   end
 
   class Database

data/lib/combustion/databases/mysql.rb

@@ -89,7 +89,7 @@ Please provide the root password for your mysql installation
       return
     end
 
-    $stderr.puts <<-TXT
+    warn <<-TXT
 #{error.error}
 Couldn't create database for #{config.inspect}, charset: #{charset}, collation: #{collation}
 #{charset_error}

data/lib/combustion/databases/postgresql.rb

@@ -16,8 +16,8 @@ class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
       configuration.merge("encoding" => encoding)
     )
   rescue StandardError => error
-    $stderr.puts error, *error.backtrace
-    $stderr.puts "Couldn't create database for #{configuration.inspect}"
+    warn error, *error.backtrace
+    warn "Couldn't create database for #{configuration.inspect}"
   end
 
   def drop

data/lib/combustion/databases/sqlite.rb

@@ -8,15 +8,15 @@ class Combustion::Databases::SQLite < Combustion::Databases::Base
 
   def create
     if exists?
-      $stderr.puts "#{config["database"]} already exists"
+      warn "#{config["database"]} already exists"
       return
     end
 
     establish_connection configuration
     connection
   rescue StandardError => error
-    $stderr.puts error, *error.backtrace
-    $stderr.puts "Couldn't create database for #{configuration.inspect}"
+    warn error, *error.backtrace
+    warn "Couldn't create database for #{configuration.inspect}"
   end
 
   def drop

data/spec/database_spec.rb

@@ -3,7 +3,7 @@
 module Combustion
   describe Database do
     before(:all) do
-      Dir.chdir(File.expand_path("../dummy", __FILE__)) do
+      Dir.chdir(File.expand_path("dummy", __dir__)) do
         Combustion.initialize! :active_record
       end
     end

data/spec/dummy/spec/internal/config/routes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  #
+  # Add your own routes here, or remove this file if you don't have need for it.
 end

data/spec/dummy/spec/internal/db/schema.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 ActiveRecord::Schema.define do
-  #
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
 end

data/spec/spec_helper.rb

@@ -12,4 +12,4 @@ if Rails::VERSION::STRING.to_f < 4.1
   end
 end
 
-require File.expand_path("../dummy/lib/engine.rb", __FILE__)
+require File.expand_path("dummy/lib/engine.rb", __dir__)

data/templates/routes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  #
+  # Add your own routes here, or remove this file if you don't have need for it.
 end

data/templates/schema.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 ActiveRecord::Schema.define do
-  #
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement