cinch-wikipedia 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 305cbd144f78bb303fc80ea0799cb7f99bf3e617
+  data.tar.gz: c459148d6bf723416685399c1bb81ef55ff9353d
+SHA512:
+  metadata.gz: d67acf315089000afc197817fc3f721244be777ce70ce680940b342c8d235bb571b293ac4429c16cb9bb59293166f3907fe7b98b41ed63680a39032124e1e504
+  data.tar.gz: d7610b6e57932623fd3798ed99ee9a1f86ca07d5335a8cb7dcf88e31fcecf84fb4b246bad31e4e556f63ca42dded00985e90e5c7283c81f9a8c910d7ad5245d2

data/.travis.yml

@@ -1,4 +1,23 @@
 language: ruby
+env:
+  global:
+    - "JRUBY_OPTS=-Xcext.enabled=true"
 rvm:
-  - 1.9.2
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - jruby-18mode
+  - jruby-19mode
+  - ruby-head
+  - jruby-head
+  - ree
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: ree
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+  fast_finish: true

data/cinch-wikipedia.gemspec

@@ -18,12 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency  'rake'
-  gem.add_development_dependency  'rspec'
-  gem.add_development_dependency  'coveralls'
-  gem.add_development_dependency  'cinch-test'
-
-  gem.add_dependency              'cinch',           '~> 2.0.12'
-  gem.add_dependency              'cinch-toolbox',   '~> 1.1.0'
-  gem.add_dependency              'cinch-cooldown',  '~> 1.1.1'
+  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'coveralls', '~> 0.7'
+  gem.add_development_dependency 'cinch-test', '~> 0.1', '>= 0.1.0'
+  gem.add_dependency 'cinch', '~> 2'
+  gem.add_dependency 'cinch-cooldown', '~> 1.1', '>= 1.1.1'
+  gem.add_dependency 'cinch-toolbox', '~> 1.1'
 end

data/lib/cinch/plugins/wikipedia.rb

@@ -3,64 +3,65 @@ require 'cinch'
 require 'cinch/toolbox'
 require 'cinch/cooldown'
 
-module Cinch::Plugins
-  # Plugin to allow users to search wikipedia.
-  class Wikipedia
-    include Cinch::Plugin
+module Cinch
+  module Plugins
+    # Plugin to allow users to search wikipedia.
+    class Wikipedia
+      include Cinch::Plugin
 
-    enforce_cooldown
+      enforce_cooldown
 
-    self.help = 'Use .wiki <term> to see the Wikipedia info for that term.'
+      self.help = 'Use .wiki <term> to see the Wikipedia info for that term.'
 
-    match /wiki (.*)/
-    match /wikipedia (.*)/
+      match(/wiki(?:pedia)? (.*)/)
 
-    def initialize(*args)
-      super
-      @max_length = config[:max_length] || 300
-    end
+      def initialize(*args)
+        super
+        @max_length = config[:max_length] || 300
+      end
 
-    def execute(m, term)
-      m.reply wiki(term)
-    end
+      def execute(m, term)
+        m.reply wiki(term)
+      end
 
-    private
+      private
 
