dotenv_rails_db_tasks_fix 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab842233cb330350cc2a4fa074cc42a313cc9520427768d6033c2bbf2aab67ba
-  data.tar.gz: 53aa623b5c8e2f2e930c62377ec7206bbef0166009802934342b07afde348340
+  metadata.gz: 7cdbc7371e683a8fffbeb782c080b6e4a6eeb5b004c0ea9ecd20f6bf0ff33db9
+  data.tar.gz: eff0da22841e866e4c63dbb5d1c400a992e78c854c73dbcc7a6c61c35209e0e8
 SHA512:
-  metadata.gz: fd703d7e2bbc0c48c57bc5d40b95976c420e2f0c276c8865570d03f4708aa9dac2f5de8bec39ba62a27425b67f598b56b63f6c2db72a697023051c54c5c0bc39
-  data.tar.gz: 2381d0d03e5036c10574068d80c8eb1796a910a6a446ac0d94e8a3379dae1ee5c3ffd78485f7615cba5925ef1d5ad57d8913cfc87ad5cb3d216fdcbe093edccd
+  metadata.gz: adf98752b518ccf7d585951a420b7a2268cc8d6cd42c8b4253bae0ca138765185351042b6192ac6baa2300c8cfc6c2e2f69cdd9ca8cd33541b1d4c7680ff7e5b
+  data.tar.gz: f14069f3af974b9b23234310b782a7e38980287c146ebe1004dc7e3ac8019186466e42f45a78f9ec1d900bee306e0c5d62d576bf7db4a4f50ad34e5fb7fc2fce

data/.env.development

@@ -1 +1 @@
-DB_DATABASE=development
+DB_DATABASE=file:mem_db_development?mode=memory

data/.env.test

@@ -1 +1 @@
-DB_DATABASE=test
+DB_DATABASE=file:mem_db_test?mode=memory

data/README.md

@@ -2,7 +2,7 @@
 
 #### Fix for the issue when ActiveRecord `rake db:*` tasks are magically executed in both developement and test environments, but environment variables loaded via `dotenv` are not picking up the change.
 
-*You are viewing the README of version [v0.2.0](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/releases/tag/v0.2.0). You can find other releases [here](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/releases).*
+*You are viewing the README of version [v0.2.1](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/releases/tag/v0.2.1). You can find other releases [here](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/releases).*
 
 | Branch | Status |
 | ------ | ------ |
@@ -85,7 +85,7 @@ See also [this issue](https://github.com/thisismydesign/dotenv_rails_db_tasks_fi
 - Outside of `development` environment `DotenvRailsDbTasksFix.activate` will `raise` and will _not_ monkey patch
 - Database config is expected to reside in Rails default `#{DatabaseTasks.root}/config/database.yml` (if you're using Rails `DatabaseTasks.root == Rails.root`)
 - Requires ActiveRecord >= 5.1.5, ~> 5.1.6 (because there're slight differences in the private API, althoguh following this solution it would be easy to extend support for other versions)
-- There's some weirdness with `Rails.env` vs `DatabaseTasks.env`. From trial-and-error it seems changing `DatabaseTasks.env` to reflect the current execution env will result in issues (with e.g. `db:setup` and `db:reset`), while changing `Rails.env` is actually required for `db:setup` to work correctly. [This fix](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/blob/be83ad6f97e4c1eb4bcfb5a2860eb3b53d7ff063/lib/dotenv_rails_db_tasks_fix.rb#L24-L28) seems to work for the use cases I tried but it's good to keep this in mind in case any similar issue presents.
+- There's some weirdness with `Rails.env` vs `DatabaseTasks.env`. From trial-and-error it seems changing `DatabaseTasks.env` to reflect the current execution env will result in issues (with e.g. `db:setup` and `db:reset`), while changing `Rails.env` is actually required for `db:setup` to work correctly. [This fix](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/blob/v0.2.0/lib/dotenv_rails_db_tasks_fix.rb#L25-L29) seems to work for the use cases I tried but it's good to keep this in mind in case any similar issue presents. This might be due to this issue: https://github.com/rails/rails/issues/32910
 - If you introduce this to a project currently in use a final `db:environment:set` might be needed if prompted
 
 ## Installation

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'dotenv'
+require "dotenv"
+require "yaml"
+require "erb"
 
 require_relative "lib/dotenv_rails_db_tasks_fix"
 require_relative "spec/support/active_record_tasks"
@@ -12,8 +14,17 @@ task :default => :spec
 RSPEC_ROOT = Pathname.new(File.dirname(__FILE__)).join("spec")
 environment = ENV["RAILS_ENV"] || "development"
 project_path = Pathname.new(RSPEC_ROOT).join("example_project")
+class Seeder; def load_seed; end; end
+# Root path has to be execution path, see: https://github.com/rails/rails/issues/32910
+# Config is expected at `#{root}/config/database.yml`
+# If the issue above is fixed it can be moved to `#{root}/spec/example_project/config/database.yml`
+root = Pathname.new(".")
+db_config = root.join("config", "database.yml")
+db_dir = root.join("config")
 
 Dotenv.overload(".env", ".env.#{environment}", ".env.local", ".env.#{environment}.local")
-load_active_record_tasks(project_path: project_path, env: environment)
+config = YAML::load(ERB.new(File.read(db_config)).result)
+
+load_active_record_tasks(database_configuration: config, root: root, db_dir: db_dir, seed_loader: Seeder.new)
 
 DotenvRailsDbTasksFix.activate

data/config/database.yml

@@ -0,0 +1,7 @@
+development:
+  adapter: sqlite3
+  database: <%= ENV["DB_DATABASE"] %>
+
+test:
+  adapter: sqlite3
+  database: <%= ENV["DB_DATABASE"] %>

data/lib/dotenv_rails_db_tasks_fix/version.rb

@@ -1,3 +1,3 @@
 module DotenvRailsDbTasksFix
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv_rails_db_tasks_fix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - thisismydesign
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -132,6 +132,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/database.yml
+- config/schema.rb
 - dotenv_rails_db_tasks_fix.gemspec
 - lib/dotenv_rails_db_tasks_fix.rb
 - lib/dotenv_rails_db_tasks_fix/version.rb