lita-whois 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ea8d3ef372b75007280071a0208e01bd09ac8e
-  data.tar.gz: 0a8237bb38bc43e6d77c16b06ff090ecc1a17d23
+  metadata.gz: d7bf04dbb4e6f3a789a35cf9501d0bec4558ec36
+  data.tar.gz: 38e834e951924536d2e8ccdb9561a331c4771672
 SHA512:
-  metadata.gz: 979dadb1dee9a38c1fee8b9829dd3050bf71df1e797bed237df8d209c6f6adc376ed42c3fb85df9e72092ba794a85def7d0b7ceffa936f1e14cb748c89542333
-  data.tar.gz: e4a20b44b49fa4122d51400a6c97de0d9584e059c904fbebbf259c50df8bf4440500004f925ecf28a75f880005d5a0bce0d79e200f3106f5f2228e1e817131dc
+  metadata.gz: 0c1b30e1a92c99972da9a4f1d1de4a01e8c6eb56839476dc4537d3300fa34815e9f5c157a82bfa5bfe20bd613753424724dc8d182213c6832e6c90f415c3e558
+  data.tar.gz: 493592639e7116fa50bf92d993ac412df07fefc7b25130f216db39651ae6d0ff16313726250949dd0be13046e4e1177deae675ce30592e02b0d515e2e4bc125e

data/.rubocop.yml

@@ -3,6 +3,3 @@ Documentation:
 
 FileName:
   Enabled: false
-
-MethodLength:
-  Max: 15

data/.travis.yml

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

data/Gemfile

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

data/README.md

@@ -1,5 +1,12 @@
 # lita-whois
 
+[![Build Status](https://img.shields.io/travis/glebtv/lita-whois/master.svg)](https://travis-ci.org/glebtv/lita-whois)
+[![MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://tldrlegal.com/license/mit-license)
+[![RubyGems](http://img.shields.io/gem/v/lita-whois.svg)](https://rubygems.org/gems/lita-whois)
+[![Coveralls Coverage](https://img.shields.io/coveralls/glebtv/lita-whois/master.svg)](https://coveralls.io/r/glebtv/lita-whois)
+[![Code Climate](https://img.shields.io/codeclimate/github/glebtv/lita-whois.svg)](https://codeclimate.com/github/glebtv/lita-whois)
+[![Gemnasium](https://img.shields.io/gemnasium/glebtv/lita-whois.svg)](https://gemnasium.com/glebtv/lita-whois)
+
 WHOIS handler for searching domain, TLD, IPv4, and IPv6 WHOIS records.
 
 ## Installation

data/Rakefile

@@ -3,6 +3,6 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-Rubocop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop)
 
-task default: [ :spec, :rubocop ]
+task default: [:spec, :rubocop]

data/lib/lita-whois.rb

@@ -1,10 +1,14 @@
 require 'lita'
 
 Lita.load_locales Dir[File.expand_path(
-    File.join('..', '..', 'locales', '*.yml'), __FILE__
+  File.join('..', '..', 'locales', '*.yml'), __FILE__
 )]
 
 require 'lita/handlers/whois'
 
-require 'ipaddress'
 require 'whois'
+
+Lita::Handlers::Whois.template_root File.expand_path(
+  File.join('..', '..', 'templates'),
+  __FILE__
+)

data/lib/lita/handlers/whois.rb

@@ -2,69 +2,28 @@ module Lita
   module Handlers
     class Whois < Handler
       route(
-        /^whois\s(\w+).(\w+)$/,
-        :whois_domain,
+        /^whois\s(?<input>.*)$/,
+        :whois,
         help: {
-          'whois example.com' => 'Get the WHOIS info for a domain'
+          t('help.syntax.domain') => t('help.desc.domain'),
+          t('help.syntax.tld') => t('help.desc.tld'),
+          t('help.syntax.ip') => t('help.desc.ip')
         }
       )
 
-      route(
-        /^whois\s.(\w+)$/,
-        :whois_tld,
-        help: {
-          'whois .io' => 'Get the WHOIS info for a TLD'
-        }
-      )
-
-      route(
-        /^whois\s(.+)$/,
-        :whois_ip,
-        help: {
-          'whois 8.8.8.8' => 'Get the WHOIS info for an IPv4 or IPv6 address'
-        }
-      )
-
-      def whois_domain(response)
-        response.reply(lookup("#{response.matches[0][0]}." \
-                              "#{response.matches[0][1]}"))
-      end
-
-      def whois_tld(response)
-        response.reply(lookup(".#{response.matches[0][0]}"))
-      end
-
-      def whois_ip(response)
-        if IPAddress.valid? response.matches[0][0]
-          response.reply(reverse_lookup(response.matches[0][0]))
-        end
+      def whois(response)
+        input = response.match_data['input']
+        response.reply(lookup(input))
       end
 
       private
 
-      def lookup(domain)
+      def lookup(record)
         client = ::Whois::Client.new
-        record = nil
-        begin
-          record = client.lookup(domain)
-        rescue ::Whois::ServerNotFound
-          return "Cannot find a WHOIS server for #{domain}"
-        end
-
-        record.to_s
-      end
-
-      def reverse_lookup(ip)
-        client = ::Whois::Client.new
-        record = nil
-        begin
-          record = client.lookup(ip)
-        rescue ::Whois::AllocationUnknown, ::Whois::ServerNotFound,
-               ::Whois::NoInterfaceError
-          return "Cannot find a WHOIS server for #{ip}"
-        end
-
-        record.to_s
+        render_template('full', output: client.lookup(record).to_s)
+      rescue => e
+        log.warn e
+        render_template('simple', output: t('error', record: record))
       end
     end
 

data/lita-whois.gemspec

@@ -1,27 +1,26 @@
 Gem::Specification.new do |spec|
-  spec.name          = "lita-whois"
-  spec.version       = "0.1.0"
-  spec.authors       = ["glebtv", "Eric Sigler"]
-  spec.email         = ["glebtv@gmail.com", "me@esigler.com"]
-  spec.description   = %q{WHOIS handler for lita chat bot}
-  spec.summary       = %q{WHOIS handler for lita chat bot}
-  spec.homepage      = "https://github.com/glebtv/lita-whois"
-  spec.license       = "MIT"
-  spec.metadata      = { "lita_plugin_type" => "handler" }
+  spec.name          = 'lita-whois'
+  spec.version       = '1.1.0'
+  spec.authors       = ['glebtv', 'Eric Sigler']
+  spec.email         = ['glebtv@gmail.com', 'me@esigler.com']
+  spec.description   = 'WHOIS handler for lita chat bot'
+  spec.summary       = spec.description
+  spec.homepage      = 'https://github.com/glebtv/lita-whois'
+  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", ">= 3.0"
-  spec.add_runtime_dependency "whois"
-  spec.add_runtime_dependency "ipaddress"
+  spec.add_runtime_dependency 'lita', '~> 4.2'
+  spec.add_runtime_dependency 'whois'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta2"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
 end

data/locales/en.yml

@@ -2,3 +2,13 @@ en:
   lita:
     handlers:
       whois:
+        help:
+          syntax:
+            domain: whois example.com
+            tld: whois .io
+            ip: whois 8.8.8.8
+          desc:
+            domain: Get the WHOIS info for a domain
+            tld: Get the WHOIS info for a TLD
+            ip: Get the WHOIS info for an IPv4 or IPv6 address
+        error: "Error looking up WHOIS data for %{record}"

data/spec/lita/handlers/whois_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Lita::Handlers::Whois, lita_handler: true do
-  it { routes_command('whois example.com').to(:whois_domain) }
-  it { routes_command('whois .io').to(:whois_tld) }
-  it { routes_command('whois 8.8.8.8').to(:whois_ip) }
-  it { routes_command('whois 2001:418:141e:196::fc4').to(:whois_ip) }
+  it { is_expected.to route_command('whois example.com').to(:whois) }
+  it { is_expected.to route_command('whois .io').to(:whois) }
+  it { is_expected.to route_command('whois 8.8.8.8').to(:whois) }
+  it { is_expected.to route_command('whois 2001:418:141e:196::fc4').to(:whois) }
 
-  describe '#whois_domain' do
+  describe '#whois' do
     let(:domain_good) do
       client = double
       expect(client).to receive(:lookup) { 'Generic response example.com' }
@@ -40,11 +40,9 @@ describe Lita::Handlers::Whois, lita_handler: true do
     it 'shows an error when the domain does not have a WHOIS' do
       expect(Whois::Client).to receive(:new) { domain_err }
       send_command('whois asdf.sdf')
-      expect(replies.last).to eq('Cannot find a WHOIS server for asdf.sdf')
+      expect(replies.last).to eq('Error looking up WHOIS data for asdf.sdf')
     end
-  end
 
-  describe '#whois_tld' do
     let(:tld_good) do
       client = double
       expect(client).to receive(:lookup) { 'Generic TLD response .io' }
@@ -68,9 +66,7 @@ describe Lita::Handlers::Whois, lita_handler: true do
       send_command('whois .wtf')
       expect(replies.last).to eq('Invalid TLD response .wtf')
     end
-  end
 
-  describe '#whois_ipv4' do
     let(:ipv4_good) do
       client = double
       expect(client).to receive(:lookup) { 'Generic IPv4 response 8.8.8.8' }
@@ -104,7 +100,7 @@ describe Lita::Handlers::Whois, lita_handler: true do
     it 'shows an error when the IP is invalid' do
       expect(Whois::Client).to receive(:new) { ipv4_err }
       send_command('whois 0.0.0.0')
-      expect(replies.last).to eq('Cannot find a WHOIS server for 0.0.0.0')
+      expect(replies.last).to eq('Error looking up WHOIS data for 0.0.0.0')
     end
 
     it 'shows results for the IPv6 address' do
@@ -116,7 +112,7 @@ describe Lita::Handlers::Whois, lita_handler: true do
     it 'shows an error when the IP is invalid' do
       expect(Whois::Client).to receive(:new) { ipv6_err }
       send_command('whois ::')
-      expect(replies.last).to eq('Cannot find a WHOIS server for ::')
+      expect(replies.last).to eq('Error looking up WHOIS data for ::')
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,3 +8,24 @@ SimpleCov.start { add_filter '/spec/' }
 
 require 'lita-whois'
 require 'lita/rspec'
+
+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
+  config.color = true
+  config.profile_examples = 5
+
+  Kernel.srand config.seed
+end

data/templates/full.erb

@@ -0,0 +1 @@
+<%= @output %>

data/templates/full.hipchat.erb

@@ -0,0 +1 @@
+/quote <%= @output %>

data/templates/full.slack.erb

@@ -0,0 +1 @@
+```<%= @output %>```

data/templates/simple.erb

@@ -0,0 +1 @@
+<%= @output %>

data/templates/simple.hipchat.erb

@@ -0,0 +1 @@
+/code <%= @output %>

data/templates/simple.slack.erb

@@ -0,0 +1 @@
+`<%= @output %>`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-whois
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - glebtv
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: whois
   requirement: !ruby/object:Gem::Requirement
@@ -40,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ipaddress
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,21 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,21 +68,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -159,6 +145,12 @@ files:
 - locales/en.yml
 - spec/lita/handlers/whois_spec.rb
 - spec/spec_helper.rb
+- templates/full.erb
+- templates/full.hipchat.erb
+- templates/full.slack.erb
+- templates/simple.erb
+- templates/simple.hipchat.erb
+- templates/simple.slack.erb
 homepage: https://github.com/glebtv/lita-whois
 licenses:
 - MIT
@@ -180,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: WHOIS handler for lita chat bot