diplomat 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c7efb343599818bf0533dcb8695aa0283ab59aa
-  data.tar.gz: 000d4c18b30c36c3739ad0d1deda567eebe00cb2
+  metadata.gz: 3f1c9c12e4e39b571bceb79ece16ea11b65e86a1
+  data.tar.gz: 20aab29fd76ec1ccca03f7051a2055d90e2e7c47
 SHA512:
-  metadata.gz: f6aaea91e904df541b9f5a275e2450072411a488522c8748705a826f8d0725ac15c1c2d6d16cb9c037e963853801eb25ff4bf70363bf56dbf9d97069c0ac76b4
-  data.tar.gz: f2e2c8d09390bb45c9fbd4f3779516edefb8921962e3a7f01944c7fbd1037be738bde86d0bdef3d4262c79c52b7a46ad80ccca25ebe42d5ab66a2d8183a0b3f5
+  metadata.gz: 90217e6d23c9fa287a1d53a0e6d9d4abb7e2700222f232b397e154004994880160a0ca97ae27019ba0811f2e054d190d61542a20292fa7c670ed9feeb847e7e8
+  data.tar.gz: 9666756e0d00d492342a4f5898885d459724c8fdbfe5fc36754abcab80fa11faa1a9d4819191183b96a94fff4ae3fa5630fc05708ff58dca12bb0eea31336280

data/README.md

@@ -87,7 +87,7 @@ foo_service = Diplomat::Service.get('foo', :all)
 Creating a session:
 
 ```ruby
-sessionid = Diplomat::Session.create({:hostname => "server1", :ipaddress => "4.4.4.4"})
+sessionid = Diplomat::Session.create({:Node => "server1", :Name => "my-lock"})
 # => "fc5ca01a-c317-39ea-05e8-221da00d3a12"
 ```
 Or destroying a session:
@@ -101,7 +101,7 @@ Diplomat::Session.destroy("fc5ca01a-c317-39ea-05e8-221da00d3a12")
 Acquire a lock:
 
 ```ruby
-sessionid = Diplomat::Session.create({:hostname => "server1", :ipaddress => "4.4.4.4"})
+sessionid = Diplomat::Session.create({:Node => "server1", :Name => "my-lock"})
 lock_acquired = Diplomat::Lock.acquire("/key/to/lock", sessionid)
 # => true
 ```

data/lib/diplomat/lock.rb

@@ -6,25 +6,26 @@ module Diplomat
     # Acquire a lock
     # @param key [String] the key
     # @param session [String] the session, generated from Diplomat::Session.create
+    # @param value [String] the value for the key
     # @return [Boolean] If the lock was acquired
-    def acquire key, session
+    def acquire key, session, value=nil
       raw = @conn.put do |req|
         req.url "/v1/kv/#{key}?acquire=#{session}"
+        req.body = value unless value.nil?
       end
-      return true if raw.body == 'true'
-      return false
-
+      raw.body == 'true'
     end
 
     # wait to aquire a lock
     # @param key [String] the key
     # @param session [String] the session, generated from Diplomat::Session.create
+    # @param value [String] the value for the key
     # @param check_interval [Integer] number of seconds to wait between retries
     # @return [Boolean] If the lock was acquired
-    def wait_to_acquire key, session, check_interval=10
+    def wait_to_acquire key, session, value=nil, check_interval=10
       acquired = false
       while !acquired
-        acquired = self.acquire key, session
+        acquired = self.acquire key, session, value
         sleep(check_interval) if !acquired
         return true if acquired
       end

data/lib/diplomat/session.rb

@@ -4,12 +4,14 @@ module Diplomat
   class Session < Diplomat::RestClient
 
     # Create a new session
-    # @param value [String] json representation of the local node
+    # @param value [Object] hash or json representation of the session arguments
     # @return [String] The sesssion id
-    def create value
+    def create value=nil
+      # TODO: only certain keys are recognised in a session create request,
+      # should raise an error on others.
       raw = @conn.put do |req|
         req.url "/v1/session/create"
-        req.body = value
+        req.body = (if value.kind_of?(String) then value else JSON.generate(value) end) unless value.nil?
       end
       body = JSON.parse(raw.body)
       return body["ID"]

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - John Hamelink