sdbport 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,5 +1,9 @@
 ## HEAD:
 
+## 0.2.1:
+
+* Adding support for read AWS creds from config file
+
 ## 0.2.0:
 
 * Added destroy subcommand

data/README.md

@@ -17,6 +17,15 @@ export AWS_ACCESS_KEY_ID=key
 export AWS_SECRET_ACCESS_KEY=secret
 ```
 
+Or create a config file (-a and -s can then be ommited):
+
+```
+cat > ~/.sdbport.yml << EOF
+access_key: your_aws_key
+secret_key: your_aws_secert
+EOF
+```
+
 Export SimpleDB domain:
 
 ```

data/lib/sdbport.rb

@@ -1,4 +1,5 @@
 require "sdbport/aws"
+require "sdbport/config"
 require "sdbport/domain"
 require "sdbport/sdbport_logger"
 require "sdbport/version"

data/lib/sdbport/cli.rb

@@ -7,19 +7,25 @@ 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.destroy
+        CLI::Destroy.new(@aws_default_creds).destroy
       when 'export'
-        CLI::Export.new.export
+        CLI::Export.new(@aws_default_creds).export
       when 'import'
-        CLI::Import.new.import
+        CLI::Import.new(@aws_default_creds).import
       when 'purge'
-        CLI::Purge.new.purge
+        CLI::Purge.new(@aws_default_creds).purge
       when '-v'
         puts Sdbport::VERSION
       else

data/lib/sdbport/cli/destroy.rb

@@ -2,15 +2,23 @@ module Sdbport
   class CLI
     class Destroy
 
+      def initialize(args)
+        @default_access_key = args[:access_key]
+        @default_secret_key = args[:secret_key]
+      end
+
       def destroy
-        opts   = read_options
+        opts       = read_options
+        access_key = opts[:access_key] || @default_access_key
+        secret_key = opts[:secret_key] || @default_secret_key
+
         logger = SdbportLogger.new :log_level => opts[:level]
-        domain = Domain.new :name           => opts[:name],
-                            :region         => opts[:region],
-                            :access_key     => opts[:access_key],
-                            :secret_key     => opts[:secret_key],
-                            :logger         => logger
-        domain.destroy
+        domain = Domain.new :name       => opts[:name],
+                            :region     => opts[:region],
+                            :access_key => access_key,
+                            :secret_key => secret_key,
+                            :logger     => logger
+        exit 1 unless domain.destroy
       end
 
       def read_options

data/lib/sdbport/cli/export.rb

@@ -2,17 +2,23 @@ module Sdbport
   class CLI
     class Export
 
+      def initialize(args)
+        @default_access_key = args[:access_key]
+        @default_secret_key = args[:secret_key]
+      end
+
       def export
-        opts   = read_options
+        opts       = read_options
+        access_key = opts[:access_key] || @default_access_key
+        secret_key = opts[:secret_key] || @default_secret_key
+
         logger = SdbportLogger.new :log_level => opts[:level]
         domain = Domain.new :name       => opts[:name],
                             :region     => opts[:region],
-                            :access_key => opts[:access_key],
-                            :secret_key => opts[:secret_key],
+                            :access_key => access_key,
+                            :secret_key => secret_key,
                             :logger     => logger
-        unless domain.export opts[:output]
-          exit 1
-        end
+        exit 1 unless domain.export opts[:output]
       end
 
       def read_options

data/lib/sdbport/cli/import.rb

@@ -2,17 +2,23 @@ module Sdbport
   class CLI
     class Import
 
+      def initialize(args)
+        @default_access_key = args[:access_key]
+        @default_secret_key = args[:secret_key]
+      end
+
       def import
-        opts   = read_options
+        opts       = read_options
+        access_key = opts[:access_key] || @default_access_key
+        secret_key = opts[:secret_key] || @default_secret_key
+
         logger = SdbportLogger.new :log_level => opts[:level]
         domain = Domain.new :name       => opts[:name],
                             :region     => opts[:region],
-                            :access_key => opts[:access_key],
-                            :secret_key => opts[:secret_key],
+                            :access_key => access_key,
+                            :secret_key => secret_key,
                             :logger     => logger
-        unless domain.import opts[:input]
-          exit 1
-        end
+        exit 1 unless domain.import opts[:input]
       end
 
       def read_options

data/lib/sdbport/cli/purge.rb

@@ -2,15 +2,23 @@ module Sdbport
   class CLI
     class Purge
 
+      def initialize(args)
+        @default_access_key = args[:access_key]
+        @default_secret_key = args[:secret_key]
+      end
+
       def purge
-        opts   = read_options
+        opts       = read_options
+        access_key = opts[:access_key] || @default_access_key
+        secret_key = opts[:secret_key] || @default_secret_key
+
         logger = SdbportLogger.new :log_level => opts[:level]
-        domain = Domain.new :name           => opts[:name],
-                            :region         => opts[:region],
-                            :access_key     => opts[:access_key],
-                            :secret_key     => opts[:secret_key],
-                            :logger         => logger
-          domain.purge
+        domain = Domain.new :name       => opts[:name],
+                            :region     => opts[:region],
+                            :access_key => access_key,
+                            :secret_key => secret_key,
+                            :logger     => logger
+        exit 1 unless domain.purge
       end
 
       def read_options

data/lib/sdbport/config.rb

@@ -0,0 +1,23 @@
+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 load_config_file
+      config_file = "#{ENV['HOME']}/.sdbport.yml"
+
+      if File.exists? config_file
+        YAML::load File.open(config_file)
+      else
+        Hash.new
+      end
+    end
+
+  end
+end

data/lib/sdbport/version.rb

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

data/spec/cli_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+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
+    @cli = Sdbport::CLI.new
+  end
+
+  it "should call destroy" do
+    Sdbport::CLI::Destroy.should_receive(:new).
+                          with(@default_creds).
+                          and_return @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
+    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
+    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
+    ARGV.stub :shift => 'purge'
+    @cli_mock.should_receive :purge
+    @cli.start
+  end
+end

data/spec/config_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Sdbport do
+
+  before do
+    @config = { 'access_key ' => 'key',
+                'secret_key ' => 'secret' }
+  end
+
+  it "should create a new config object and read from ~/.sdbport.yml" do
+    File.stub :exists? => true
+    File.should_receive(:open).
+         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']
+  end
+
+  it "should load a blank config if the file does not exist and no config passed" do
+    File.stub :exists? => false
+    config = Sdbport::Config.new
+    config.access_key.should be_nil
+    config.secret_key.should be_nil
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbport
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151522838520 !ruby/object:Gem::Requirement
+  requirement: &70204089955280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151522838520
+  version_requirements: *70204089955280
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70151522837360 !ruby/object:Gem::Requirement
+  requirement: &70204089954700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151522837360
+  version_requirements: *70204089954700
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70151522807160 !ruby/object:Gem::Requirement
+  requirement: &70204089954220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151522807160
+  version_requirements: *70204089954220
 description: Import and export AWS SimpleDB domains.
 email:
 - brett@weav.net
@@ -69,6 +69,7 @@ files:
 - lib/sdbport/cli/export.rb
 - lib/sdbport/cli/import.rb
 - lib/sdbport/cli/purge.rb
+- lib/sdbport/config.rb
 - lib/sdbport/domain.rb
 - lib/sdbport/domain/destroy.rb
 - lib/sdbport/domain/export.rb
@@ -78,6 +79,8 @@ files:
 - lib/sdbport/version.rb
 - sdbport.gemspec
 - spec/aws/simpledb_spec.rb
+- spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/domain/destroy_spec.rb
 - spec/domain/export_spec.rb
 - spec/domain/import_spec.rb
@@ -99,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3924510079821876667
+      hash: 227852682613598022
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3924510079821876667
+      hash: 227852682613598022
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -117,6 +120,8 @@ specification_version: 3
 summary: Import and export AWS SimpleDB domains.
 test_files:
 - spec/aws/simpledb_spec.rb
+- spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/domain/destroy_spec.rb
 - spec/domain/export_spec.rb
 - spec/domain/import_spec.rb