conjur-cli 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2bb2f6423b56a36f979bdd3d26be85172e986a9
-  data.tar.gz: 8a35bfcafee51a86fe6fd28112049bace77ebf98
+  metadata.gz: ac5dff61d36b91557e546edb4f9f0c42d1d47ae7
+  data.tar.gz: 4b217db2dcbab92a5ac3d321043e05f67aaaab6d
 SHA512:
-  metadata.gz: 8253351f69a787a362e355d45e13a8249a9500c0a3693ae1e902ee3c6413d0667ff202c21165ed574fb6448fbb9381367c3ad1103f37d6fbe0cb73bf299a7729
-  data.tar.gz: 3b6a5f2ddc3c965ed51302132f6bf9fe365c2e139643ce47a72031c324a0f250c6d72bbdfb58939fa5b6ae79b11945f630fd10c1e62caf40f40f2a165470cc6c
+  metadata.gz: 8ad164a85360446876629b60e811f881246238502149794de61efa3a7495de85e4bd6bc35bdd85e83958f5d7f8d6005bd788003fb6b07c39e8e76e25e9fa51fd
+  data.tar.gz: df5671793e1adaad9e527bc1a8352de32f941fe99d914cfa9c503f05c12b55afc52a05cfc347508f8c3d443fe163b0e1f3507e72e5f03b9a2604c495845e948e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.5.0
+
+* Use `CONJUR_AUTHN_TOKEN_FILE` as the Conjur access token file, if it's available in the environment.
+
 # 5.4.0
 
 * Deprecated several commands in favor of using policy.

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-#ruby=ruby-2.2.4
+#ruby=ruby-2.2.5
 #ruby-gemset=conjur-cli
 
 # Specify your gem's dependencies in conjur.gemspec
@@ -8,7 +8,7 @@ gemspec
 
 gem 'activesupport', '~> 4.2'
 
-gem 'conjur-api', '>= 4.28.1', git: 'https://github.com/conjurinc/api-ruby.git', branch: 'master'
+gem 'conjur-api', '>= 4.29.0', git: 'https://github.com/conjurinc/api-ruby.git', branch: 'master'
 gem 'semantic', '>= 1.4.1', git: 'https://github.com/jlindsey/semantic.git'
 
 group :test, :development do

data/lib/conjur/authn.rb

@@ -128,6 +128,8 @@ module Conjur::Authn
       end
       if token = token_from_environment
         cls.new_from_token token
+      elsif token_file = token_from_file
+        cls.new_from_token_file token_file
       else
         cls.new_from_key(*get_credentials(options))
       end
@@ -153,5 +155,13 @@ module Conjur::Authn
       require 'base64'
       JSON.parse(Base64.decode64(token))
     end
+
+    def token_from_file
+      token_file = ENV['CONJUR_AUTHN_TOKEN_FILE']
+      if token_file && !File.exists?(token_file)
+        $stderr.puts "Warning: CONJUR_AUTHN_TOKEN_FILE #{token_file.inspect} does not exist"
+      end
+      token_file
+    end
   end
 end

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = '5.4.0'
+  VERSION = '5.5.0'
   ::Version=VERSION
 end

data/spec/config_spec.rb

@@ -113,6 +113,7 @@ describe Conjur::Config do
 
   describe "#apply" do
     before { 
+      allow_any_instance_of(Conjur::Configuration).to receive(:ensure_cert_readable!) 
       allow(OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE).to receive(:add_file) 
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport