dynamodb-mutex 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6021f2684e6d453eec6b6c571dc9579680720e09
+  data.tar.gz: 73721ae381b3f05c1de835ceb819ee60ae5eeff3
+SHA512:
+  metadata.gz: 6eec01b731fb9afa95fcd1352555f0be5bdd65bf141c94f6aadbe4509bc15ea04d1f67f18ea8b8aae1734753b6bfe6d6d7dd658eff979a3f932395a1f6da4122
+  data.tar.gz: 0ccadf258c6e395214cf9e47e85beeef348351018a480acb9348d4cbdcdcfc8e8960fbd58bf75d7a46e04c4d1a6d886afe89fea05a1753ffbb78e14b412393c0

data/lib/dynamodb_mutex/lock.rb

@@ -1,4 +1,5 @@
-require 'aws-sdk-v1'
+require 'aws-sdk'
+require 'socket'
 require_relative 'logging'
 
 module DynamoDBMutex
@@ -24,7 +25,8 @@ module DynamoDBMutex
         ensure delete(name)
         end
       else
-        raise LockError, "Unable to acquire #{name} after #{opts[:wait_for_other]} seconds"
+        raise LockError,
+          "Unable to acquire #{name} after #{opts[:wait_for_other]} seconds"
       end
     end
 
@@ -41,11 +43,14 @@ module DynamoDBMutex
           end
 
           begin
-            table.items.put({:id => name, :created => Time.now.to_i},
-              :unless_exists => :id)
+            dynamodb_client.put_item(
+              table_name: TABLE_NAME,
+              item: { :id => name, :created => Time.now.to_i },
+              condition_expression: 'attribute_not_exists(id)'
+            )
             logger.info "#{pid} acquired #{name}"
             return true
-          rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException
+          rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
             logger.info "#{pid} is waiting for #{name}"
             sleep opts[:polling_interval]
           end
@@ -56,7 +61,10 @@ module DynamoDBMutex
       end
 
       def delete(name)
-        table.items.at(name).delete
+        dynamodb_client.delete_item(
+          table_name: TABLE_NAME,
+          key: { :id => name }
+        )
         logger.info "#{pid} released lock #{name}"
       end
 
@@ -69,34 +77,50 @@ module DynamoDBMutex
       def stale?(name, ttl)
         return false unless ttl
 
-        if lock_attributes = table.items.at(name).attributes.to_h(:consistent_read => true)
-          if time_locked = lock_attributes["created"]
-            time_locked < (Time.now.to_i - ttl)
-          end
-        end
+        item = dynamodb_client.get_item(
+          table_name: TABLE_NAME,
+          key: { :id => name },
+          consistent_read: true
+        ).item
+
+        not item.nil? and Time.now.to_i > item['created'].to_i + ttl
       end
 
-      def table
-        return @table if @table
-        dynamo_db = AWS::DynamoDB.new
+      def dynamodb_client
+        return @dynamodb_client if @dynamodb_client
+        @dynamodb_client = Aws::DynamoDB::Client.new
 
         begin
-          tries ||= 10
-          @table = dynamo_db.tables[TABLE_NAME].load_schema
-        rescue AWS::DynamoDB::Errors::ResourceInUseException
-          raise LockError, "Cannot load schema for table #{TABLE_NAME}" if (tries -= 1).zero?
-
-          logger.info "Could not load schema for table #{TABLE_NAME}; retrying"
-          sleep 1
-          retry
-        rescue AWS::DynamoDB::Errors::ResourceNotFoundException
-          logger.info "Creating table #{TABLE_NAME}"
-          @table = dynamo_db.tables.create(TABLE_NAME, 5, 5)
-          sleep 1 while @table.status != :active
-          logger.info "Table #{TABLE_NAME} created"
+          @dynamodb_client.describe_table(table_name: TABLE_NAME)
+        rescue Aws::DynamoDB::Errors::ResourceNotFoundException
+          logger.info "Table #{TABLE_NAME} not found; creating it."
+          @dynamodb_client.create_table(
+            table_name: TABLE_NAME,
+            attribute_definitions: [
+              { attribute_name: 'id', attribute_type: 'S' }
+            ],
+            key_schema: [
+              { attribute_name: 'id', key_type: 'HASH' }
+            ],
+            provisioned_throughput: {
+              read_capacity_units: 5,
+              write_capacity_units: 5
+            }
+          )
+          logger.info "Waiting for table #{TABLE_NAME} to be created."
+          begin
+            @dynamodb_client.wait_until(:table_exists,
+                                        table_name: TABLE_NAME) do |w|
+              w.max_attempts = 10
+              w.delay = 1
+            end
+          rescue Aws::Waiters::Errors::WaiterFailed => e
+            raise LockError, "Cannot create table #{TABLE_NAME}: #{e.message}"
+          end
+          logger.info "Table #{TABLE_NAME} has been created."
         end
 
-        @table
+        @dynamodb_client
       end
   end
 end

data/lib/dynamodb_mutex/version.rb

@@ -1,4 +1,4 @@
 
 module DynamoDBMutex
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/spec_helper.rb

@@ -2,14 +2,15 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
 require 'fake_dynamo'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
-AWS.config(:use_ssl => false,
-           :dynamo_db_endpoint => 'localhost',
-           :dynamo_db_port => 4567,
-           :access_key_id => 'foo',
-           :secret_access_key => 'bar',
-          )
+Aws.config.update({
+  credentials: Aws::Credentials.new(
+    'your_access_key_id',
+    'your_secret_access_key'
+  ),
+  endpoint: 'http://localhost:4567'
+})
 
 require 'dynamodb-mutex'
 
@@ -21,7 +22,8 @@ RSpec.configure do |config|
   dynamo_thread = nil
 
   config.before(:suite) do
-    FakeDynamo::Storage.db_path = 'test.fdb'
+    FakeDynamo::Logger.setup(:debug)
+    FakeDynamo::Storage.instance.init_db('test.fdb')
     FakeDynamo::Storage.instance.load_aof
 
     dynamo_thread = Thread.new do

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb-mutex
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Dinesh Yadav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fake_dynamo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.5
 description: dynamodb-mutex implements a simple mutex that can be used to coordinate
   access to shared data from multiple concurrent hosts
 email: dy@clearhaus.com
@@ -98,45 +87,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.rst
 - Rakefile
 - lib/dynamodb-mutex.rb
+- lib/dynamodb_mutex.rb
 - lib/dynamodb_mutex/lock.rb
 - lib/dynamodb_mutex/logging.rb
 - lib/dynamodb_mutex/version.rb
-- lib/dynamodb_mutex.rb
 - spec/dynamodb_mutex_spec.rb
 - spec/spec_helper.rb
-- README.rst
-- LICENSE
 homepage: http://github.com/clearhaus/dynamodb-mutex
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 409537590926897434
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 409537590926897434
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Distributed mutex based on AWS DynamoDB
 test_files: []