doppler 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69b112d5d1d5dbf328711c0f22f1c02be2f4afb8
-  data.tar.gz: 89663dbd70d8c5afddebb2b98cfbbf3a19a64d34
+  metadata.gz: 5d303fcb3660df971db06bd9c2206d06c8a2e0e5
+  data.tar.gz: 876807ca51165604c8f5b2126febfd486616643c
 SHA512:
-  metadata.gz: c532bc666dacd189406cf42b2c1ca580956667ea745cf7829cb1bef32180c75fd84f98986e6054210a58957fab48c6206fdd8866867e8873d0afaed1aa081de5
-  data.tar.gz: 3ccf3ff1b647be6a1cc630764cdae2933fa1c6c101e17b2ab1cfd91505063adc4cac06d747c75b38025437f2f7257efc0e247e358bb84d42c687d1f7a50c342b
+  metadata.gz: 660925bf24c7e24c4cebf2d5d530ab4c8b42dee09bc62186e8868eb007801e72307ae17e11f7d2af34471f3435041d0dec750a607e6c7cf0a8556f4fd8a15b55
+  data.tar.gz: baf51f7cbb44c352a353797da9e4c2b23be4b13777fbb7300f371b079ceae220241c97b8cc47d4800b5733d091a24bc5d81e6a155f8040087e48b7c653f36f4d

data/README.md

@@ -20,7 +20,7 @@ The package needs to be configured with your account's api key which is availabl
 
 
 ### Environment Variables Required
-Please add these environment variables to your `.env` file or infra provider.
+Please add these environment variables to your `.env` file in the root directory or on your infra provider.
 
 ```
 DOPPLER_API_KEY = <API Key>
@@ -28,7 +28,15 @@ DOPPLER_PIPELINE = <Pipeline ID>
 DOPPLER_ENVIRONMENT = <Environment Name>
 ```
 
-### Simple Install
+### Lookup Priority
+Doppler will look for these variables in 3 places with the following priority:
+
+1. Passed in as initialization arguments
+2. Read from environment variables
+3. Read from `.env` file
+
+
+### Install with Environment Variables
 This installation method will expect the `DOPPLER_API_KEY`, `DOPPLER_PIPELINE`, `DOPPLER_ENVIRONMENT` as environment variables.
 
 ``` ruby
@@ -38,6 +46,22 @@ Doppler::Client.new()
 # Rest of Application
 ```
 
+### Install with ENV File
+This installation method will expect the `DOPPLER_API_KEY`, `DOPPLER_PIPELINE`, `DOPPLER_ENVIRONMENT` in a `.env` file.
+
+``` ruby
+require "doppler"
+
+Doppler.configure do |config|
+  config.env_filepath = ".env"   # Defaults to ".env"
+end
+
+
+Doppler::Client.new()
+
+# Rest of Application
+```
+
 ### Install with Arguments
 This installation method will expect the `api_key`, `pipeline`, `environment` as arguments.
 

data/lib/doppler.rb

@@ -54,10 +54,44 @@ module Doppler
   def self.backup_filepath
     @@backup_filepath
   end
+  
+  # configure env file
+  @@env_filepath = ".env"
+  def self.env_filepath=(env_filepath)
+    @@env_filepath = env_filepath
+  end
+  def self.env_filepath
+    @@env_filepath
+  end
+  
+  # read env file
+  def self.read_env(path)
+    if path.nil? or !File.file?(path)
+      return nil
+    end
+    
+    keys = {}
+    File.open(path, "r") do |file|
+      file.each do |line|
+        parts = line.strip.split("=")
+        
+        if parts.length == 2
+          keys[parts[0].strip] = parts[1].strip
+        end
+      end
+    end
+    
+    return keys
+  end
 
   # helper to configure above variables.
   def self.configure
     yield(self)
+    
+    env_file = self.read_env(self.env_filepath) || {}
+    self.api_key = self.api_key || env_file["DOPPLER_API_KEY"]
+    self.pipeline = self.pipeline || env_file["DOPPLER_PIPELINE"]
+    self.environment = self.environment || env_file["DOPPLER_ENVIRONMENT"]
   end
   
 end

data/lib/doppler/client.rb

@@ -87,23 +87,14 @@ module Doppler
         retry_count += 1
 
         if retry_count > MAX_RETRIES
-          if Doppler.backup_filepath.nil? or !File.file?(Doppler.backup_filepath)
-            raise e
-          end
+          backup_env = Doppler.read_env(Doppler.backup_filepath)
           
-          keys = {}
-          File.open(Doppler.backup_filepath, "r") do |file|
-            file.each do |line| 
-              parts = line.strip!.split("=")
-              
-              if parts.length == 2
-                keys[parts[0]] = parts[1]
-              end
-            end
+          if backup_env.nil?
+            raise e
           end
           
           data = {}
-          data["variables"] = keys
+          data["variables"] = backup_env
           return data
           
         else

data/lib/doppler/version.rb

@@ -1,3 +1,3 @@
 module Doppler
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doppler
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Doppler Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler