sdbport 0.2.1 → 0.3.0

data/CHANGELOG

@@ -1,4 +1,6 @@
-## HEAD:
+## 0.3.0:
+
+* Added support for reading multiple env configs
 
 ## 0.2.1:
 

data/README.md

@@ -8,34 +8,63 @@ Sdbport exports & imports data from AWS SimpleDB domains. It can be used as a cl
 
 gem install sdbport
 
-## Usage
+## Getting Started
 
 Set your AWS credentials:
 
 ```
-export AWS_ACCESS_KEY_ID=key
-export AWS_SECRET_ACCESS_KEY=secret
+export AWS_ACCESS_KEY_ID=your_aws_key
+export AWS_SECRET_ACCESS_KEY=your_aws_secret
 ```
 
-Or create a config file (-a and -s can then be ommited):
+Export SimpleDB domain from us-west-1:
+
+```
+sdbport export -a $AWS_ACCESS_KEY_ID -s $AWS_SECRET_ACCESS_KEY -r us-west-1 -n data -o /tmp/test-domain-dump
+```
+
+Import into domain in us-east-1
+
+```
+sdbport import -a $AWS_ACCESS_KEY_ID -s $AWS_SECRET_ACCESS_KEY -r us-west-1 -n data -i /tmp/test-domain-dump
+
+## Exporting and importing from multiple accounts.
+
+You can specify your credentials on the command line, however it is best to add them to a configuration file.
+
+By default, sdbport look for .sdbport.yml in your home directory. To get started, add you AWS keys.
+
+```
+cat > ~/.sdbport.yml << EOF
+default:
+  access_key: your_aws_key
+  secret_key: your_aws_secert
+EOF
+```
+
+You can add multiple account credentials and specify the account with --account (-a).
 
 ```
 cat > ~/.sdbport.yml << EOF
-access_key: your_aws_key
-secret_key: your_aws_secert
+prod:
+  access_key: your_aws_key
+  secret_key: your_aws_secert
+preprod:
+  access_key: your_aws_key
+  secret_key: your_aws_secert
 EOF
 ```
 
-Export SimpleDB domain:
+Export SimpleDB domain data from prod account in us-west-1:
 
 ```
-sdbport export -a $AWS_ACCESS_KEY_ID -s $AWS_SECRET_ACCESS_KEY -r us-west-1 -n test -o /tmp/test-domain-dump
+sdbport export -a prod -r us-west-1 -n data -o /tmp/data-domain-dump
 ```
 
-Import into new domain:
+Import into preprod account in us-east-1:
 
 ```
