ocean-dynamo 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c55ae49ff1ad852246e6af0b6727f284a10acc
-  data.tar.gz: 17c013a3f22302b9a48a117a83e800e35297fb35
+  metadata.gz: 577f687042b84996c0c8b6490f970a3827f90b4f
+  data.tar.gz: 8632b8095f13fa066e3ee63831e723b5a9398c47
 SHA512:
-  metadata.gz: 16351feeb2ff2d90ea76d87c9c352c752fc0d29eab5c77d8dc522d39779c69835ce90b88599823ffed8a638c01d26c1556807f91533c0a71337d0600bbc1a93a
-  data.tar.gz: b9cdc4ea2f37f4dabd048264e61bc96f79b504b4d9fc6f89e94519e6f9c5f66a6bd097f614f35a2698296ba72ff55b756395752dac95b3bed0c0823f2fe1edd7
+  metadata.gz: ec0edf51b620ed1082879309efd47d53e5bcbd97bb4689f8c294c74f930cace03389afbc28479d81f080ace84aceeb4590bda4dd57a9b6a78c9ce39ae3ee28d1
+  data.tar.gz: fda47b459b7c0e71977dce1490bdea63d71668dfb38cf6bc568a589c5d625411b0f7a129cfc44f4820847e0f5787db7ecbef068b5c205edb1d113e7eb7891d14

data/README.rdoc

@@ -364,7 +364,14 @@ block:
   regexp = Regexp.new("^.+_#{CHEF_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_test$")
   cleaner = lambda { 
     c = Aws::DynamoDB::Client.new
-    c.list_tables.table_names.each { |t| c.delete_table({table_name: t}) if t =~ regexp }
+    c.list_tables.table_names.each do |t| 
+      begin
+        c.delete_table({table_name: t}) if t =~ regexp
+      rescue Aws::DynamoDB::Errors::LimitExceededException
+        sleep 1
+        retry
+      end
+    end
   }
 
 Then, inside the +RSpec.configure+ block:
@@ -372,8 +379,8 @@ Then, inside the +RSpec.configure+ block:
   config.before(:suite) { cleaner.call }
   config.after(:suite) { cleaner.call }
 
-This will remove only those tables created by the specs on this particular machine and
-environment. This is safe even on AWS and for parallel testing.
+This will remove only those test tables created by the specs on this particular machine and
+environment. This is safe even on AWS and in parallel with other machines.
 
 
 == Rails console

data/lib/ocean-dynamo/tables.rb

@@ -64,8 +64,9 @@ module OceanDynamo
 
 
       def table_exists?(table)
-        return true if table.data_loaded?
         begin
+          fresh_table_status
+          return true if table.data_loaded?
           table.load
         rescue Aws::DynamoDB::Errors::ResourceNotFoundException
           return false
@@ -74,9 +75,14 @@ module OceanDynamo
       end
 
 
+      def fresh_table_status
+        dynamo_client.describe_table(table_name: table_full_name).table.table_status
+      end
+
+
       def wait_until_table_is_active
         loop do
-          case dynamo_table.table_status
+          case st = fresh_table_status
           when "ACTIVE"
             update_table_if_required
             return
@@ -84,11 +90,11 @@ module OceanDynamo
             sleep 1
             next
           when "DELETING"
-            sleep 1 while table_exists?(dynamo_table)
+            sleep 1 while table_exists?(dynamo_table) && fresh_table_status == "DELETING"
             create_table
             return
           else
-            raise UnknownTableStatus.new("Unknown DynamoDB table status '#{dynamo_table.table_status}'")
+            raise UnknownTableStatus.new("Unknown DynamoDB table status '#{st}'")
           end
         end
       end
@@ -111,21 +117,26 @@ module OceanDynamo
         gsi = global_secondary_indexes.collect { |k, v| global_secondary_index_declaration k, v }
         options[:global_secondary_indexes] = gsi unless gsi.blank?
         dynamo_resource.create_table(options)
-        sleep 1 until dynamo_table.table_status == "ACTIVE"
+        loop do
+          ts = fresh_table_status
+          break if ts == "ACTIVE"
+          sleep 1
+        end
         setup_dynamo
         true
       end
 
 
      def update_table_if_required
-        attrs = table_attribute_definitions
-        active_attrs = []
-        dynamo_table.attribute_definitions.each do |k| 
-          active_attrs << { attribute_name: k.attribute_name, attribute_type: k.attribute_type }
-        end
-        return false if active_attrs == attrs
-        options = { attribute_definitions: attrs }
-        dynamo_table.update(options)
+        #puts "Updating table #{table_full_name}"
+        # attrs = table_attribute_definitions
+        # active_attrs = []
+        # dynamo_table.attribute_definitions.each do |k| 
+        #   active_attrs << { attribute_name: k.attribute_name, attribute_type: k.attribute_type }
+        # end
+        # return false if active_attrs == attrs
+        # options = { attribute_definitions: attrs }
+        # dynamo_table.update(options)
         true
       end
 
@@ -204,7 +215,7 @@ module OceanDynamo
 
 
       def delete_table
-        return false unless dynamo_table.data_loaded? && dynamo_table.table_status == "ACTIVE"
+        return false unless fresh_table_status == "ACTIVE"
         dynamo_table.delete
         true
       end

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-dynamo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Peter Bengtson