capistrano3-postgres 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a3a110edbbe9a631690e324e2fe5402e444de96
-  data.tar.gz: f5b91f729e650b86a166a5c4b8703227f98625ad
+  metadata.gz: c1823e5322b73aef1707629d1de248d157cd8620
+  data.tar.gz: a724ae00fb4140bb00d173d7464ba9a3842d7fd8
 SHA512:
-  metadata.gz: da5572d5f31aa6a3db436d9684760c22129ef75cfa80cf3a81a77feead971cc620eff0e7524ddcb49438f44d8503a1aadae6ada3eea6c41f33dc96067ffa536c
-  data.tar.gz: b34dfa9ef2b055d4d24349487ecb08eff84f73041e500125ccf394654adef4d6cb9a66799142acf50481bbb77475a14d5185cfd4a45de58c9dc2a094d4e7642a
+  metadata.gz: a96d1e6c8d2259c76a81f21042fa1bf4b08b91ca3423c41a76992f74f47f88f963b282ea822e41371db5d74c70daf2aeecd62cd3e50426c3ad79dd494897b1ce
+  data.tar.gz: e55fca4756984d06bb0519bec5c54fdabac9e39854175e6afee747d6765667a73d2ece519603cf8bc7d731be50b6f0f857f2d6bd90520562423af0b27bee115c

data/README.md

@@ -19,6 +19,9 @@ Or install it yourself as:
     $ gem install capistrano3-postgres
 
 ## Usage
+
+Capistrano3::Postgres supports [Dotenv](https://github.com/bkeepers/dotenv) gem and automatically loads environment variables from `.env` files if they are used in the project.
+
 ```ruby
     # Capfile
 

data/lib/capistrano3/postgres/version.rb

@@ -1,5 +1,5 @@
 module Capistrano3
   module Postgres
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/capistrano3/tasks/postgres.rb

@@ -12,9 +12,7 @@ namespace :load do
 end
 
 namespace :postgres do
-
   namespace :backup do
-
     desc 'Create database dump'
     task :create do
       on roles(fetch(:postgres_role)) do |role|
@@ -128,7 +126,8 @@ namespace :postgres do
     on roles(fetch(:postgres_role)) do |role|
       run_locally do
         env = 'development'
-        yaml_content = ERB.new(capture "cat config/database.yml").result
+        preload_env_variables(env)
+        yaml_content = ERB.new(capture 'cat config/database.yml').result
         set :postgres_local_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
       end
     end
@@ -141,7 +140,13 @@ namespace :postgres do
       within release_path do
         env = fetch(:postgres_env).to_s.downcase
         filename = "#{deploy_to}/current/config/database.yml"
-        capture_config_cmd = "ruby -e \"require 'erb'; puts ERB.new(File.read('#{filename}')).result\""
+        eval_yaml_with_erb = <<-RUBY.strip
+          #{env_variables_loader_code}
+          require 'erb'
+          puts ERB.new(File.read('#{filename}')).result
+        RUBY
+
+        capture_config_cmd = "ruby -e \"#{eval_yaml_with_erb}\""
         yaml_content = test('ruby -v') ? capture(capture_config_cmd) : capture(:bundle, :exec, capture_config_cmd)
         set :postgres_remote_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
       end
@@ -152,4 +157,46 @@ namespace :postgres do
     { 'host' => 'localhost' }
   end
 
+  # Load environment variables for configurations.
+  # Useful for such gems as Dotenv, Figaro, etc.
+  def preload_env_variables(env)
+    safely_require_gems('dotenv')
+
+    if defined?(Dotenv)
+      load_env_variables_with_dotenv(env)
+    end
+  end
+
+  def load_env_variables_with_dotenv(env)
+    Dotenv.load(
+      File.expand_path('.env.local'),
+      File.expand_path(".env.#{env}"),
+      File.expand_path('.env')
+    )
+  end
+
+  def safely_require_gems(*gem_names)
+    gem_names.each do |name|
+      begin
+        require name
+      rescue LoadError
+        # Ignore if gem doesn't exist
+      end
+    end
+  end
+
+  # Requires necessary gems (Dotenv, Figaro, ...) if present
+  # and loads environment variables for configurations
+  def env_variables_loader_code
+    <<-RUBY.strip
+      begin
+        require 'dotenv'
+        Dotenv.load(
+          File.expand_path('.env.production'),
+          File.expand_path('.env')
+        )
+      rescue LoadError
+      end
+    RUBY
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alex Krasynskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano