lita-consul 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9232658952f1f4983470a1482317b32aec9fe6cd
-  data.tar.gz: 37ec31b1e22031b9ec645d644185aa7517f47d7a
+  metadata.gz: 228253cda33615f45e9c3534c5f2021e533ccf10
+  data.tar.gz: 37dbddaec48469f56ff89abd0beefeb1a4ff4099
 SHA512:
-  metadata.gz: d2184ec1fe24738df0955e50b470b5cdb993edd2e7e829684505243a28e12948018fda06398e55e538f55675334c1c5fdcf3d884db5d5f37431306ce7f983bb7
-  data.tar.gz: ebbbb868792a0505b9a4d535d0b9b8c0d4d6a5e3d3e759f344de0447139255cbcba07fb1a4d0663f4fcbddf2e6e8973df4eb9ccfac8a49c2595da0260e6f9c42
+  metadata.gz: 4ab37ec998d27af58cc7cdb423c5a66fcddafb8e8f2782967150e4233ba161b69f3683fac80e817e621e6868d3e73b7fa9318d0c9758f51635380d649f0ea491
+  data.tar.gz: fe69edfcae89d93e99a9cacbb7b76b7ea0821a06fb5f02c051a695ecc14ad2019de62b97da745a56390ec5cb38f087b1beb1dd211f295e54d3e1e4a2176c05b5

data/.rspec

@@ -0,0 +1 @@
+--color --profile 5

data/.rubocop.yml

@@ -0,0 +1,10 @@
+Documentation:
+  Exclude:
+    - lib/lita/handlers/consul.rb
+
+FileName:
+  Exclude:
+    - lib/lita-consul.rb
+
+LineLength:
+  Max: 160

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
-cache: bundler
 rvm:
-  - 2.0.0
-script: bundle exec rake
-before_install:
-  - gem update --system
-  - gem install bundler
+  - 2.1
+  - 2.2
 services:
   - redis-server
+sudo: false
+cache: bundler

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
-task default: :spec
+task default: [:spec, :rubocop]

data/lib/lita-consul.rb

@@ -1,12 +1,12 @@
-require "lita"
+require 'lita'
 
 Lita.load_locales Dir[File.expand_path(
-  File.join("..", "..", "locales", "*.yml"), __FILE__
+  File.join('..', '..', 'locales', '*.yml'), __FILE__
 )]
 
-require "lita/handlers/consul"
+require 'lita/handlers/consul'
 
 Lita::Handlers::Consul.template_root File.expand_path(
-  File.join("..", "..", "templates"),
- __FILE__
+  File.join('..', '..', 'templates'),
+  __FILE__
 )

data/lib/lita/handlers/consul.rb

@@ -1,80 +1,81 @@
-require "base64"
+require 'base64'
 
 module Lita
   module Handlers
     class Consul < Handler
+      config :consul_host, type: String, default: 'http://127.0.0.1'
+      config :consul_port, type: String, default: '8500'
 
-      config :consul_host
-      config :consul_port
+      route(
+        %r{^consul\sget\s(?<key>[\w\-\/]+)},
+        :consul_get,
+        command: true,
+        help: {
+          t('help.get.syntax') => t('help.get.desc')
+        }
+      )
 
-      route /^consul get ([a-zA-Z0-9\-\/_]+)/, :consul_get, command: true, help: {
-        "consul get <key>" => "Return value for <key>"
-      }
+      route(
+        %r{^consul\sset\s(?<key>[\w\-\/]+)\s(?<value>[\w\-\/]+)},
+        :consul_set,
+        command: true,
+        help: {
+          t('help.set.syntax') => t('help.set.desc')
+        }
+      )
 
-      route /^consul set ([a-zA-Z0-9\-\/_]+) ([a-zA-Z0-9\-\/_]+)/, :consul_set, command: true, help: {
-        "consul set <key> <value>" => "Set <value> for <key>"
-      }
-  
-      route /^consul members/, :consul_members, command: true, help: {
-        "consul members" => "Return consul nodes"
-      }
+      route(
+        /^consul\smembers$/,
+        :consul_members,
+        command: true,
+        help: {
+          t('help.members.syntax') => t('help.members.desc')
+        }
+      )
 
       def consul_members(response)
-          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
+        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
 
       def consul_get(response)
-        key = response.matches.first.first
-        begin
-          value = get_key_value(key)
-          response.reply "#{key} = #{value}"
-        rescue Faraday::ConnectionFailed => e
-          response.reply e.message
-        end
+        key = response.match_data['key']
+        value = get_key_value(key)
+        response.reply "#{key} = #{value}"
+      rescue Faraday::ConnectionFailed => e
+        response.reply e.message
       end
 
       def consul_set(response)
-        key = response.matches.first.first
-        value = response.matches.first.last
-        begin
-          resp = http.put("#{api_url}/kv/#{key}", value)
-          value = get_key_value(key)
-          response.reply "#{key} = #{value}"
-        rescue Faraday::ConnectionFailed => e
-          response.reply e.message
-        end
+        key = response.match_data['key']
+        value = response.match_data['value']
+        http.put("#{api_url}/kv/#{key}", value)
+        value = get_key_value(key)
+        response.reply "#{key} = #{value}"
+      rescue Faraday::ConnectionFailed => e
+        response.reply e.message
       end
 
       private
 
       def get_key_value(key)
-          resp = http.get("#{api_url}/kv/#{key}")
-          obj = MultiJson.load(resp.body)
-          unless obj[0]["Value"].nil?
-            value = Base64.decode64(obj[0]["Value"])
-            "#{value}"
-          else
-            "null"
-          end
+        resp = http.get("#{api_url}/kv/#{key}")
+        obj = MultiJson.load(resp.body)
+        if obj[0]['Value'].nil?
+          'null'
+        else
+          Base64.decode64(obj[0]['Value'])
+        end
       end
-      
-      def api_url
-        host = "http://127.0.0.1"
-        port = "8500" 
-        
-        host = config.consul_host if config.consul_host
-        port = config.consul_port if config.consul_port
 
-        "#{host}:#{port}/v1"
+      def api_url
+        "#{config.consul_host}:#{config.consul_port}/v1"
       end
 
       Lita.register_handler(self)

data/lita-consul.gemspec

@@ -1,26 +1,27 @@
 Gem::Specification.new do |spec|
-  spec.name          = "lita-consul"
-  spec.version       = "0.0.6"
-  spec.authors       = ["David Pires"]
-  spec.email         = ["david.pires@gmail.com"]
-  spec.description   = "Lita handler for Consul"
-  spec.summary       = "A lita handler for interacting with Consul"
-  spec.homepage      = "https://github.com/dpires/lita-consul.git"
-  spec.license       = "MIT"
-  spec.metadata      = { "lita_plugin_type" => "handler" }
+  spec.name          = 'lita-consul'
+  spec.version       = '0.0.7'
+  spec.authors       = ['David Pires']
+  spec.email         = ['david.pires@gmail.com']
+  spec.description   = 'Lita handler for Consul'
+  spec.summary       = 'A lita handler for interacting with Consul'
+  spec.homepage      = 'https://github.com/dpires/lita-consul.git'
+  spec.license       = 'MIT'
+  spec.metadata      = { 'lita_plugin_type' => 'handler' }
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "lita", ">= 4.6"
+  spec.add_runtime_dependency 'lita', '>= 4.6'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec", ">= 3.0.0"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
 end

data/locales/en.yml

@@ -2,3 +2,13 @@ en:
   lita:
     handlers:
       consul:
+        help:
+          get:
+            syntax: consul get <key>
+            desc: Return value for <key>
+          set:
+            syntax: consul set <key> <value>
+            desc: Set <value> for <key>
+          members:
+            syntax: consul members
+            desc: Return consul nodes

data/spec/lita/handlers/consul_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Lita::Handlers::Consul, lita_handler: true do
   describe 'lita routes' do
@@ -11,10 +11,10 @@ describe Lita::Handlers::Consul, lita_handler: true do
     allow_any_instance_of(Faraday::Connection).to receive(:get).and_return(response)
     allow_any_instance_of(Faraday::Connection).to receive(:put).and_return(response)
   end
-    
-  let(:response) { double("Faraday::Response") }
-  let(:single_key_response) {
-    %{
+
+  let(:response) { double('Faraday::Response') }
+  let(:single_key_response) do
+    %(
       [
         {
           "CreateIndex":67,
@@ -25,11 +25,11 @@ describe Lita::Handlers::Consul, lita_handler: true do
           "Value":"dGVzdGluZw=="
         }
       ]
-    }
-  }
+    )
+  end
 
-  let(:null_value_response) {
-    %{
+  let(:null_value_response) do
+    %(
       [
         {
           "CreateIndex":67,
@@ -40,11 +40,11 @@ describe Lita::Handlers::Consul, lita_handler: true do
           "Value":null
         }
       ]
-    }
-  }
+    )
+  end
 
-  let(:new_key_response) {
-    %{
+  let(:new_key_response) do
+    %(
       [
         {
           "CreateIndex":67,
@@ -55,23 +55,23 @@ describe Lita::Handlers::Consul, lita_handler: true do
           "Value":"d3d3LnRlc3QuY29t"
         }
       ]
-    }
-  }
+    )
+  end
 
-  let(:members_response) {
-    %{
+  let(:members_response) do
+    %(
       [
         {"Node":"node1.node.consul","Address":"192.168.0.33"},
         {"Node":"node2.node.consul","Address":"192.168.0.34"}
       ]
-    }
-  }
+    )
+  end
 
   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)"))
+      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)');
+      expect(replies.last).to eq('Connection refused - connect(2)')
     end
 
     it 'should list member nodes' do
@@ -83,36 +83,36 @@ describe Lita::Handlers::Consul, lita_handler: true do
 
   describe '#consul get' 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)"))
+      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)');
+      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")
+      expect(replies.last).to eq('mykey = testing')
     end
 
     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")
+      expect(replies.last).to eq('mykey = null')
     end
   end
 
   describe '#consul set' 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)"))
+      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)');
+      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')
-      expect(replies.last).to eq("myapp/config/url = www.test.com")
+      expect(replies.last).to eq('myapp/config/url = www.test.com')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,29 @@
-require "simplecov"
-require "coveralls"
+require 'simplecov'
+require 'coveralls'
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start { add_filter "/spec/" }
+SimpleCov.start { add_filter '/spec/' }
 
-require "lita-consul"
-require "lita/rspec"
+require 'lita-consul'
+require 'lita/rspec'
 
-# A compatibility mode is provided for older plugins upgrading from Lita 3. Since this plugin
-# was generated with Lita 4, the compatibility mode should be left disabled.
 Lita.version_3_compatibility_mode = false
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+  config.default_formatter = 'doc' if config.files_to_run.one?
+  config.order = :random
+
+  Kernel.srand config.seed
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-consul
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - David Pires
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +144,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE