capistrano3-consul 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e4dc5a48c3b4441fe9ea8cb4ec5ebdeed5add2
-  data.tar.gz: c2ffd16cc1f601f0e9dc4f824392549f24f92d19
+  metadata.gz: 82039e309f6d3e4afe64399aed1930523c1d8ead
+  data.tar.gz: 1a25e17c52d5f4d3d01ec4b5be473dec592594d1
 SHA512:
-  metadata.gz: 48d05c09769887b3821b9fbc4994520bc5f4da5a4db3084d5ac84f1712adaca2ed6e2e1bbd323230e463eeddfbb64a6b139a921971e4b2895c7cebfbae703a83
-  data.tar.gz: f76d2c61d78f3d3acddfc3e25b08ee0eadcb43f309e13f55266e244e4b69c21460626f9f0ad149ae12ab6bd313085c159eba5b273207d8b98f3ab9a6469f29e3
+  metadata.gz: 8b913cbe1f95f6830ed4e7f211596e72386803c4d1ff0698a348ec680e6e5282eac8df8c42041611faeeeb1853fbbf0eb12061c2e9c4f7c5659a9ba7a3ec929f
+  data.tar.gz: 7c1cce72c90ec4017b7f88b97130ab04df5e41bf66576a6b0c4ed6862fe730e9c2ee61233f1d238bf4f8be93193887898b8cd9a3fc407dd1edfecca569be51ef

data/README.md

@@ -39,6 +39,7 @@ consul_all_nodes roles %w{web app}
 
 ## Configuration
 **consul_url** The api endpoint
+**consul_token** The Consul token needed if an ACL is specified
 **consul_ssh_gateway** You can configure an ssh gateway (i.e. a tunner that will be created before connecting to consul).
 
 Example:

data/lib/capistrano/consul.rb

@@ -7,15 +7,19 @@ module Capistrano
     def self.setup
       return if @url
       @url = fetch(:consul_url)
+      @token = fetch(:consul_token)
       return false unless @url
       @ssh_gateway = fetch(:consul_ssh_gateway)
       if @ssh_gateway
-        @gateway = Net::SSH::Gateway.new(@ssh_gateway[:host], @ssh_gateway[:username], @ssh_gateway[:options] || {})
+        @gateway = Net::SSH::Gateway.new(@ssh_gateway[:host], @ssh_gateway[:username] || @ssh_gateway[:user], @ssh_gateway[:options] || {})
         @gateway.open('127.0.0.1', @ssh_gateway[:port], @ssh_gateway[:port])
       end
 
       Diplomat.configure do |config|
         config.url = @url
+        if @token
+          config.acl_token = @token
+        end
       end
     end
   end

data/lib/capistrano/consul/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Consul
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-consul
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jose Fernandez (magec)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Plugin to use a consul server/cluster to define capistrano servers.