capistrano3-postgres 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1823e5322b73aef1707629d1de248d157cd8620
-  data.tar.gz: a724ae00fb4140bb00d173d7464ba9a3842d7fd8
+  metadata.gz: 8859ae778f1e88395c55b8d31281ccb50f315ea9
+  data.tar.gz: 32712b243c9970b79f692a105bd9119119a6ddfd
 SHA512:
-  metadata.gz: a96d1e6c8d2259c76a81f21042fa1bf4b08b91ca3423c41a76992f74f47f88f963b282ea822e41371db5d74c70daf2aeecd62cd3e50426c3ad79dd494897b1ce
-  data.tar.gz: e55fca4756984d06bb0519bec5c54fdabac9e39854175e6afee747d6765667a73d2ece519603cf8bc7d731be50b6f0f857f2d6bd90520562423af0b27bee115c
+  metadata.gz: 01c3262ae551f2b7276e8def589ae642a7c50032dd2602ccd1475d632737fddc5dbf5db645dfc199bddf772707178dd1c687514b71c5041ab66461760e9c328f
+  data.tar.gz: e170faa00dad23c3ba9cce1d301169b4d5a45c907e7e97162a294bc2576a3f3d1fb8aff62c7af32ad95bf726d9e019f6cb3433fc655be7db620bc5402ecb1b87

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## 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.
+Capistrano3::Postgres supports [Dotenv](https://github.com/bkeepers/dotenv) and [Figaro](https://github.com/laserlemon/figaro) gems and automatically loads environment variables from `.env`/`application.yml` 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.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/capistrano3/tasks/postgres.rb

@@ -141,7 +141,7 @@ namespace :postgres do
         env = fetch(:postgres_env).to_s.downcase
         filename = "#{deploy_to}/current/config/database.yml"
         eval_yaml_with_erb = <<-RUBY.strip
-          #{env_variables_loader_code}
+          #{env_variables_loader_code(env)}
           require 'erb'
           puts ERB.new(File.read('#{filename}')).result
         RUBY
@@ -160,10 +160,12 @@ namespace :postgres do
   # Load environment variables for configurations.
   # Useful for such gems as Dotenv, Figaro, etc.
   def preload_env_variables(env)
-    safely_require_gems('dotenv')
+    safely_require_gems('dotenv', 'figaro')
 
     if defined?(Dotenv)
       load_env_variables_with_dotenv(env)
+    elsif defined?(Figaro)
+      load_env_variables_with_figaro(env)
     end
   end
 
@@ -175,6 +177,13 @@ namespace :postgres do
     )
   end
 
+  def load_env_variables_with_figaro(env)
+    config = 'config/application.yml'
+
+    Figaro.application = Figaro::Application.new(environment: env, path: config)
+    Figaro.load
+  end
+
   def safely_require_gems(*gem_names)
     gem_names.each do |name|
       begin
@@ -187,14 +196,20 @@ namespace :postgres do
 
   # Requires necessary gems (Dotenv, Figaro, ...) if present
   # and loads environment variables for configurations
-  def env_variables_loader_code
+  def env_variables_loader_code(env)
     <<-RUBY.strip
       begin
         require 'dotenv'
-        Dotenv.load(
-          File.expand_path('.env.production'),
-          File.expand_path('.env')
-        )
+        Dotenv.load(File.expand_path('.env.#{env}'), File.expand_path('.env'))
+      rescue LoadError
+      end
+
+      begin
+        require 'figaro'
+        config = File.expand_path('../config/application.yml', __FILE__)
+
+        Figaro.application = Figaro::Application.new(environment: env, path: config)
+        Figaro.load
       rescue LoadError
       end
     RUBY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alex Krasynskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create, download and restore postgres database.