lib/sdbport/cli/export.rb in sdbport-0.2.1 vs lib/sdbport/cli/export.rb in sdbport-0.3.0

@@ -1,18 +1,19 @@
 module Sdbport
   class CLI
     class Export
 
-      def initialize(args)
-        @default_access_key = args[:access_key]
-        @default_secret_key = args[:secret_key]
+      def initialize
+        @config = Config.new
       end
 
       def export
         opts       = read_options
-        access_key = opts[:access_key] || @default_access_key
-        secret_key = opts[:secret_key] || @default_secret_key
+        access_key = @config.access_key opts[:account]
+        secret_key = @config.secret_key opts[:account]
+        access_key = opts[:access_key] if opts[:access_key] 
+        secret_key = opts[:secret_key] if opts[:secret_key]
 
         logger = SdbportLogger.new :log_level => opts[:level]
         domain = Domain.new :name       => opts[:name],
                             :region     => opts[:region],
                             :access_key => access_key,
@@ -32,14 +33,17 @@
 
 sdbport export -a xxx -k yyy -r us-west-1 -o /tmp/file -n domain
 
 EOS
           opt :help, "Display Help"
+          opt :account, "Account Credentials", :type    => :string,
+                                               :default => 'default'
           opt :level, "Log Level", :type => :string, :default => 'info'
           opt :name, "Simple DB Domain Name", :type => :string
           opt :output, "Output File", :type => :string
-          opt :region, "AWS region", :type => :string
-          opt :access_key, "AWS Access Key ID", :type => :string
+          opt :region, "AWS Region", :type => :string
+          opt :access_key, "AWS Access Key ID", :type  => :string,
+                                                :short => 'k'
           opt :secret_key, "AWS Secret Access Key", :type => :string
         end
       end
     end
   end