cinch-magic 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 376e98bc2aabf615ae71b5b283899bb4787c7bf1
+  data.tar.gz: bdd655ceed8614fb0346b741e6607cd74716c7ec
+SHA512:
+  metadata.gz: f415955882480f34f1f73b1a414b4d46e2e0227683f9b16302d3e07c182ce872150af2629a73538bfab68da2473753197dbf7ac74f6002a3f4acf2dbed1f6fe2
+  data.tar.gz: a5f190e08e3ed39c91712597e7727f04f067006f889ffc21bdf0d20bdc02e283b4d5f48bd2263d66a1830fcc4f21906b4581fc45731c3c2f42592c564186778b

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-magic.gemspec

@@ -8,22 +8,19 @@ Gem::Specification.new do |gem|
   gem.version       = Cinch::Plugins::Magic::VERSION
   gem.authors       = ['Brian Haberer']
   gem.email         = ['bhaberer@gmail.com']
-  gem.description   = %q{Cinch Plugin that searches http://magiccards.info/ for card information.}
-  gem.summary       = %q{Cinch Plugin for Magic Cards}
+  gem.description   = %q(Cinch Plugin that searches http://magiccards.info/ for card information.)
+  gem.summary       = %q(Cinch Plugin for Magic Cards)
   gem.homepage      = 'https://github.com/bhaberer/cinch-magic'
   gem.license       = 'MIT'
-
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(/^(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.1'
+  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/magic.rb

@@ -3,93 +3,95 @@ require 'cinch'
 require 'cinch/toolbox'
 require 'cinch/cooldown'
 
-module Cinch::Plugins
-  # Cinch Plugin to looking MTG cards
-  class Magic
-    include Cinch::Plugin
-
-    enforce_cooldown
-
-    self.help = 'Use .mtg <card name> to see the info for that card.'
-
-    match /mtg (.*)/
-
-    def execute(m, term)
-      m.reply get_card(term)
-    end
-
-    private
-
-    def get_card(term)
-      # Fetch the html for the search term
-      data = card_data(term)
-
-      # Catch nil responses.
-      return '[Magic] Card not found, or problem fetching page.' if data.nil?
-
-      # Build card string
-      card = "#{card_name(data)} [#{card_info(data)}] - #{card_text(data)}"
-
-      # Truncate if it's super long
-      card = Cinch::Toolbox.truncate(card, 300)
-
-      "[Magic] #{card} [#{card_link(data)}]"
-    end
-
-    def card_info(data)
-      text = data[/<p[^>]*>([^<]+)<\/p>/, 1]
-
-      # Replace Newlines, unicode lines, total mana, and large spaces.
-      text = text.gsub(/\n/, '')
-      text = text.gsub(/\s—/, ', ')
-      text = text.gsub(/\s\(\d*\)/, '')
-      text = text.gsub(/\s{2,}/, ' ')
-
-      # Remove pesky whitespace that might have snuck in...
-      text.strip!
-
-      text
-    rescue
-      debug 'Error getting the card info'
-      return ''
-    end
-
-    def card_name(data)
-      data[/<a href=[^>]*>([^<]+)<\/a>/, 1]
-    rescue
-      debug 'Error finding the card name'
-      return ''
-    end
-
-    def card_link(data)
-      "http://magiccards.info#{data[/<a href="([^>]*)">[^<]+<\/a>/, 1]}"
-    rescue
-      debug 'Error finding the card url'
-      return ''
-    end
-
-    def card_text(data)
-      data[%r(<p class="ctext"><b[^>]*>(.+)</b></p>), 1].gsub(/<br><br>/, ' ')
-    rescue
-      debug 'Error finding the card description'
-      return ''
-    end
-
-    def card_data(term)
-      # URI Encode the term and build the URL
-      term = URI.escape("!#{term}",
-                        Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-      url = "http://magiccards.info/query?q=#{term}"
-
-      # Make sure the URL is legit
-      url = URI.extract(url, %w(http https)).first
-
-      # Grab the html block because magiccards.info fucking loves tables
-      # and hates helpful ids and classnames
-      Cinch::Toolbox.get_html_element(url, '//table[3]/tr/td[2]', :xpath_full)
-    rescue
-      debug "Error looking up card: #{term}"
-      return
+module Cinch
+  module Plugins
+    # Cinch Plugin to looking MTG cards
+    class Magic
+      include Cinch::Plugin
+
+      enforce_cooldown
+
+      self.help = 'Use .mtg <card name> to see the info for that card.'
+
+      match(/mtg (.*)/)
+
+      def execute(m, term)
+        m.reply get_card(term)
+      end
+
+      private
+
+      def get_card(term)
+        # Fetch the html for the search term
+        data = card_data(term)
+
+        # Catch nil responses.
+        return '[Magic] Card not found, or problem fetching page.' if data.nil?
+
+        # Build card string
+        card = "#{card_name(data)} [#{card_info(data)}] - #{card_text(data)}"
+
+        # Truncate if it's super long
+        card = Cinch::Toolbox.truncate(card, 300)
+
+        "[Magic] #{card} [#{card_link(data)}]"
+      end
+
+      def card_info(data)
+        text = data[/<p[^>]*>([^<]+)<\/p>/, 1]
+
+        # Replace Newlines, unicode lines, total mana, and large spaces.
+        text = text.gsub(/\n/, '')
+        text = text.gsub(/\s—/, ', ')
+        text = text.gsub(/\s\(\d*\)/, '')
+        text = text.gsub(/\s{2,}/, ' ')
+
+        # Remove pesky whitespace that might have snuck in...
+        text.strip!
+
+        text
+      rescue
+        debug 'Error getting the card info'
+        return ''
+      end
+
+      def card_name(data)
+        data[/<a href=[^>]*>([^<]+)<\/a>/, 1]
+      rescue
+        debug 'Error finding the card name'
+        return ''
+      end
+
+      def card_link(data)
+        "http://magiccards.info#{data[/<a href="([^>]*)">[^<]+<\/a>/, 1]}"
+      rescue
+        debug 'Error finding the card url'
+        return ''
+      end
+
+      def card_text(data)
+        data[%r{<p class="ctext"><b[^>]*>(.+)</b></p>}, 1].gsub(/<br><br>/, ' ')
+      rescue
+        debug 'Error finding the card description'
+        return ''
+      end
+
+      def card_data(term)
+        # URI Encode the term and build the URL
+        term = URI.escape("!#{term}",
+                          Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+        url = "http://magiccards.info/query?q=#{term}"
+
+        # Make sure the URL is legit
+        url = URI.extract(url, %w(http https)).first
+
+        # Grab the html block because magiccards.info fucking loves tables
+        # and hates helpful ids and classnames
+        Cinch::Toolbox.get_html_element(url, '//table[3]/tr/td[2]', :xpath_full)
+      rescue
+        debug "Error looking up card: #{term}"
+        return
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Cinch
   module Plugins
     # Version info
     class Magic
-      VERSION = '1.0.3'
+      VERSION = '1.0.4'
     end
   end
 end

data/spec/cinch-magic_spec.rb

@@ -9,12 +9,12 @@ describe Cinch::Plugins::Magic do
   end
 
   it 'should allow users to lookup cards' do
-    get_replies(make_message(@bot, '!mtg forest')).first.text.
-      should include "[Magic] Forest [Basic Land, Forest] - ({T}: Add {G} to your mana pool.)"
+    msg = get_replies(make_message(@bot, '!mtg forest')).first
+    expect(msg.text).to include('[Magic] Forest [Basic Land, Forest] - ({T}: Add {G} to your mana pool.)')
   end
 
   it 'should return an error when a card is not found' do
-    get_replies(make_message(@bot, '!mtg random string that is probably not a real card')).first.text.
-      should == '[Magic] Card not found, or problem fetching page.'
+    msg = get_replies(make_message(@bot, '!mtg random string that is probably not a real card')).first
+    expect(msg.text).to eq('[Magic] Card not found, or problem fetching page.')
   end
 end

metadata

@@ -1,128 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cinch-magic
 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-01 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.1
   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.1
 - !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 searches http://magiccards.info/ for card information.
 email:
 - bhaberer@gmail.com
@@ -145,29 +142,27 @@ files:
 homepage: https://github.com/bhaberer/cinch-magic
 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 Plugin for Magic Cards
 test_files:
 - spec/cinch-magic_spec.rb
 - spec/spec_helper.rb
-has_rdoc: