doppler-client 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb08eeff831da656b658d211696f8fc98b9c306
-  data.tar.gz: f80ffc0eee91e244d990bbc06bda63882ee46a4d
+  metadata.gz: e70c73c3d8540dab77ce8289398cd3c2f731d9f6
+  data.tar.gz: 8a1d7b5e816df0023d5d75e2593f383811193090
 SHA512:
-  metadata.gz: 7127af99279f088c652c1e90e4b1644c78a02d140729c0e52b4210e5bf4b4776e4c35f71635006899fd78a02ec471825497930862170b1f5d1c255006bfb79e2
-  data.tar.gz: 0d8c635f4911b7f92edf01b1754c200a60effe17665fe00e5a8ef5828f02b950822afd06bc891395120409186c94c169f8f27c67d41b461a4fb78c864929a55d
+  metadata.gz: 801682828160e601e16147f06db404019a8b65e2aff722910452cd15fe89be8572e47e7fdc14d1df3b420bf0229dc14d3578ffdea0c33bedc53b966624994513
+  data.tar.gz: 594a85c3d6c109686d8528ee38bcdf73a400a71421763f5632fe7f4fb89020128c21a9f1560c9e22897574fa54a4fe47dada0d1cea12321a1d10155da001b4ce

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/DopplerHQ/ruby-client" }
+git_source(:github) { "https://github.com/DopplerHQ/ruby-client" }
 
 # Specify your gem's dependencies in doppler-client.gemspec
 gemspec

data/README.md

@@ -1,6 +1,7 @@
 # Doppler Ruby Library
 
 [![image](https://img.shields.io/gem/v/doppler-client.svg)](https://rubygems.org/gems/doppler-client)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/92ec3d37764c40da8dffb6a85c6cbfa4)](https://www.codacy.com/app/Doppler/ruby-client?utm_source=github.com&utm_medium=referral&utm_content=DopplerHQ/ruby-client&utm_campaign=Badge_Grade)
 
 The Doppler Ruby library provides convenient access to the Doppler API from
 applications written for **only** server-side code.
@@ -28,7 +29,6 @@ doppler = Doppler::Client.new(
 # Rest of Application
 ```
 
-
 ## Key Best Practices
 
 So if Doppler stores my environment keys, where should I keep my Doppler API keys?
@@ -36,7 +36,6 @@ So if Doppler stores my environment keys, where should I keep my Doppler API key
 That is a great question! We recommend storing your `API_KEY`, `PIPELINE_ID`, and `ENVIRONMENT_NAME` 
 in local environment. That means the only keys you should be storing in your local environment are the Doppler keys. All other keys should be be fetched by the Doppler client.
 
-
 ### Fetch Environment Keys
 
 You can fetch your environment keys from Doppler by calling the `get(name)` method.
@@ -55,7 +54,6 @@ config = {
 
 ```
 
-
 If there are differences between the values your local environment sets and the ones on Doppler, the client will use the ones provided by Doppler. You can override this behavior by passing in a second argument to the `get(key_name, priority)` method that sets the priority to favor your local environment.
 
 For example:
@@ -87,7 +85,6 @@ doppler = Doppler::Client.new(
 
 ```
 
-
 ## Local Key Privacy
 
 By default the Doppler client will only track the local environment keys that are used during `doppler.get()`.
@@ -111,7 +108,6 @@ doppler = Doppler::Client.new(
 )
 ```
 
-
 ### Ignoring Specific Keys
 Inversely, you can also ignore specific local keys by adding them to the `ignore_keys` array.
 
@@ -128,9 +124,7 @@ doppler = Doppler::Client.new(
 )
 ```
 
-
 ## Extra Information
 
 - [Doppler](https://doppler.market)
 - [API KEY](https://doppler.market/workplace/api_key)
-

data/doppler-client.gemspec

@@ -1,9 +1,11 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require "doppler/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "doppler-client"
-  spec.version       = "0.1.2"
+  spec.version       = Doppler::VERSION
   spec.authors       = ["Doppler Team"]
   spec.email         = "brian@doppler.market"
 

data/lib/{doppler/client.rb → doppler.rb}

@@ -2,24 +2,22 @@ require 'net/https'
 require 'json'
 require 'set'
 
+require "doppler/version"
+
 module Doppler
   class Priority
-    @@local = 0
+    @local = 0
     def self.local
-        @@local
+        @local
     end
 
-    @@remote = 1
+    @remote = 1
     def self.remote
-        @@remote
+        @remote
     end
   end
 
   class Client
-    @@host_key = 'DOPPLER_HOST'
-    @@default_host = 'https://api.doppler.market'
-    @@environ_segment = '/environments/'
-    @@max_retries = 0
 
     def initialize(api_key, pipeline, environment, priority = Priority.remote, track_keys = [], ignore_keys = [])
         raise ArgumentError, 'api_key not string' unless api_key.is_a? String
@@ -35,8 +33,11 @@ module Doppler
         @default_priority = priority
         @track_keys = track_keys.to_set
         @ignore_keys = ignore_keys.to_set
-        @host = ENV[@@host_key] ? ENV[@@host_key] : @@default_host
-        
+        @max_retries = 10
+        @environ_segment = '/environments/'
+        @default_host = 'https://api.doppler.market'
+        @host = ENV['DOPPLER_HOST'].nil? ? @default_host : ENV['DOPPLER_HOST']
+                
         startup()
     end
 
@@ -60,7 +61,7 @@ module Doppler
     end
 
     def get(key_name, priority = nil)
-        priority = priority != nil ? priority : @default_priority
+        priority = priority.nil? ? @default_priority : priority
         value = nil
         
         if priority == Priority.local
@@ -69,8 +70,8 @@ module Doppler
             value = @remote_keys[key_name] ? @remote_keys[key_name] : ENV[key_name]
         end
         
-        if not @ignore_keys.include?(key_name)
-              if value != nil
+        unless @ignore_keys.include?(key_name)
+              if !value.nil?
                 if ENV[key_name] != @remote_keys[key_name]
                     local_keys = {}
                     local_keys[key_name] = ENV[key_name]
@@ -93,12 +94,14 @@ module Doppler
     def _request(endpoint, body, retry_count=0)
         raise ArgumentError, 'endpoint not string' unless endpoint.is_a? String
 
-        raw_url = @host + @@environ_segment + @environment + endpoint
+        raw_url = @host + @environ_segment + @environment + endpoint
         uri = URI.parse(raw_url)
         header = {
             'Content-Type': 'application/json',
             'api-key': @api_key,
-            'pipeline': @pipeline
+            'pipeline': @pipeline,
+            'client-sdk': 'ruby',
+            'client-version': Doppler::VERSION
 
         }
         http = Net::HTTP.new(uri.host, uri.port)
@@ -113,7 +116,7 @@ module Doppler
         rescue => e
             retry_count += 1
 
-            if retry_count > @@max_retries
+            if retry_count > @max_retries
                 raise e
             else
                 return _request(endpoint, body, retry_count)

data/lib/doppler/version.rb

@@ -0,0 +1,3 @@
+module Doppler
+  VERSION = "0.1.4".freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doppler-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Doppler Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,8 @@ files:
 - bin/console
 - bin/setup
 - doppler-client.gemspec
-- lib/doppler/client.rb
+- lib/doppler.rb
+- lib/doppler/version.rb
 homepage: https://github.com/DopplerHQ/ruby-client
 licenses:
 - Apache-2.0