lib/conjur/cli.rb in conjur-cli-2.1.3 vs lib/conjur/cli.rb in conjur-cli-2.1.4

@@ -1,17 +1,20 @@
 require 'gli'
 require 'conjur/config'
+require 'conjur/log'
 
 module Conjur
   class CLI
     extend GLI::App
 
     class << self
       def load_config
         [ File.join("/etc", "conjur.conf"), ( ENV['CONJURRC'] || File.join(ENV['HOME'], ".conjurrc") ) ].each do |f|
           if File.exists?(f)
-            $stderr.puts "Loading #{f}"
+            if Conjur.log
+              Conjur.log << "Loading #{f}\n"
+            end
             Conjur::Config.merge YAML.load(IO.read(f))
           end
         end
       end
     end
@@ -19,19 +22,21 @@
     load_config
             
     ENV['CONJUR_ENV'] = Config[:env] || "production"
     ENV['CONJUR_STACK'] = Config[:stack] if Config[:stack]
     ENV['CONJUR_STACK'] ||= 'v3' if ENV['CONJUR_ENV'] == 'production'
-    ENV['CONJUR_ACCOUNT'] = Config[:account] or raise "Missing configuration setting: account"
+    ENV['CONJUR_ACCOUNT'] = Config[:account] or raise "Missing configuration setting: account. Please set it in ~/.conjurrc"
     
     Conjur::Config.plugins.each do |plugin|
       require "conjur-asset-#{plugin}"
     end
     
     commands_from 'conjur/command'
 
-    $stderr.puts "Using host #{Conjur::Authn::API.host}"
-    
+    if Conjur.log
+      Conjur.log << "Using host #{Conjur::Authn::API.host}\n"
+    end
+
     pre do |global,command,options,args|
       require 'active_support/core_ext'
       options.delete_if{|k,v| v.blank?}
       options.symbolize_keys!