dotenv_rails_db_tasks_fix 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cdbc7371e683a8fffbeb782c080b6e4a6eeb5b004c0ea9ecd20f6bf0ff33db9
-  data.tar.gz: eff0da22841e866e4c63dbb5d1c400a992e78c854c73dbcc7a6c61c35209e0e8
+  metadata.gz: 8127fe472de6728fa0d18707961b69b73b4067866a2425f87a38eec321e46d47
+  data.tar.gz: 64028a6e992a511022449f0613a269b91efc2fbc697d98945c9a7ae8dd3e3f70
 SHA512:
-  metadata.gz: adf98752b518ccf7d585951a420b7a2268cc8d6cd42c8b4253bae0ca138765185351042b6192ac6baa2300c8cfc6c2e2f69cdd9ca8cd33541b1d4c7680ff7e5b
-  data.tar.gz: f14069f3af974b9b23234310b782a7e38980287c146ebe1004dc7e3ac8019186466e42f45a78f9ec1d900bee306e0c5d62d576bf7db4a4f50ad34e5fb7fc2fce
+  metadata.gz: f36e0a137fe0a32359f56ca1ae097088dfc7f59c82c797996e880c28194f57e6b18676cf3982b465e3abe47d45e858087f996faf3e1d2e2e27af84141bb77f89
+  data.tar.gz: 1e86e695b50432c8e713d01ce857f84deaec78088e9a350c31a0542ae6faba894d111024f120178f4e89d63edce62ef7f50ce1f4fb8e2e034b91b287f6ccb417

data/README.md

@@ -1,8 +1,8 @@
 # DotenvRailsDbTasksFix
 
-#### 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.
+#### Fix for the issue when ActiveRecord `rake db:*` tasks are magically executed in both development and test environments, but environment variables loaded via `dotenv` are not picking up the change.
 
-*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).*
+*You are viewing the README of version [v0.3.0](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/releases/tag/v0.3.0). You can find other releases [here](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix/releases).*
 
 | Branch | Status |
 | ------ | ------ |
@@ -78,13 +78,16 @@ ActiveRecord has this feature that it executes DB tasks in `test` env as well if
 
 Dotenv's recommendation is to use different env var names (e.g. `TEST_DB_NAME`, `DEVELOPMENT_DB_NAME`) but that would be counter-intuitive. Instead via this gem `ActiveRecord::Tasks::DatabaseTasks` is monkey patched to explicitly reload env vars and the DB config when it switches to test env. *This approach undoubtedly has its cons but in this case it only affects the development environment and restores the expected behaviour of this widely used feature therefore sparing the annoyance and possible effort of investigation.*
 
-See also [this issue](https://github.com/thisismydesign/dotenv_rails_db_tasks_fix) and [this article](http://www.zhuwu.me/blog/posts/rake-db-tasks-always-runs-twice-in-development-environment).
+See also [this issue](https://github.com/rails/rails/issues/32926) and [this article](http://www.zhuwu.me/blog/posts/rake-db-tasks-always-runs-twice-in-development-environment).
+
+## Version support
+
+Supports `ActiveRecord` 5.0.0 - 5.2.0. For certain versions of ActiveRecord 4 you can explicitly set `RAILS_ENV` to `development` to avoid execution in `test` env ([see e.g. 4.2](https://github.com/rails/rails/blob/v4.2.0/activerecord/lib/active_record/tasks/database_tasks.rb#L271)).
 
 ## Caveats
 
 - 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/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
 

data/dotenv_rails_db_tasks_fix.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "dotenv"
-  spec.add_dependency "activerecord", ">= 5.1.5", "~> 5.1.6"
+  spec.add_dependency "dotenv", ">= 0.10.0" # `overload` introduced https://github.com/bkeepers/dotenv/commit/4cafc36c0c36a0eb243a37d2e18d26be3dab3d43#diff-299309060038a014968e16897bf9e21d
+  spec.add_dependency "activerecord", ">= 5.0.0", "<= 5.2.0"
 
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/dotenv_rails_db_tasks_fix.rb

@@ -30,7 +30,16 @@ module DotenvRailsDbTasksFix
 
           db_config = Pathname.new(self.root).join("config", "database.yml")
           config = YAML::load(ERB.new(File.read(db_config)).result)
-          yield config[environment], environment if config[environment]["database"]
+
+          active_record_version = Gem::Version.new(ActiveRecord.version)
+
+          if active_record_version < Gem::Version.new("5.1.5")
+            # https://github.com/rails/rails/blob/v5.1.0/activerecord/lib/active_record/tasks/database_tasks.rb#L298-L306
+            yield config[environment] if config[environment]["database"]
+          else
+            # https://github.com/rails/rails/blob/v5.1.5/activerecord/lib/active_record/tasks/database_tasks.rb#L298-L307
+            yield config[environment], environment if config[environment]["database"]
+          end
         end
       end
     end

data/lib/dotenv_rails_db_tasks_fix/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv_rails_db_tasks_fix
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - thisismydesign
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.5
-    - - "~>"
+        version: 5.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.5
-    - - "~>"
+        version: 5.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement