lib/cifrado/cli.rb in cifrado-0.1.2 vs lib/cifrado/cli.rb in cifrado-0.1.3

@@ -86,18 +86,23 @@
           Log.error "Use --#{opt.to_s.gsub('_', '-')} option or run 'cifrado setup' first."
           raise "Missing setting"
         end
       end
 
-      if (config[:auth_url] !~ /rackspacecloud\.com/) and config[:tenant].nil?
-        Log.error "tenant not provided."
-        Log.error "Use --tenant option or run 'cifrado setup' first."
-        raise "Missing tenant"
-      else 
+      if config[:auth_url] =~ /rackspacecloud\.com/
+        Log.debug "Rackspace Authentication, removing tenant."
         # Make sure tenant is nil for Rackspace
         # otherwise we get a service catalog without cloudFiles endpoints
         config[:tenant] = nil
+      else 
+        if config[:tenant].nil?
+          Log.error "Tenant not provided."
+          Log.error "Use --tenant option or run 'cifrado setup' first."
+          raise "Missing tenant"
+        else
+          Log.debug "OpenStack regular authentication, using tenant name."
+        end
       end
 
       unless config[:secure_random]
         raise Exception.new("secure_random key not found in #{config_file}")
       end
@@ -117,9 +122,10 @@
 require 'cifrado/cli/upload'
 require 'cifrado/cli/set_acl'
 require 'cifrado/cli/jukebox'
 require 'cifrado/cli/cinema'
 require 'cifrado/cli/saio'
+require 'cifrado/cli/version'
 
 at_exit do
   include Cifrado::Utils
   include Cifrado
   e = $!