conjur-cli 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33a3e3fad78dc2dd87aa3fa6a243f0b14803c5e5
-  data.tar.gz: d6df01dfa23da5c6c70a404c18cf2649ee7714b6
+  metadata.gz: fd2fdc274eeb24f6aebb71b086d5423d4525fa46
+  data.tar.gz: eca6d5c3dc2a592e85c83489d83f0107ba248727
 SHA512:
-  metadata.gz: f461169a657242cf740174c974fb86c2bfdf1b956eb7e81ef0697056426efaa3280b8e33bbcf2e285200b43c0231923bf582f14fbd8fac57a756ce8ace392dcd
-  data.tar.gz: ba975bee2a0cb9ad5131ebbdc0e53850e194e196daaa45b7cd84d0270f8aa53af13742e87efe17d9beff4d65c725ceabce6d9781d2e83c6dd1c70fa1d3e368d1
+  metadata.gz: 9600929f300b75cbafd5345ddc7e9a8ec1af8d3a37c669c44085aa8144b04ff872a0f10cb0a124caf2208b6dd63e64f0deadc68e8d6a0987c2a9c9e4e4a9d144
+  data.tar.gz: 05bab089a0c28700dd81f586dcbc2d9541246212380bb927b594f0836ada296b219223496860fdb3e9f61fdfe7f4c52f08a77e4766a73124c67bd11647171e7e

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-# 5.1.0
+# 5.1.1
 
-* CLI plugin config is now stored in `~/.conjur-plugins.yml`.
+* Global CLI plugin config is now stored in `/opt/conjur/etc/plugins.yml`.
 
 # 5.0.0
 

data/lib/conjur/command/plugin.rb

@@ -41,7 +41,7 @@ class Conjur::Command::Plugin < Conjur::Command
         Conjur::Config.plugins.each do |p|
           begin
             gem = Gem::Specification.find_by_name "conjur-asset-#{p}"
-            puts "#{p} (#{gem.version})"
+            puts "#{p} (#{gem.version}) - #{gem.summary}"
           rescue Gem::LoadError
             nil
           end
@@ -121,18 +121,19 @@ def uninstall_plugin(name)
 end
 
 def modify_plugin_list(op, plugin_name)
-  config_exists = false
-  Conjur::Config.plugin_config_files.each do |f|
-    if !File.file?(f)
-      FileUtils.touch(f)
+  config_found = false
+  # Check the dedicated plugin config file first
+  (Conjur::Config.plugin_config_files + Conjur::Config.default_config_files).uniq!.each do |f|
+    if File.exists?(f) and not config_found  # only write to the first file found
+      config_found = true
+      config = YAML.load(IO.read(f)).stringify_keys rescue {}
+      config['plugins'] ||= []
+      config['plugins'] += [plugin_name] if op == 'add'
+      config['plugins'] -= [plugin_name] if op == 'remove'
+      config['plugins'].uniq!
+
+      File.write(f, YAML.dump(config))
     end
-
-    config = YAML.load(IO.read(f)).stringify_keys rescue {}
-    config['plugins'] ||= []
-    config['plugins'] += [plugin_name] if op == 'add'
-    config['plugins'] -= [plugin_name] if op == 'remove'
-    config['plugins'].uniq!
-
-    File.write(f, YAML.dump(config))
+    exit_now! 'No Conjur config file found for plugin installation' unless config_found
   end
 end

data/lib/conjur/config.rb

@@ -31,7 +31,7 @@ module Conjur
       end
 
       def plugin_config_files
-        [ File.expand_path("~/.conjur-plugins.yml") ]
+        [ '/opt/conjur/etc/plugins.yml' ]
       end
 
       def user_config_files

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.1.0'
+  VERSION = '5.1.1'
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport