lita-consul 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1dcdc85c967e90ba40290503f6e2262eab3168
-  data.tar.gz: 6bf0caf3912baed6aaf5a204defe552f8568e4e3
+  metadata.gz: 9232658952f1f4983470a1482317b32aec9fe6cd
+  data.tar.gz: 37ec31b1e22031b9ec645d644185aa7517f47d7a
 SHA512:
-  metadata.gz: 748b6e59e0102d457b5aa8a0d8ab7be876b1fd8cd00c3fbf6ce5fed7c2d920df4a61427b9db1c5fe126814896aa0f60c0257a56b7f3c5e8e944553e16e1eb53d
-  data.tar.gz: 1240dd05be30f3abfc9cd27177d2b10c69bd2bc333d82ab4b8f35d5f371264235a8c6926de21ed7c04e8f99125db78b4d43182e5376ab97cf2b7c8fe660605b8
+  metadata.gz: d2184ec1fe24738df0955e50b470b5cdb993edd2e7e829684505243a28e12948018fda06398e55e538f55675334c1c5fdcf3d884db5d5f37431306ce7f983bb7
+  data.tar.gz: ebbbb868792a0505b9a4d535d0b9b8c0d4d6a5e3d3e759f344de0447139255cbcba07fb1a4d0663f4fcbddf2e6e8973df4eb9ccfac8a49c2595da0260e6f9c42

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2015 David Pires
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/dpires/lita-consul.png?branch=master)](https://travis-ci.org/dpires/lita-consul)
 [![Coverage Status](https://coveralls.io/repos/dpires/lita-consul/badge.svg?branch=master&service=github)](https://coveralls.io/github/dpires/lita-consul?branch=master)
+[![Gem Version](https://badge.fury.io/rb/lita-consul.svg)](https://badge.fury.io/rb/lita-consul)
 
 **lita-consul** is a handler for [Lita](https://github.com/litaio/lita) for interacting with [Consul](https://github.com/hashicorp/consul).
 
@@ -28,8 +29,11 @@ gem "lita-consul"
 [Lita]: foo = bar 
 [You]: lita consul set mykey myvalue
 [Lita]: mykey = myvalue
+[You]: lita consul members
+[Lita]: node1.node.consul - 192.168.0.33
+        node2.node.consul - 192.168.0.34
 ```
 
 ## License
 
-[MIT](http://opensource.org/licenses/MIT)
+[MIT](LICENSE)

data/lib/lita/handlers/consul.rb

@@ -20,19 +20,26 @@ module Lita
       }
 
       def consul_members(response)
-          resp = http.get("#{api_url}/catalog/nodes")
-          replies = []
-          MultiJson.load(resp.body).each do | node |
-            replies << "#{node['Node']} - #{node['Address']}"
-          end 
-          response.reply replies.join("\n")
+          begin
+            resp = http.get("#{api_url}/catalog/nodes")
+            replies = []
+            MultiJson.load(resp.body).each do | node |
+              replies << "#{node['Node']} - #{node['Address']}"
+            end 
+            response.reply replies.join("\n")
+          rescue Faraday::ConnectionFailed => e
+            response.reply e.message
+          end
       end
 
       def consul_get(response)
         key = response.matches.first.first
-
-        value = get_key_value(key)
-        response.reply "#{key} = #{value}"
+        begin
+          value = get_key_value(key)
+          response.reply "#{key} = #{value}"
+        rescue Faraday::ConnectionFailed => e
+          response.reply e.message
+        end
       end
 
       def consul_set(response)
@@ -40,19 +47,16 @@ module Lita
         value = response.matches.first.last
         begin
           resp = http.put("#{api_url}/kv/#{key}", value)
-          if resp.status == 200
-            value = get_key_value(key)
-            response.reply "#{key} = #{value}"
-          else
-            response.reply resp.body
-          end
+          value = get_key_value(key)
+          response.reply "#{key} = #{value}"
+        rescue Faraday::ConnectionFailed => e
+          response.reply e.message
         end
       end
 
       private
 
       def get_key_value(key)
-        begin
           resp = http.get("#{api_url}/kv/#{key}")
           obj = MultiJson.load(resp.body)
           unless obj[0]["Value"].nil?
@@ -61,9 +65,6 @@ module Lita
           else
             "null"
           end
-        rescue Faraday::ConnectionFailed=> e
-          e.to_s
-        end
       end
       
       def api_url

data/lita-consul.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-consul"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["David Pires"]
   spec.email         = ["david.pires@gmail.com"]
   spec.description   = "Lita handler for Consul"

data/spec/lita/handlers/consul_spec.rb

@@ -68,6 +68,12 @@ describe Lita::Handlers::Consul, lita_handler: true do
   }
 
   describe '#consul members' do
+    it 'should catch connection error' do
+      allow_any_instance_of(Faraday::Connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      send_command('consul members')
+      expect(replies.last).to eq('Connection refused - connect(2)');
+    end
+
     it 'should list member nodes' do
       allow(response).to receive(:body).and_return(members_response)
       send_command('consul members')
@@ -76,13 +82,19 @@ describe Lita::Handlers::Consul, lita_handler: true do
   end
 
   describe '#consul get' do
-    it 'return value for key' do
+    it 'should catch error when exception occurs' do
+      allow_any_instance_of(Lita::Handlers::Consul).to receive(:get_key_value).and_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      send_command('consul get mykey')
+      expect(replies.last).to eq('Connection refused - connect(2)');
+    end
+
+    it 'should return value for key' do
       allow(response).to receive(:body).and_return(single_key_response)
       send_command('consul get mykey')
       expect(replies.last).to eq("mykey = testing")
     end
 
-    it 'return null value for key' do
+    it 'should return null value for key' do
       allow(response).to receive(:body).and_return(null_value_response)
       send_command('consul get mykey')
       expect(replies.last).to eq("mykey = null")
@@ -90,7 +102,13 @@ describe Lita::Handlers::Consul, lita_handler: true do
   end
 
   describe '#consul set' do
-    it 'set and return value for key' do
+    it 'should catch error when exception occurs' do
+      allow_any_instance_of(Lita::Handlers::Consul).to receive(:get_key_value).and_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      send_command('consul set mykey value')
+      expect(replies.last).to eq('Connection refused - connect(2)');
+    end
+
+    it 'should set and return value for key' do
       allow(response).to receive(:body).and_return(new_key_response)
       allow(response).to receive(:status).and_return(200)
       send_command('consul set myapp/config/url www.test.com')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-consul
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - David Pires
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -132,6 +132,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/lita-consul.rb