-sdbport import -a $AWS_ACCESS_KEY_ID -s $AWS_SECRET_ACCESS_KEY -r us-west-1 -n new-domain -i /tmp/test-domain-dump
+sdbport import -a preprod -r us-east-1 -n data -i /tmp/data-domain-dump
 ```
 
 To list CLI subcommands:

data/lib/sdbport/cli.rb

@@ -7,25 +7,19 @@ require 'sdbport/cli/purge'
 module Sdbport
   class CLI
 
-    def initialize
-      @config = Config.new
-      @aws_default_creds = { :access_key => @config.access_key,
-                             :secret_key => @config.secret_key }
-    end
-
     def start
 
       cmd = ARGV.shift
 
       case cmd
-      when 'destroy'
-        CLI::Destroy.new(@aws_default_creds).destroy
+      when 'destroy', 'delete'
+        CLI::Destroy.new.destroy
       when 'export'
-        CLI::Export.new(@aws_default_creds).export
+        CLI::Export.new.export
       when 'import'
-        CLI::Import.new(@aws_default_creds).import
+        CLI::Import.new.import
       when 'purge'
-        CLI::Purge.new(@aws_default_creds).purge
+        CLI::Purge.new.purge
       when '-v'
         puts Sdbport::VERSION
       else

data/lib/sdbport/cli/destroy.rb

@@ -2,15 +2,16 @@ module Sdbport
   class CLI
     class Destroy
 
-      def initialize(args)
-        @default_access_key = args[:access_key]
-        @default_secret_key = args[:secret_key]
+      def initialize
+        @config = Config.new
       end
 
       def destroy
         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],
@@ -34,10 +35,13 @@ sdbport destroy -a xxx -k yyy -r us-west-1 -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 :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

data/lib/sdbport/cli/export.rb

@@ -2,15 +2,16 @@ 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],
@@ -34,11 +35,14 @@ 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

data/lib/sdbport/cli/import.rb

@@ -2,15 +2,16 @@ module Sdbport
   class CLI
     class Import
 
-      def initialize(args)
-        @default_access_key = args[:access_key]
-        @default_secret_key = args[:secret_key]
+      def initialize
+        @config = Config.new
       end
 
       def import
         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],
@@ -34,11 +35,14 @@ sdbport import -a xxx -k yyy -r us-west-1 -i /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 :input, "Input 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

data/lib/sdbport/cli/purge.rb

@@ -2,15 +2,16 @@ module Sdbport
   class CLI
     class Purge
 
-      def initialize(args)
-        @default_access_key = args[:access_key]
-        @default_secret_key = args[:secret_key]
+      def initialize
+        @config = Config.new
       end
 
       def purge
         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],
@@ -34,10 +35,13 @@ sdbport purge -a xxx -k yyy -r us-west-1 -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 :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

data/lib/sdbport/config.rb

@@ -1,19 +1,33 @@
 module Sdbport
   class Config
 
-    attr_reader :access_key, :secret_key
-
     def initialize
       @config = load_config_file
-      @access_key = @config.fetch 'access_key', nil
-      @secret_key = @config.fetch 'secret_key', nil
     end
 
+    def access_key(account)
+      if @config.has_key? account
+        @config[account].fetch 'access_key', nil
+      else
+        nil
+      end
+    end
+
+    def secret_key(account)
+      if @config.has_key? account
+        @config[account].fetch 'secret_key', nil
+      else
+        nil
+      end
+    end
+
+    private
+
     def load_config_file
       config_file = "#{ENV['HOME']}/.sdbport.yml"
 
       if File.exists? config_file
-        YAML::load File.open(config_file)
+        YAML::load(File.open(config_file))
       else
         Hash.new
       end

data/lib/sdbport/version.rb

@@ -1,3 +1,3 @@
 module Sdbport
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/cli_spec.rb

@@ -4,8 +4,6 @@ require 'sdbport/cli'
 describe Sdbport do
   before do
     @cli_mock = mock 'cli'
-    @default_creds = { :access_key => 'the-key',
-                       :secret_key => 'the-secret' }
     @config_stub = stub 'config', :access_key => 'the-key',
                                   :secret_key => 'the-secret'
     Sdbport::Config.stub :new => @config_stub
@@ -13,36 +11,28 @@ describe Sdbport do
   end
 
   it "should call destroy" do
-    Sdbport::CLI::Destroy.should_receive(:new).
-                          with(@default_creds).
-                          and_return @cli_mock
+    Sdbport::CLI::Destroy.stub :new => @cli_mock
     ARGV.stub :shift => 'destroy'
     @cli_mock.should_receive :destroy
     @cli.start
   end
 
   it "should call export" do
-    Sdbport::CLI::Export.should_receive(:new).
-                          with(@default_creds).
-                          and_return @cli_mock
+    Sdbport::CLI::Export.stub :new => @cli_mock
     ARGV.stub :shift => 'export'
     @cli_mock.should_receive :export
     @cli.start
   end
 
   it "should call import" do
-    Sdbport::CLI::Import.should_receive(:new).
-                          with(@default_creds).
-                          and_return @cli_mock
+    Sdbport::CLI::Import.stub :new => @cli_mock
     ARGV.stub :shift => 'import'
     @cli_mock.should_receive :import
     @cli.start
   end
 
   it "should call purge" do
-    Sdbport::CLI::Purge.should_receive(:new).
-                          with(@default_creds).
-                          and_return @cli_mock
+    Sdbport::CLI::Purge.stub :new => @cli_mock
     ARGV.stub :shift => 'purge'
     @cli_mock.should_receive :purge
     @cli.start

data/spec/config_spec.rb

@@ -3,8 +3,12 @@ require 'spec_helper'
 describe Sdbport do
 
   before do
-    @config = { 'access_key ' => 'key',
-                'secret_key ' => 'secret' }
+    @config = { 
+                'test123' => {
+                  'access_key' => 'key',
+                  'secret_key' => 'secret' 
+                }
+              }
   end
 
   it "should create a new config object and read from ~/.sdbport.yml" do
@@ -13,15 +17,15 @@ describe Sdbport do
          with("#{ENV['HOME']}/.sdbport.yml").
          and_return @config.to_yaml
     config = Sdbport::Config.new
-    config.access_key.should == @config['access_key']
-    config.secret_key.should == @config['secret_key']
+    config.access_key('test123').should == 'key'
+    config.secret_key('test123').should == 'secret'
   end
 
-  it "should load a blank config if the file does not exist and no config passed" do
+  it "should return nil if .sdbport.yml does not exist" do
     File.stub :exists? => false
     config = Sdbport::Config.new
-    config.access_key.should be_nil
-    config.secret_key.should be_nil
+    config.access_key('test123').should be_nil
+    config.secret_key('test123').should be_nil
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbport
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70204089955280 !ruby/object:Gem::Requirement
+  requirement: &70269257047280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204089955280
+  version_requirements: *70269257047280
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70204089954700 !ruby/object:Gem::Requirement
+  requirement: &70269257046800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204089954700
+  version_requirements: *70269257046800
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70204089954220 !ruby/object:Gem::Requirement
+  requirement: &70269257046300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204089954220
+  version_requirements: *70269257046300
 description: Import and export AWS SimpleDB domains.
 email:
 - brett@weav.net
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 227852682613598022
+      hash: 3777096327641096662
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 227852682613598022
+      hash: 3777096327641096662
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16