capistrano-consul_kv_lock 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 054025d77f91b796cce6adc6a0e0c142da62d75b
-  data.tar.gz: 838748f9450e7bfc29dc251b1e2d28620c9d37fb
+  metadata.gz: 4bf44fabccbfc651c90fe736d86d43482637988a
+  data.tar.gz: 9fb2c1d41f8fe68929dbb66cd066235cca84c6dc
 SHA512:
-  metadata.gz: 915ac3ee71d21d003800496b0d2d2723889a8f9f542d792dcf5bc4a90d9d8c07c421d301079028b7122dc5d671a5202920f618c650dc4f56944ca830001232ed
-  data.tar.gz: 4cd3ca73cf866b8f0d1272611a4a05085135a56b8f643162db4bfc90554c857b66708fb6bb2928bcfe6fd3e1dce6263df2410f7511098a01462bde68a28b45b4
+  metadata.gz: e859f7cb88484826a2a9ef6ca1aef7f7fc892fe6d9ea63f76e6c2943f65fb150e9f20667a8c80d400546ccdfd9ab267977a1239704f4f54850dace59c9fb83f1
+  data.tar.gz: 1ae576c9efddb295121b622333e39ca82ea0beddc41abcaeba3ba3b386be65633841dfb79cc15bcff3359de5e46055a3f1ee3b21fbcd5a61b429aa5d6f03ef33

data/capistrano-consul_kv_lock.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "capistrano", ">= 3"
-  spec.add_dependency "consul-client"
+  spec.add_dependency "diplomat"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/capistrano/consul_kv_lock/latch.rb

@@ -1,3 +1,5 @@
+require 'diplomat'
+
 module Capistrano
   module ConsulKvLock
     class SSHKittyLogger
@@ -30,14 +32,11 @@ module Capistrano
       end
 
       def initialize(consul_url, options={})
-        @client = begin
-                   consul = URI.parse(consul_url)
-                   Consul::Client.v1.http(host: consul.host, port: consul.port, logger: logger)
-                  end
+        Diplomat.configuration.url = consul_url
         @lock_key = options[:consul_lock_key] || 'deployment/locked'
         @session_id = nil
       end
-      attr_reader :client, :lock_key
+      attr_reader :lock_key
 
       def logger
         self.class.logger
@@ -51,9 +50,8 @@ module Capistrano
       end
 
       def locked?
-        r = client.get("/kv/#{lock_key}")
-        !!(Base64.decode64(r[0]['Value']) =~ /\A["'](t(rue)?|1|y(es)?)["']\z/)
-      rescue Consul::Client::ResponseException => e
+        !!(Diplomat::Kv.get(lock_key) =~ /\A["'](t(rue)?|1|y(es)?)["']\z/)
+      rescue => e
         # in case of 404
         if e.message.include?('404')
           return false
@@ -64,23 +62,22 @@ module Capistrano
 
       def create_session
         logger.debug "Session request: #{session_request.inspect}"
-        r = client.put("/session/create", session_request)
-        @session_id = r['ID']
+        @session_id = Diplomat::Session.create(session_request)
       end
 
       def delete_session
         with_session {
-          client.put("/session/destroy/#{@session_id}", "")
+          Diplomat::Session.destroy(@session_id)
         }
         @session_id = nil
       end
 
       def lock
-        with_session { client.put("/kv/#{lock_key}?acquire=#{@session_id}", "true") }
+        with_session { Diplomat::Lock.acquire(lock_key, @session_id, "true") }
       end
 
       def unlock
-        with_session { client.put("/kv/#{lock_key}?release=#{@session_id}", "false") }
+        with_session { Diplomat::Lock.release(lock_key, @session_id) }
       end
 
       private

data/lib/capistrano/consul_kv_lock/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module ConsulKvLock
-    VERSION = "0.2.2"
+    VERSION = "0.3.1"
   end
 end

data/lib/capistrano/tasks/consul_kv_lock.rake

@@ -1,8 +1,3 @@
-require 'uri'
-require 'base64'
-
-require 'consul/client'
-
 namespace :consul_kv_lock do
   def latch
     Capistrano::ConsulKvLock::Latch.instance || \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-consul_kv_lock
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Uchio KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: consul-client
+  name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Introduces deployment lock using consul KVS