postgressor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac951676c1041a11f52a59de5c58154648a6d77a0a4d5828b8ac4a8045c352d9
-  data.tar.gz: b87bcf598f561ab1385de799a705417bc7d153f560f47fee655f7067de6775d6
+  metadata.gz: e3e6aec99892829719db0dcc79bd3f83937688d8cd6e3ed6a6846deea3171179
+  data.tar.gz: 9b036d82fdd5bc61d699ea5ee8ba89f6af5561ecd4d892d34deb919be0800beb
 SHA512:
-  metadata.gz: e971443893ae079d788c7b598dc635c0e887218ace8eac059932bfe30969168c98e1ca363c677524ba89af9b0418276d78efe32725faeca4f642f8a26731847c
-  data.tar.gz: b4778abdf4caa5e930982bb324ebed27a29350d47cd09d28b14b5d2916025e146699e4c98a002be05f1e0166908356a5699db44db22f03803355f7fd6e4eb260
+  metadata.gz: bd90c0e80fbc2d37418232f8c2dbc25ba26171512f79f9c9efb80352fcfaf87cea6cfffd5c878e15e885e71690b02382835fdb97931c7d75c393a75964540e15
+  data.tar.gz: 7afa9d9b0d2d2fc50fe0d275029f6d56397c876f8939b3127b60e6f8e604e1fbcd21338ac82e7eec4ed0bebf8c4fe429a73d5732e1c39333e92fef7a130f6025

data/README.md

@@ -1,5 +1,7 @@
 # Postgressor
 
+> **NEW:** added support for `config/database.yml` in version 0.2.0
+
 Get tired of typing the same commands over and over like creating Postgres user, database, creating and restoring database backups? Postgressor allow you to manage your (Postgres) application database and user within simple commands:
 
 ```
@@ -16,7 +18,11 @@ Commands:
   postgressor help [COMMAND]  # Describe available commands or one specific command
 ```
 
-All what you need is DATABASE_URL in format like: `DATABASE_URL="postgres://app_user:app_user_pass@host/app_db_name"`. Also Postgressor automatically check `.env` file (if present) **to read DATABASE_URL from there.**
+Postgressor can fetch required credentials from two sources:
+
+1. DATABASE_URL environment variable (default). Format: `DATABASE_URL="postgres://app_user:app_user_pass@host/app_db_name"`. Also postgressor automatically checks `.env` file (if present) **to read DATABASE_URL from there**.
+2. If DATABASE_URL env variable not present, postgressor will try to fetch credentials from `config/database.yml` (Rails style) file (if present). By default posgressor read `production` settings. If you want to use different environment, simply provide RAILS_ENV env before postgressor command. Example: `RAILS_ENV=development postressor createuser`.
+
 
 ## Installation
 

data/lib/postgressor/cli.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'thor'
 require 'dotenv/load'
+require 'yaml'
 
 module Postgressor
   class CLI < Thor
@@ -130,8 +131,27 @@ module Postgressor
 
     def preload!
       url = ENV["DATABASE_URL"]
-      raise "Env variable DATABASE_URL is not provided" if url.nil? || url.strip.empty?
 
+      if url.nil? || url.strip.empty?
+        # If DATABASE_URL env not present, try to read from config/database.yml (Rails)
+        if File.exist?("config/database.yml")
+          settings = YAML.load_file("config/database.yml")
+          # By default, use production config, if RAILS_ENV not provided
+          config = ENV["RAILS_ENV"] ? settings[ENV["RAILS_ENV"]] : settings["production"]
+
+          preload_from_database_yml(config)
+        else
+          raise "Env variable DATABASE_URL or config/database.yml file not provided"
+        end
+      else
+        preload_from_database_url(url)
+      end
+
+      @pg_cli_args = ["-h", @conf[:host], "-U", @conf[:user]]
+      @pg_cli_args += ["-p", @conf[:port].to_s] if @conf[:port]
+    end
+
+    def preload_from_database_url(url)
       uri = URI.parse(url)
       raise "DB adapter is not postgres" if uri.scheme != "postgres"
 
@@ -143,9 +163,19 @@ module Postgressor
         user: uri.user,
         password: uri.password
       }
+    end
 
-      @pg_cli_args = ["-h", @conf[:host], "-U", @conf[:user]]
-      @pg_cli_args += ["-p", @conf[:port].to_s] if @conf[:port]
+    def preload_from_database_yml(config)
+      raise "DB adapter is not postgres" if config["adapter"] != "postgresql"
+
+      @conf = {
+        url: nil,
+        db: config["database"],
+        host: config["host"],
+        port: config["port"],
+        user: config["username"],
+        password: config["password"]
+      }
     end
   end
 end

data/lib/postgressor/version.rb

@@ -1,3 +1,3 @@
 module Postgressor
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgressor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Victor Afanasev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor