conjur-cli 5.2.3 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c180984ae48ea8f700f458b5e4192220236a39c6
-  data.tar.gz: 664acc9c44bed2de214b872dcf266ebac4261fa6
+  metadata.gz: 465b9de6e8a2c63bfc0ff50a4f421beac585e858
+  data.tar.gz: 1fa9c46b64f9029a34bc37ea50492c5a14866be7
 SHA512:
-  metadata.gz: 0e6d6f661f6031014dda7e313197113495f7b52967a9e12345b1885798fd7df98767a7e75606f9fafd0e4f97c8fc3bdfaf9c9776ec46fc0efd198091d9053114
-  data.tar.gz: fe1f4b89b9ffd8d22e85e62bd20477fc5fbd60852ae6e6e69d7ff8e6e605c4a987b940ffba2c71f1e72a4f9d088c81b2fffebba9e90243ed7d7c604865330810
+  metadata.gz: 908d69e05ec7941e47e724b484a828ce20e316c1abc4f9241d3c81cc9c5b6d09371a1e79b0ef2fe76608aa9af04728b884356191348e0e30f954555cfaa9bfa8
+  data.tar.gz: 43a250909cbdef74620981d1a2b437117b2f74c19bfb146297b0ec50aaba6108b434cbea226329a75d755033ab1d21814665063cb853f4010ae4a8caac07cc94

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.2.4
+
+* Fix behavior of `conjur env`, when detecting variables vs literals
+
 # 5.2.3
 
 * Disable prompts in bootstrap when there's no tty

data/Gemfile

@@ -6,7 +6,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in conjur.gemspec
 gemspec
 
-gem 'conjur-api', '>= 4.24', git: 'https://github.com/conjurinc/api-ruby.git', branch: 'master'
+gem 'conjur-api', '>= 4.26', 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/conjurenv.rb

@@ -25,7 +25,7 @@ module Conjur
   class Env
 
     class CustomTag
-      def initialize id 
+      def initialize id
         raise "#{self.class.name.split('::').last} requires a parameter" if id.to_s.empty?
         @id=id
       end
@@ -49,9 +49,9 @@ module Conjur
 
     class ConjurTempfile < CustomTag
       def evaluate value
-        @tempfile = if File.directory?("/dev/shm") and File.writable?("/dev/shm") 
+        @tempfile = if File.directory?("/dev/shm") and File.writable?("/dev/shm")
                       Tempfile.new("conjur","/dev/shm")
-                    else  
+                    else
                       Tempfile.new("conjur")
                     end
         @tempfile.write(value)
@@ -63,7 +63,7 @@ module Conjur
     def initialize(options={})
       raise ":file and :yaml options can not be provided together" if ( options.has_key?(:file) and options.has_key?(:yaml) )
 
-      yaml = if options.has_key?(:yaml) 
+      yaml = if options.has_key?(:yaml)
         raise ":yaml option should be non-empty string" unless options[:yaml].kind_of?(String)
         raise ":yaml option should be non-empty string" if options[:yaml].empty?
         options[:yaml]
@@ -88,7 +88,7 @@ module Conjur
       definition.keys.select { |k| definition[k].kind_of? Fixnum }.each { |k| definition[k]="#{definition[k]}" }
       bad_types = definition.values.select { |v| not (v.kind_of?(String) or v.kind_of?(CustomTag)) }.map {|v| v.class}.uniq
       raise "Definition can not include values of types: #{bad_types}" unless bad_types.empty?
-      definition.inject({}) do |memo,e| 
+      definition.inject({}) do |memo,e|
         key, value = e
         substitutions.each do |k,v|
           value.gsub! k, v
@@ -103,32 +103,30 @@ module Conjur
       runtime_environment={}
       variable_ids= @definition.values.map { |v| v.conjur_id rescue nil }.compact
       conjur_values=api.variable_values(variable_ids)
-      @definition.each { |environment_name, reference| 
-        runtime_environment[environment_name]= if reference.respond_to?(:evaluate)
-                                                  reference.evaluate( conjur_values[reference.conjur_id] )
-                                               else
-                                                  reference # is a literal value
-                                               end
-      }
+      @definition.each do |environment_name, reference|
+        if reference.respond_to?(:evaluate)
+          runtime_environment[environment_name] = reference.evaluate( conjur_values[reference.conjur_id] )
+        else
+          runtime_environment[environment_name] = reference # is a literal value
+        end
+      end
       return runtime_environment
     end
 
     def check(api)
-      Hash[ 
-        @definition.map { |k,v| 
-
-          status = if v.respond_to? :conjur_id
-                     if api.resource("variable:"+v.conjur_id).permitted?(:execute)
-                       :available   
-                     else
-                       :unavailable
-                     end
-                   else
-                     :literal
-                   end
- 
+      Hash[
+        @definition.map.each do |k,v|
+          if v.respond_to? :conjur_id
+            if api.resource("variable:"+v.conjur_id).permitted?(:execute)
+              status = :available
+            else
+              status = :unavailable
+            end
+          else
+            status = :literal
+          end
           [ k, status ]
-        }
+        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.2.3'
+  VERSION = '5.2.4'
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.4
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport