sdbport 0.1.1 → 0.2.0

data/CHANGELOG

@@ -1,5 +1,10 @@
 ## HEAD:
 
+## 0.2.0:
+
+* Added destroy subcommand
+* Batch put attributes in sets of 25
+
 ## 0.1.1:
 
 * Read domains with more than 100 items

data/README.md

@@ -43,7 +43,6 @@ sdbport export -h
 
 ## Known Limitations
 
-* Single serialiazed process for import. Need to switch to batch put attributes.
 * Only supports importing into empty domain.
 
 ## Contributing

data/lib/sdbport/aws/simpledb.rb

@@ -22,10 +22,6 @@ module Sdbport
         sdb.create_domain(domain) unless domain_exists?(domain)
       end
 
-      def select(query, options = {})
-        sdb.select(query, options).body
-      end
-
       def select_and_follow_tokens(query, options = {})
         data = {}
         next_token = nil
@@ -48,8 +44,8 @@ module Sdbport
         count(domain).zero?
       end
 
-      def put_attributes(domain, key, attributes, options = {})
-        sdb.put_attributes domain, key, attributes, options
+      def batch_put_attributes(domain,  attributes)
+        sdb.batch_put_attributes domain, attributes
       end
 
       def delete_domain(domain)

data/lib/sdbport/cli/destroy.rb

@@ -0,0 +1,38 @@
+module Sdbport
+  class CLI
+    class Destroy
+
+      def destroy
+        opts   = read_options
+        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
+      end
+
+      def read_options
+        Trollop::options do
+          version Sdbport::VERSION
+          banner <<-EOS
+
+Destroy SimpleDB Domain
+
+Usage:
+
+sdbport destroy -a xxx -k yyy -r us-west-1 -n domain
+
+EOS
+          opt :help, "Display Help"
+          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 :secret_key, "AWS Secret Access Key", :type => :string
+        end
+      end
+    end
+  end
+end

data/lib/sdbport/cli/purge.rb

@@ -5,12 +5,12 @@ module Sdbport
       def purge
         opts   = read_options
         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     => opts[:access_key],
+                            :secret_key     => opts[:secret_key],
+                            :logger         => logger
+          domain.purge
       end
 
       def read_options

data/lib/sdbport/cli.rb

@@ -1,4 +1,5 @@
 require 'trollop'
+require 'sdbport/cli/destroy'
 require 'sdbport/cli/export'
 require 'sdbport/cli/import'
 require 'sdbport/cli/purge'
@@ -11,6 +12,8 @@ module Sdbport
       cmd = ARGV.shift
 
       case cmd
+      when 'destroy'
+        CLI::Destroy.new.destroy
       when 'export'
         CLI::Export.new.export
       when 'import'
@@ -21,7 +24,7 @@ module Sdbport
         puts Sdbport::VERSION
       else
         puts "Unkown command: '#{cmd}'." unless cmd == '-h'
-        puts "sdbport [export|import|purge] OPTIONS"
+        puts "sdbport [destroy|export|import|purge] OPTIONS"
         puts "Append -h for help on specific subcommand."
       end
  

data/lib/sdbport/domain/destroy.rb

@@ -0,0 +1,28 @@
+module Sdbport
+  class Domain
+    class Destroy
+
+      def initialize(args)
+        @name       = args[:name]
+        @logger     = args[:logger]
+        @access_key = args[:access_key]
+        @secret_key = args[:secret_key]
+        @region     = args[:region]
+      end
+
+      def destroy
+        @logger.info "Destroying #{@name} in #{@region}."
+        sdb.delete_domain @name
+      end
+
+      private
+
+      def sdb
+        @sdb ||= AWS::SimpleDB.new :access_key => @access_key,
+                                   :secret_key => @secret_key,
+                                   :region     => @region
+      end
+
+    end
+  end
+end

data/lib/sdbport/domain/import.rb

@@ -10,6 +10,7 @@ module Sdbport
         @access_key = args[:access_key]
         @secret_key = args[:secret_key]
         @region     = args[:region]
+        @buffer     = {}
       end
 
       def import(input)
@@ -21,25 +22,37 @@ module Sdbport
 
         file = File.open(input, 'r')
         while (line = file.gets)
-          add_line line
+          add_line_to_buffer line
+          write_buffer if buffer_full? 
         end
+        write_buffer unless buffer_empty?
         true
       end
 
       private
 
-      def create_domain
-        sdb.create_domain_unless_present @name
-      end
-
-      def add_line(line)
+      def add_line_to_buffer(line)
         line.chomp!
         data       = JSON.parse line
         id         = data.first
         attributes = data.last
 
         @logger.debug "Adding #{id} with attributes #{attributes.to_s}."
-        sdb.put_attributes @name, id, attributes
+        @buffer.merge!({ id => attributes })
+      end
+
+      def buffer_full?
+        @buffer.count > 24
+      end
+
+      def buffer_empty?
+        @buffer.count.zero?
+      end
+
+      def write_buffer
+        @logger.debug "Writing #{@buffer.count} entries to SimpleDB."
+        sdb.batch_put_attributes @name, @buffer
+        @buffer.clear
       end
 
       def ensure_domain_empty
@@ -51,6 +64,10 @@ module Sdbport
         end
       end
 
+      def create_domain
+        sdb.create_domain_unless_present @name
+      end
+
       def sdb
         @sdb ||= AWS::SimpleDB.new :access_key => @access_key,
                                    :secret_key => @secret_key,

data/lib/sdbport/domain.rb

@@ -1,3 +1,4 @@
+require 'sdbport/domain/destroy'
 require 'sdbport/domain/export'
 require 'sdbport/domain/import'
 require 'sdbport/domain/purge'
@@ -21,16 +22,24 @@ module Sdbport
       domain_purge.purge
     end
 
+    def destroy
+      domain_destroy.destroy
+    end
+
     private
 
-    def domain_import
-      @domain_import ||= Domain::Import.new @args
+    def domain_destroy
+      @domain_destroy ||= Domain::Destroy.new @args
     end
 
     def domain_export
       @domain_export ||= Domain::Export.new @args
     end
 
+    def domain_import
+      @domain_import ||= Domain::Import.new @args
+    end
+
     def domain_purge
       @domain_purge ||= Domain::Purge.new @args
     end

data/lib/sdbport/version.rb

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

data/spec/aws/simpledb_spec.rb

@@ -22,15 +22,6 @@ describe Sdbport do
     @sdb.domains.should == ['domain1']
   end
 
-  it "should perform select query given" do
-    @fog_mock.should_receive(:select).
-              with('select * from name', 'ConsistentRead' => true).
-              and_return @body_stub
-    @body_stub.stub :body => 'thegoods'
-    @sdb.select('select * from name', 'ConsistentRead' => true).
-         should == 'thegoods'
-  end
-
   it "should perform select query given and next tokens" do
     body_stub0 = stub 'body0', :body => { 'Items' => 
                                             { 'id1' => 'val1' }, 
@@ -78,8 +69,10 @@ describe Sdbport do
   end
 
   it "should update the attributes for an item" do
-    @fog_mock.should_receive(:put_attributes).with('domain', 'key', {'key' => 'value'}, { "option" => "123" })
-    @sdb.put_attributes('domain', 'key', {'key' => 'value'}, { "option" => "123" })
+    @fog_mock.should_receive(:batch_put_attributes).with('domain', { 'item1' => { 'key1' => 'value1' }, 
+                                                                     'item2' => { 'key2' => 'value2' } })
+    @sdb.batch_put_attributes('domain', { 'item1' => { 'key1' => 'value1' },
+                                          'item2' => { 'key2' => 'value2' } })
   end
 
   context "testing counts" do

data/spec/domain/destroy_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Sdbport do
+
+  before do
+    @logger_stub = logger_stub
+    @sdb_mock = sdb_mock
+    options = { :name       => 'name',
+                :logger     => @logger_stub,
+                :access_key => 'the-key',
+                :secret_key => 'the-secret',
+                :region     => 'us-west-1' }
+    @destroy = Sdbport::Domain::Destroy.new options
+  end
+
+  it "should delete the given domain" do
+    @sdb_mock.should_receive(:delete_domain)
+    @destroy.destroy
+  end
+
+end

data/spec/domain/import_spec.rb

@@ -14,20 +14,28 @@ describe Sdbport do
 
   context "when successful" do
     it "should import from the given input" do
-      @line = '["item", {"key":["val1", "val2"]}]'
+      @line1 = '["itemA", {"key":["val1", "val2"]}]'
+      @line2 = '["itemB", {"key":["val3", "val4"]}]'
       @sdb_mock.should_receive(:create_domain_unless_present).
                 with('name')
       @sdb_mock.should_receive(:domain_empty?).with('name').
                 and_return true
       File.should_receive(:open).with('/tmp/file', 'r').
                                  and_return @file_mock
-      @file_mock.should_receive(:gets).and_return @line
-      @sdb_mock.should_receive(:put_attributes).
-                with("name", "item", {"key"=>["val1", "val2"]})
+      @file_mock.should_receive(:gets).and_return @line1
+      @file_mock.should_receive(:gets).and_return @line2
+      @sdb_mock.should_receive(:batch_put_attributes).
+                with("name", { "itemA" => {
+                                 "key" => ["val1", "val2"]
+                               }, 
+                               "itemB" => {
+                                 "key" => ["val3", "val4"]
+                               } })
       @file_mock.should_receive(:gets).and_return nil
       @import.import('/tmp/file').should be_true
     end
   end
+
   context "when unsuccessful" do
     it "should return false if the domain is not empty" do
       @sdb_mock.should_receive(:create_domain_unless_present).

data/spec/domain_spec.rb

@@ -30,4 +30,10 @@ describe Sdbport do
     @domain.purge.should be_true
   end
 
+  it "should call domain_destroy" do
+    Sdbport::Domain::Destroy.stub :new => @mock
+    @mock.should_receive(:destroy).and_return true
+    @domain.destroy.should be_true
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sdbport
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237921138580 !ruby/object:Gem::Requirement
+  requirement: &70151522838520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237921138580
+  version_requirements: *70151522838520
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70237921138140 !ruby/object:Gem::Requirement
+  requirement: &70151522837360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237921138140
+  version_requirements: *70151522837360
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70237921137660 !ruby/object:Gem::Requirement
+  requirement: &70151522807160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237921137660
+  version_requirements: *70151522807160
 description: Import and export AWS SimpleDB domains.
 email:
 - brett@weav.net
@@ -65,10 +65,12 @@ files:
 - lib/sdbport/aws.rb
 - lib/sdbport/aws/simpledb.rb
 - lib/sdbport/cli.rb
+- lib/sdbport/cli/destroy.rb
 - lib/sdbport/cli/export.rb
 - lib/sdbport/cli/import.rb
 - lib/sdbport/cli/purge.rb
 - lib/sdbport/domain.rb
+- lib/sdbport/domain/destroy.rb
 - lib/sdbport/domain/export.rb
 - lib/sdbport/domain/import.rb
 - lib/sdbport/domain/purge.rb
@@ -76,6 +78,7 @@ files:
 - lib/sdbport/version.rb
 - sdbport.gemspec
 - spec/aws/simpledb_spec.rb
+- spec/domain/destroy_spec.rb
 - spec/domain/export_spec.rb
 - spec/domain/import_spec.rb
 - spec/domain/purge_spec.rb
@@ -96,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1634563892266774728
+      hash: 3924510079821876667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1634563892266774728
+      hash: 3924510079821876667
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -114,6 +117,7 @@ specification_version: 3
 summary: Import and export AWS SimpleDB domains.
 test_files:
 - spec/aws/simpledb_spec.rb
+- spec/domain/destroy_spec.rb
 - spec/domain/export_spec.rb
 - spec/domain/import_spec.rb
 - spec/domain/purge_spec.rb