-    def wiki(term)
-      # URI Encode
-      term = URI.escape(term, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-      url = "http://en.wikipedia.org/w/index.php?search=#{term}"
+      def wiki(term)
+        # URI Encode
+        term = URI.escape(term, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        url = "http://en.wikipedia.org/w/index.php?search=#{term}"
 
-      # Truncate text and url if they are too long
-      text = Cinch::Toolbox.truncate(get_def(term, url), @max_length)
-      url  = Cinch::Toolbox.shorten(url)
+        # Truncate text and url if they are too long
+        text = Cinch::Toolbox.truncate(get_def(term, url), @max_length)
+        url  = Cinch::Toolbox.shorten(url)
 
-      "Wikipedia ∴ #{text} [#{url}]"
-    end
+        "Wikipedia ∴ #{text} [#{url}]"
+      end
 
-    def get_def(term, url)
-      cats = Cinch::Toolbox.get_html_element(url, '#mw-normal-catlinks')
-      if cats && cats.include?('Disambiguation')
-        wiki_text = "'#{term} is too vague and lead to a disambiguation page."
-      else
-        wiki_text = Cinch::Toolbox.get_html_element(url, '#mw-content-text p')
-        if wiki_text.nil? || wiki_text.include?('Help:Searching')
-          return not_found(wiki_text, url)
+      def get_def(term, url)
+        cats = Cinch::Toolbox.get_html_element(url, '#mw-normal-catlinks')
+        if cats && cats.include?('Disambiguation')
+          wiki_text = "'#{term} is too vague and lead to a disambiguation page."
+        else
+          wiki_text = Cinch::Toolbox.get_html_element(url, '#mw-content-text p')
+          if wiki_text.nil? || wiki_text.include?('Help:Searching')
+            return not_found(url)
+          end
         end
+        wiki_text
       end
-      wiki_text
-    end
 
-    def not_found(wiki_text, url)
-      msg = "I couldn't find anything for that search, "
-      alt_term_text = Cinch::Toolbox.get_html_element(url, '.searchdidyoumean')
-      if alt_term_text
-        alt_term = alt_term_text[/\ADid you mean: (\w+)\z/, 1]
-        msg << "did you mean '#{alt_term}'?"
-      else
-        msg << 'sorry!'
+      def not_found(url)
+        msg = "I couldn't find anything for that search, "
+        alt_term = Cinch::Toolbox.get_html_element(url, '.searchdidyoumean')
+        if alt_term
+          alt_term = alt_term[/\ADid you mean: (\w+)\z/, 1]
+          msg << "did you mean '#{alt_term}'?"
+        else
+          msg << 'sorry!'
+        end
+        msg
       end
-      msg
     end
   end
 end

data/lib/cinch/plugins/wikipedia/version.rb

@@ -3,7 +3,7 @@ module Cinch
   module Plugins
     # Versioning information
     class Wikipedia
-      VERSION = '1.0.3'
+      VERSION = '1.0.4'
     end
   end
 end

data/spec/cinch-wikipedia_spec.rb

@@ -9,34 +9,41 @@ describe Cinch::Plugins::Wikipedia do
 
   # normal queries
   it 'should return a definition of a term' do
-    get_replies(make_message(@bot, '!wiki computer')).first.text.
-      should include("A computer is a general purpose device")
+    expect(get_replies(make_message(@bot, '!wiki computer')).first.text)
+      .to include("A computer is a general purpose device")
+  end
+
+  it 'should return a definition of a term for each version of cmd' do
+    msg1 = get_replies(make_message(@bot, '!wiki computer')).first.text
+    msg2 = get_replies(make_message(@bot, '!wikipedia computer')).first.text
+    expect(msg1).to eq(msg2)
   end
 
   it 'should not return multiple lined definitions' do
-    get_replies(make_message(@bot, '!wiki Teenager')).first.text.
-      should_not include("\n")
+    expect(get_replies(make_message(@bot, '!wiki Teenager')).first.text)
+      .to_not include("\n")
   end
 
   it 'should not return definitions that are longer than 250 chars' do
-    get_replies(make_message(@bot, '!wiki Teenager')).first.text.length.
-      should == 334
+    expect(get_replies(make_message(@bot, '!wiki Teenager')).first.text.length)
+      .to eq 334
   end
 
   # Not found
   it 'should return an error message when a term is not found' do
-    get_replies(make_message(@bot, '!wiki dasdafasfasfasfasafsdfsdfsadf')).first.text.
-      should include("I couldn't find anything for that search, sorry!")
+    msg = make_message(@bot, '!wiki dasdafasfasfasfasafsdfsdfsadf')
+    expect(get_replies(msg).first.text)
+      .to include("I couldn't find anything for that search, sorry!")
   end
 
   it 'should provide suggestions if one is listed on the page' do
-    get_replies(make_message(@bot, '!wiki smegama')).first.text.
-      should include("I couldn't find anything for that search, did you mean 'smegma'?")
+    expect(get_replies(make_message(@bot, '!wiki smegama')).first.text)
+      .to include("I couldn't find anything for that search, did you mean 'smegma'?")
   end
 
   # disambiguation
   it 'should return helful information when a disambuation page' do
-    get_replies(make_message(@bot, '!wiki hacker')).first.text.
-      should include('is too vague and lead to a disambiguation page')
+    expect(get_replies(make_message(@bot, '!wiki hacker')).first.text)
+      .to include('is too vague and lead to a disambiguation page')
   end
 end

metadata

@@ -1,128 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cinch-wikipedia
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Brian Haberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: cinch-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: cinch-toolbox
+  name: cinch-cooldown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: cinch-cooldown
+  name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 description: Cinch plugin that fetches a truncated blurb from the head of a wikipedia
   page.
 email:
@@ -146,29 +143,27 @@ files:
 homepage: https://github.com/bhaberer/cinch-wikipedia
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cinch Wikipedia Plugin
 test_files:
 - spec/cinch-wikipedia_spec.rb
 - spec/spec_helper.rb
-has_rdoc: