consul_do 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1c3d214b88585c7c81c78fd7c2259bb3649f90
-  data.tar.gz: 90c3338c79704716ff7846f3d82c410645ce4d10
+  metadata.gz: 4d4957226da4752a9ea6c7dbad95d11d26a83a6a
+  data.tar.gz: 8b162f20735d87d73316e0ed377480b5f3274047
 SHA512:
-  metadata.gz: b98f75d271bfb21af5d4bef9eb855c5573c31b41d058e8acd91684adc88e300fb38baf5652764a793d22ab2b4f6588100be56bd98eb7945dfcfebbcae3025413
-  data.tar.gz: a7b9091b66e273b8b8fc8d1aa743df4f6538fd53b0e712dff2eda242100eef54a7e23ba9bd1822f1ce7ffa95a2386786974800cea8f938f0c7fca3998d091f15
+  metadata.gz: cef041656eb904456cbbdfd0556c841f20225ec392ea9c689cc2bc6154d067f9d574b483356005b3c012886b2ada9377e5fc18fdb21ead6fd2b38770e629d528
+  data.tar.gz: 85f5dbfb0eae86231554843791453e8400dd915b733a66e2a7ddae18edd3e9738a85d8233a9667146a8fec3efe0d3960734bb9f0c359c13f22a0437a7813934a

data/circle.yml

@@ -0,0 +1,5 @@
+machine:
+  ruby:
+    version: 2.1.6
+  timezone:
+    Etc/GMT

data/consul_do.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "pry", "~> 0.10"

data/lib/consul_do/config.rb

@@ -3,7 +3,7 @@ require 'optparse'
 module ConsulDo
   class Config
 
-    attr_accessor :key, :host, :port, :http_proxy, :verbose
+    attr_accessor :key, :host, :port, :http_proxy, :verbose, :token
 
     def initialize
       @host = 'localhost'
@@ -19,6 +19,7 @@ module ConsulDo
         opts.on("-k", "--key KEY=consul_do", "Coordination key"){ |v| self.key = v }
         opts.on("-h", "--consul-host HOST=localhost", "Consul hostname"){ |v| self.host = v }
         opts.on("-p", "--consul-port PORT=8500", "Consul port"){ |v| self.port = v }
+        opts.on("-t", "--token TOKEN", "ACL Token"){ |v| self.token = v }
         opts.on("--http_proxy http://HOST:PORT", "Use supplied proxy instead of ENV "){ |v| self.http_proxy = v }
         opts.on("-v", "--verbose", "Consul port"){ |v| self.verbose = v }
       end.parse!

data/lib/consul_do/elect.rb

@@ -12,35 +12,30 @@ module ConsulDo
     end
 
     def get_key
-      url = "#{base_url}/v1/kv/service/#{ConsulDo.config.key}/leader"
+      url = "#{base_url}/v1/kv/service/#{ConsulDo.config.key}/leader?" + token_str
       response = ConsulDo.http_get(url)
-      case response
-      when Net::HTTPSuccess
-        ConsulDo.log "get_key", JSON.parse(response.body).first
-      else
-        ConsulDo.log "get_key", {}
+      ConsulDo.log "get_key", parse_json(response.body, [{}]).first
+    end
+
+    def parse_json(json_blob, default_value)
+      begin
+        JSON.parse(json_blob)
+      rescue JSON::ParserError, TypeError
+        default_value
       end
     end
 
     def get_session_info(session_id)
       url = "#{base_url}/v1/session/info/#{session_id}"
       response = ConsulDo.http_get(url)
-      if response.body == "null"
-        raise "Invalid Session"
-      else
-        ConsulDo.log "get_session_info", JSON.parse(response.body).first
-      end
+      ConsulDo.log "get_session_info", parse_json(response.body, []).first or raise "Invalid Session"
     end
 
     def create_session
       url = "#{base_url}/v1/session/create"
-      response = ConsulDo.http_put(url, {"name" => ConsulDo.config.session_name})
-      case response
-      when Net::HTTPSuccess
-        ConsulDo.log "create_session", JSON.parse(response.body)['ID']
-      else
-        raise "Could not create session: #{response.code} - #{response.message} (#{response.body})"
-      end
+      response = ConsulDo.http_put(url, {'name' => ConsulDo.config.session_name})
+
+      ConsulDo.log "create_session", parse_json(response.body, {})['ID'] or raise "Could not create session: #{response.code} - #{response.message} (#{response.body})"
     end
 
     def session
@@ -63,7 +58,7 @@ module ConsulDo
     def delete_sessions
       url = "#{base_url}/v1/session/node/#{get_session_info(session)['Node']}"
       response = ConsulDo.http_get(url)
-      JSON.parse(response.body).each do |session_hash|
+      parse_json(response.body, []).each do |session_hash|
         if block_given?
           delete_session(session_hash['ID']) if yield session_hash['Name']
         else
@@ -72,8 +67,16 @@ module ConsulDo
       end
     end
 
+    def token_str
+      if ConsulDo.config.token
+        "&token=#{ConsulDo.config.token}"
+      else
+        ""
+      end
+    end
+
     def get_lock
-      url = "#{base_url}/v1/kv/service/#{ConsulDo.config.key}/leader?acquire=#{session}"
+      url = "#{base_url}/v1/kv/service/#{ConsulDo.config.key}/leader?acquire=#{session}" + token_str
       response = ConsulDo.http_put(url, {'updated' => Time.now})
       @session_has_lock = true if response.body == "true"
     end

data/lib/consul_do/version.rb

@@ -1,3 +1,3 @@
 module ConsulDo
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/consul_do.rb

@@ -18,6 +18,10 @@ module ConsulDo
     @elect ||= Elect.new
   end
 
+  def self.elect!
+    @elect = Elect.new
+  end
+
   def self.http_put(dest_url, data = nil)
     uri = URI.parse(dest_url)
     request = config.http_client.new(uri.host, uri.port)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_do
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jason Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- circle.yml
 - consul_do.gemspec
 - exe/consul-do
 - lib/consul_do.rb