vault 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933d25d03026ad5f7cfd36a4497b3a73dc85a948
-  data.tar.gz: 84346c63501c8cfbe638e5e7d06f1764cc7f7a86
+  metadata.gz: 49716b95ff7c1b7e1a0a8a2d453ead50ff87c958
+  data.tar.gz: feaa17a437a8b90822902c3242bd0cd1d6ad9e82
 SHA512:
-  metadata.gz: f1e82fc4b467b617a07685f3d7feb4d0c9f9dbe57a78c636f55306fd21d82db2a9310359d599911774f0ad16c3b4752cec0d24177980e810b6fb9dba62660f36
-  data.tar.gz: 794835b7143c14d711d1f8c16e43c84f97fa21377151e52f2546934a970fe3e1fce84406cec320373031b501eb43747b694e29f6f9839843ebab4f944e8e2528
+  metadata.gz: 92a96b4abdfd34d4c9432d4ef1e04a4619b855d10c5432d89620f3095b958f4982d188e9251697683cabcf803c112608e645919819068fcd7cb0508474dd01ff
+  data.tar.gz: 2757bdad26d92299f73ded6cefca605f4f28c528737f6ab790303c61634e15000c1d8ed08fee299bfb5ec5ffcf245884814acd87c91e22d5b85033ded005ea41

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Vault Ruby Changelog
 
+## v0.7.3 (October 25, 2016)
+
+BUG FIXES
+
+- Allow options to be set on `Vault` as well as any `Vault::Client`
+  instance to be used properly.
+- Remove Ruby 2.0 syntax in favor of Ruby 1.9
+
 ## v0.7.2 (October 24, 2016)
 
 BUG FIXES

data/lib/vault/client.rb

@@ -75,72 +75,85 @@ module Vault
         instance_variable_set(:"@#{key}", value)
       end
 
-      @nhp = PersistentHTTP.new(name: "vault-ruby")
+      @lock = Mutex.new
+      @nhp = nil
+    end
+
+    def pool
+      @lock.synchronize do
+        return @nhp if @nhp
+
+        @nhp = PersistentHTTP.new(name: "vault-ruby")
 
-      if proxy_address
-        proxy_uri = URI.parse "http://#{proxy_address}"
+        if proxy_address
+          proxy_uri = URI.parse "http://#{proxy_address}"
 
-        proxy_uri.port = proxy_port if proxy_port
+          proxy_uri.port = proxy_port if proxy_port
 
-        if proxy_username
-          proxy_uri.user = proxy_username
-          proxy_uri.password = proxy_password
+          if proxy_username
+            proxy_uri.user = proxy_username
+            proxy_uri.password = proxy_password
+          end
+
+          @nhp.proxy = proxy_uri
         end
 
-        @nhp.proxy = proxy_uri
-      end
+        # Use a custom open timeout
+        if open_timeout || timeout
+          @nhp.open_timeout = (open_timeout || timeout).to_i
+        end
 
-      # Use a custom open timeout
-      if open_timeout || timeout
-        @nhp.open_timeout = (open_timeout || timeout).to_i
-      end
+        # Use a custom read timeout
+        if read_timeout || timeout
+          @nhp.read_timeout = (read_timeout || timeout).to_i
+        end
 
-      # Use a custom read timeout
-      if read_timeout || timeout
-        @nhp.read_timeout = (read_timeout || timeout).to_i
-      end
+        @nhp.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
-      @nhp.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        # Vault requires TLS1.2
+        @nhp.ssl_version = "TLSv1_2"
 
-      # Vault requires TLS1.2
-      @nhp.ssl_version = "TLSv1_2"
+        # Only use secure ciphers
+        @nhp.ciphers = ssl_ciphers
 
-      # Only use secure ciphers
-      @nhp.ciphers = ssl_ciphers
+        # Custom pem files, no problem!
+        pem = ssl_pem_contents || (ssl_pem_file ? File.read(ssl_pem_file) : nil)
+        if pem
+          @nhp.cert = OpenSSL::X509::Certificate.new(pem)
+          @nhp.key = OpenSSL::PKey::RSA.new(pem, ssl_pem_passphrase)
+        end
 
-      # Custom pem files, no problem!
-      pem = ssl_pem_contents || (ssl_pem_file ? File.read(ssl_pem_file) : nil)
-      if pem
-        @nhp.cert = OpenSSL::X509::Certificate.new(pem)
-        @nhp.key = OpenSSL::PKey::RSA.new(pem, ssl_pem_passphrase)
-      end
+        # Use custom CA cert for verification
+        if ssl_ca_cert
+          @nhp.ca_file = ssl_ca_cert
+        end
 
-      # Use custom CA cert for verification
-      if ssl_ca_cert
-        @nhp.ca_file = ssl_ca_cert
-      end
+        # Use custom CA path that contains CA certs
+        if ssl_ca_path
+          @nhp.ca_path = ssl_ca_path
+        end
 
-      # Use custom CA path that contains CA certs
-      if ssl_ca_path
-        @nhp.ca_path = ssl_ca_path
-      end
+        if ssl_cert_store
+          @nhp.cert_store = ssl_cert_store
+        end
 
-      if ssl_cert_store
-        @nhp.cert_store = ssl_cert_store
-      end
+        # Naughty, naughty, naughty! Don't blame me when someone hops in
+        # and executes a MITM attack!
+        if !ssl_verify
+          @nhp.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
 
-      # Naughty, naughty, naughty! Don't blame me when someone hops in
-      # and executes a MITM attack!
-      if !ssl_verify
-        @nhp.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
+        # Use custom timeout for connecting and verifying via SSL
+        if ssl_timeout || timeout
+          @nhp.ssl_timeout = (ssl_timeout || timeout).to_i
+        end
 
-      # Use custom timeout for connecting and verifying via SSL
-      if ssl_timeout || timeout
-        @nhp.ssl_timeout = (ssl_timeout || timeout).to_i
+        @nhp
       end
     end
 
+    private :pool
+
     # Creates and yields a new client object with the given token. This may be
     # used safely in a threadsafe manner because the original client remains
     # unchanged. The value of the block is returned.
@@ -253,7 +266,7 @@ module Vault
       begin
         # Create a connection using the block form, which will ensure the socket
         # is properly closed in the event of an error.
-        response = @nhp.request(uri, request)
+        response = pool.request(uri, request)
 
         case response
         when Net::HTTPRedirection

data/lib/vault/persistent.rb

@@ -505,7 +505,7 @@ class PersistentHTTP
   # Defaults to 1/4 the number of allowed file handles.  You can have no more
   # than this many threads with active HTTP transactions.
 
-  def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
+  def initialize name=nil, proxy=nil, pool_size=DEFAULT_POOL_SIZE
     @name = name
 
     @debug_output     = nil

data/lib/vault/version.rb

@@ -1,3 +1,3 @@
 module Vault
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vault
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler