combustion 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb9dd7c152b1c4ef543f6db332e2cc852d8c574
-  data.tar.gz: 8169e2922fd87f725ee476eb2baaea449b3ef066
+  metadata.gz: adee1390f356a9707415fc7b73ee772c98013820
+  data.tar.gz: 82d9808d3817693cac00fad905c14358b9f3b30b
 SHA512:
-  metadata.gz: 63d7dfdd2ee1341c9311360f3d694238530e595c68ffc65ff554a733a4b1d1f3a518144bab5f27b6551ef499fb4544ae18cb92ab0e3812f1b7cfb6da3a05c79b
-  data.tar.gz: f0ca0720b2a0654e0205c43d1e1d1ebfe83e615b0016f4c9341dd86c9976a7780bec4ee9699d7acac891a78374a10b8b4739e47ec25b5563240c2b9a6ad295d0
+  metadata.gz: 326878f655959ee100820d57b3fd7ba9628b02b685f025875120ae9e209ceeeabdfbd5b19e0b9dd4f95508410b784c0a15648d63beab3bf973de969bac32f402
+  data.tar.gz: 17984826025904c80d93ea41323a8b966917aaa7ce3c23ad2496714c730623c702c42b2ebb6ee990b9fafc47650fd9f32ec18c5856b3e25fed4a4a3910e3dbe6

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 .rvmrc
 .ruby-version
+spec/dummy/spec/internal/db/combustion_test.sqlite

data/HISTORY

@@ -1,3 +1,10 @@
+0.5.4 - January 12th 2016
+* Remove silent_stream call for Rails 5.0 compatability (Bryan Ricker).
+* Fix duplicate migrations error (Semyon Pupkov).
+
+0.5.3 - March 1st 2015
+* Use migrations from dependent gems (Korotaev Danil, Меркушин Михаил).
+
 0.5.2 - July 18th 2014
 * Note MIT licence in gemspec (@ktdreyer).
 * Use local create/drop methods when resetting database (Bryan Ricker).

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.5.3'
+gem.add_development_dependency 'combustion', '~> 0.5.4'
 
 # Gemfile
-gem 'combustion', '~> 0.5.3', :group => :test
+gem 'combustion', '~> 0.5.4', :group => :test
 ```
 
 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:
@@ -184,6 +184,8 @@ I've not tried using this with Cucumber, but it should work in theory without to
 
 ## Contributing
 
+Please note that this project now has a [Contributor Code of Conduct](http://contributor-covenant.org/version/1/0/0/). By participating in this project you agree to abide by its terms.
+
 Contributions are very much welcome - but keep in mind the following:
 
 * Keep patches in a separate branch

data/combustion.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = '0.5.3'
+  s.version     = '0.5.4'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/combustion'
@@ -19,4 +19,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport', '>= 3.0.0'
   s.add_runtime_dependency 'railties', '>= 3.0.0'
   s.add_runtime_dependency 'thor',  '>= 0.14.6'
+
+  s.add_development_dependency 'rails'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rspec'
 end

data/lib/combustion/database.rb

@@ -1,11 +1,9 @@
 module Combustion
   class Database
     def self.setup
-      silence_stream(STDOUT) do
-        reset_database
-        load_schema
-        migrate
-      end
+      reset_database
+      load_schema
+      migrate
     end
 
     def self.reset_database
@@ -57,14 +55,16 @@ module Combustion
 
     def self.migrate
       migrator = ActiveRecord::Migrator
+      engine_path = Rails.application.root.sub(::Combustion.path, '')
+      engine_migration_paths = Rails.application.paths['db/migrate'].to_a
 
-      if migrator.respond_to?(:migrations_paths)
-        paths = migrator.migrations_paths
+      if engine_migration_paths.include?(engine_path.join('db/migrate').to_s)
+        paths = []
       else
-        paths = Array('db/migrate/')
+        paths = base_migration_paths
       end
 
-      paths   += Rails.application.paths['db/migrate'].to_a
+      paths += engine_migration_paths
       paths.uniq!
 
       # Append the migrations inside the internal app's db/migrate directory
@@ -79,6 +79,14 @@ module Combustion
 
     private
 
+    def self.base_migration_paths
+      if ActiveRecord::Migrator.respond_to?(:migrations_paths)
+        ActiveRecord::Migrator.migrations_paths
+      else
+        Array('db/migrate/')
+      end
+    end
+
     def self.create_database(config)
       begin
         if config['adapter'] =~ /sqlite/

data/spec/database_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require File.expand_path("../dummy/lib/engine.rb", __FILE__)
+
+module Combustion
+  describe Database do
+    before do
+      Dir.chdir(File.expand_path('../dummy', __FILE__)) do
+        Combustion.initialize! :active_record
+      end
+    end
+
+    it 'run migration from dummy engine' do
+      expect(ActiveRecord::Base.connection.table_exists?('dummy_table')).to eq true
+    end
+  end
+end
+

data/spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb

@@ -0,0 +1,5 @@
+class CreateDummyTestTable < ActiveRecord::Migration
+  def change
+    create_table 'dummy_table'
+  end
+end

data/spec/dummy/lib/engine.rb

@@ -0,0 +1,7 @@
+module Dummy
+  class Engine < ::Rails::Engine
+    initializer :dummy,  before: :load_init_rb do |app|
+      app.config.paths["db/migrate"].concat(config.paths["db/migrate"].expanded)
+    end
+  end
+end

data/spec/dummy/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

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

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  #
+end

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

@@ -0,0 +1,3 @@
+ActiveRecord::Schema.define do
+  #
+end

data/spec/dummy/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+# coding: utf-8
+require 'bundler/setup'
+require 'combustion'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Test your Rails Engines without needing a full Rails app
 email:
 - pat@freelancing-gods.com
@@ -72,6 +114,14 @@ files:
 - lib/combustion/application.rb
 - lib/combustion/database.rb
 - lib/combustion/generator.rb
+- spec/database_spec.rb
+- spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
+- spec/dummy/lib/engine.rb
+- spec/dummy/spec/internal/config/database.yml
+- spec/dummy/spec/internal/config/routes.rb
+- spec/dummy/spec/internal/db/schema.rb
+- spec/dummy/spec/internal/log/.gitignore
+- spec/spec_helper.rb
 - templates/config.ru
 - templates/database.yml
 - templates/routes.rb
@@ -96,8 +146,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Elegant Rails Engine Testing
-test_files: []
+test_files:
+- spec/database_spec.rb
+- spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb
+- spec/dummy/lib/engine.rb
+- spec/dummy/spec/internal/config/database.yml
+- spec/dummy/spec/internal/config/routes.rb
+- spec/dummy/spec/internal/db/schema.rb
+- spec/dummy/spec/internal/log/.gitignore
+- spec/spec_helper.rb