cinch-links-titles 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 49a8ebd12a6ad2b47b1c66525d3ead4dcfa9248c
+  data.tar.gz: e93bdb2029e39c870893f1239d0a474549d5a2db
+SHA512:
+  metadata.gz: fe41022c1a90eb5c784ad95e99b2a8ebed088f0f9f4ff648ead484d61b6cab72608ca8a520b3cd3ab75aa7aeec6780148ff3dd3eb778673b186697f4cd78193a
+  data.tar.gz: f5d6ea504d67bb34e57bdddc83073f95210ccde8218d9de7467107a8ef7d3e7a68b78e3789805f72cc42bd04ce281a26eae7f3c68a735d699670d3494ca1401c

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

@@ -8,24 +8,21 @@ Gem::Specification.new do |gem|
   gem.version       = Cinch::Plugins::LinksTitles::VERSION
   gem.authors       = ['Brian Haberer']
   gem.email         = ['bhaberer@gmail.com']
-  gem.description   = %q{Cinch Plugin to print link titles to the channel}
-  gem.summary       = %q{Link Titles}
+  gem.description   = %q(Cinch Plugin to print link titles to the channel)
+  gem.summary       = %q(Link Titles)
   gem.homepage      = 'https://github.com/bhaberer/cinch-links-titles'
   gem.license       = 'MIT'
-
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}) { |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-cooldown',  '~> 1.1.1'
-  gem.add_dependency              'cinch-storage',   '~> 1.1.0'
-  gem.add_dependency              'cinch-toolbox',   '~> 1.1.0'
-  gem.add_dependency              'time-lord',       '~> 1.0.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-storage', '~> 1.1'
+  gem.add_dependency 'cinch-toolbox', '~> 1.1'
 end

data/lib/cinch/plugins/links-titles.rb

@@ -5,114 +5,115 @@ require 'cinch/toolbox'
 require 'cinch/storage'
 require 'time-lord'
 
-module Cinch::Plugins
-  # Plugin to print URL titles in the channel.
-  class LinksTitles
-    include Cinch::Plugin
-    attr_accessor :storage
-
-    # Simple struct object for tracking Links.
-    class Link < Struct.new(:nick, :title, :count, :short_url, :url, :time)
-      def to_yaml
-        { nick: nick, title: title, count: count, short_url:  short_url,
-          url: url, time: time }
+module Cinch
+  module Plugins
+    # Plugin to print URL titles in the channel.
+    class LinksTitles
+      include Cinch::Plugin
+      attr_accessor :storage
+
+      # Simple struct object for tracking Links.
+      class Link < Struct.new(:nick, :title, :count, :short_url, :url, :time)
+        def to_yaml
+          { nick: nick, title: title, count: count, short_url:  short_url,
+            url: url, time: time }
+        end
       end
-    end
 
-    listen_to :channel
+      listen_to :channel
 
-    def initialize(*args)
-      super
-      @storage = Cinch::Storage.new(config[:filename] ||
-                                  'yaml/links-titles.yaml')
-      @storage.data[:history] ||= {}
-      @post_stats  = config[:stats].nil?  ? false : config[:stats]
-    end
+      def initialize(*args)
+        super
+        @storage = Cinch::Storage.new(config[:filename] ||
+                                    'yaml/links-titles.yaml')
+        @storage.data[:history] ||= {}
+        @post_stats  = config[:stats].nil?  ? false : config[:stats]
+      end
 
-    def listen(m)
-      urls = URI.extract(m.message, %w(http https))
-      urls.each do |url|
-        # Ensure we have a Channel Object in the History to dump links into.
-        @storage.data[:history][m.channel.name] ||= Hash.new
+      def listen(m)
+        urls = URI.extract(m.message, %w(http https))
+        urls.each do |url|
+          # Ensure we have a Channel Object in the History to dump links into.
+          @storage.data[:history][m.channel.name] ||= Hash.new
 
-        # Process link
-        link = process_link(url, m.channel.name, m.user.nick)
+          # Process link
+          link = process_link(url, m.channel.name, m.user.nick)
 
-        # Send link title to channel
-        post_title(m, link)
+          # Send link title to channel
+          post_title(m, link)
 
-        # Send link stats to channel
-        post_stats(m, link)
-      end
+          # Send link stats to channel
+          post_stats(m, link)
+        end
 
-      # Don't save unless we found some urls to process
-      @storage.synced_save(@bot) if urls
-    end
+        # Don't save unless we found some urls to process
+        @storage.synced_save(@bot) if urls
+      end
 
-    private
+      private
 
-    def process_link(url, channel, nick)
-      # Make sure it conforms to white/black lists before bothering.
-      if whitelisted?(url) && !blacklisted?(url)
-        return get_or_query_link(url, channel, nick)
-      else
-        if blacklisted?(url)
-          debug "Blacklisted URL was not logged #{url}"
+      def process_link(url, channel, nick)
+        # Make sure it conforms to white/black lists before bothering.
+        if whitelisted?(url) && !blacklisted?(url)
+          return get_or_query_link(url, channel, nick)
         else
-          debug "Domain not Whitelisted #{url}"
+          if blacklisted?(url)
+            debug "Blacklisted URL was not logged #{url}"
+          else
+            debug "Domain not Whitelisted #{url}"
+          end
+          return nil
         end
-        return nil
       end
-    end
 
-    def get_or_query_link(url, channel, nick)
-      # If the link was posted already, get the old info
-      if @storage.data[:history][channel].key?(url)
-        @storage.data[:history][channel][url][:count] += 1
-        link = @storage.data[:history][channel][url]
-      else
-        link = Link.new(nick, Cinch::Toolbox.get_page_title(url) || nil,
-                        1, Cinch::Toolbox.shorten(url), url, Time.now)
-        @storage.data[:history][channel][url] = link
+      def get_or_query_link(url, channel, nick)
+        # If the link was posted already, get the old info
+        if @storage.data[:history][channel].key?(url)
+          @storage.data[:history][channel][url][:count] += 1
+          link = @storage.data[:history][channel][url]
+        else
+          link = Link.new(nick, Cinch::Toolbox.get_page_title(url) || nil,
+                          1, Cinch::Toolbox.shorten(url), url, Time.now)
+          @storage.data[:history][channel][url] = link
+        end
+        link
       end
-      link
-    end
 
-    def post_title(m, link)
-      # Only spam the channel if you have a title
-      unless link.nil? || link.title.nil?
+      def post_title(m, link)
+        # Only spam the channel if you have a title
+        return if link.nil? || link.title.nil?
         m.reply "#{link.short_url || link.url} ∴  #{link.title}"
       end
-    end
 
-    def post_stats(m, link)
-      # Check to see if we should post stats and if it's been linked
-      # more than once.
-      if config[:stats]
-        if link.count > 1
-          # No stats if this person was the first one to link it
-          unless link.nick == m.user.nick
-            m.reply "That was already linked by #{link.nick} " +
-                    "#{link.time.ago.to_words}.", true
-          end
-        end
+      def post_stats(m, link)
+        # Check to see if we should post stats
+        return unless config.key?(:stats)
+
+        # Check to see if it's been linked more than once.
+        return unless link.count > 1
+
+        # No stats if this person was the first one to link it
+        return if link.nick == m.user.nick
+
+        m.reply "That was already linked by #{link.nick} " \
+                      "#{link.time.ago.to_words}.", true
       end
-    end
 
-    def whitelisted?(url)
-      return true unless config[:whitelist]
-      debug "Checking Whitelist! #{config[:whitelist]} url: #{url}"
-      return true if url.match(
-        Regexp.new("https?:\/\/.*\.?#{config[:whitelist].join('|')}\."))
-      false
-    end
+      def whitelisted?(url)
+        return true unless config[:whitelist]
+        debug "Checking Whitelist! #{config[:whitelist]} url: #{url}"
+        return true if url.match(
+          Regexp.new("https?:\/\/.*\.?#{config[:whitelist].join('|')}\."))
+        false
+      end
 
-    def blacklisted?(url)
-      return false unless config[:blacklist]
-      debug "Checking Blacklist! #{config[:blacklist]} url: #{url}"
-      return true if url.match(
-        Regexp.new("https?:\/\/.*\.?#{config[:blacklist].join('|')}\."))
-      false
+      def blacklisted?(url)
+        return false unless config[:blacklist]
+        debug "Checking Blacklist! #{config[:blacklist]} url: #{url}"
+        return true if url.match(
+          Regexp.new("https?:\/\/.*\.?#{config[:blacklist].join('|')}\."))
+        false
+      end
     end
   end
 end

data/lib/cinch/plugins/links-titles/version.rb

@@ -3,7 +3,7 @@ module Cinch
   module Plugins
     # Versioning info
     class LinksTitles
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
     end
   end
 end

data/spec/cinch-links-titles_spec.rb

@@ -9,53 +9,54 @@ describe Cinch::Plugins::LinksTitles do
   end
 
   it 'should print titles' do
-    get_replies(make_message(@bot, 'http://github.com',
-                             { channel: '#foo', nick: 'bar' })).first.text
-      .should include('GitHub · Build software better, together.')
+    reply = get_replies(make_message(@bot, 'http://github.com',
+                                    { channel: '#foo', nick: 'bar' })).first
+
+    expect(reply.text).to include('GitHub · Build software better, together.')
   end
 
   it 'should obey blacklist and not title blacklisted links' do
     bot = make_bot(Cinch::Plugins::LinksTitles,
                    { filename: '/dev/null',
                      blacklist: ['twitter'] })
-    get_replies(make_message(bot, 'http://twitter.com',
-                             { channel: '#foo', nick: 'bar' })).first
-      .should be_nil
+    reply = get_replies(make_message(bot, 'http://twitter.com',
+                                     { channel: '#foo', nick: 'bar' })).first
+    expect(reply).to be_nil
   end
 
   it 'should obey blacklist and title unblacklisted links' do
     bot = make_bot(Cinch::Plugins::LinksTitles,
                    { filename: '/dev/null',
                      blacklist: ['twitter'] })
-    get_replies(make_message(bot, 'http://facebook.com',
-                             { channel: '#foo', nick: 'bar' })).first
-      .should_not be_nil
+    reply = get_replies(make_message(bot, 'http://facebook.com',
+                                     { channel: '#foo', nick: 'bar' })).first
+    expect(reply).not_to be_nil
   end
 
   it 'should obey whitelist and title whitelisted links' do
     bot = make_bot(Cinch::Plugins::LinksTitles,
                    { filename: '/dev/null',
                      whitelist: ['twitter'] })
-    get_replies(make_message(bot, 'http://twitter.com',
-                             { channel: '#foo', nick: 'bar' })).first
-      .should_not be_nil
+    reply = get_replies(make_message(bot, 'http://twitter.com',
+                                     { channel: '#foo', nick: 'bar' })).first
+    expect(reply).to_not be_nil
   end
 
   it 'should obey whitelist and not title unwhitelisted links' do
     bot = make_bot(Cinch::Plugins::LinksTitles,
                    { filename: '/dev/null',
                      whitelist: ['twitter'] })
-    get_replies(make_message(bot, 'http://facebook.com',
-                             { channel: '#foo', nick: 'bar' })).first
-      .should be_nil
+    reply = get_replies(make_message(bot, 'http://facebook.com',
+                                     { channel: '#foo', nick: 'bar' })).first
+    expect(reply).to be_nil
   end
 
   it 'should not display stats if they are not enabled' do
     get_replies(make_message(@bot, 'http://facebook.com',
                              { channel: '#foo', nick: 'bar1' }))
-    get_replies(make_message(@bot, 'http://facebook.com',
-                             { channel: '#foo', nick: 'bar2' })).last
-      .should_not include('That was already linked by')
+    reply = get_replies(make_message(@bot, 'http://facebook.com',
+                                     { channel: '#foo', nick: 'bar2' })).last
+    expect(reply).to_not include('That was already linked by')
   end
 
   it 'should display stats if they are enabled' do
@@ -63,8 +64,8 @@ describe Cinch::Plugins::LinksTitles do
                    { filename: '/dev/null', stats: true })
     get_replies(make_message(bot, 'http://facebook.com',
                              { channel: '#foo', nick: 'bar1' }))
-    get_replies(make_message(bot, 'http://facebook.com',
-                             { channel: '#foo', nick: 'bar2' })).last.text
-      .should include('That was already linked by')
+    reply = get_replies(make_message(bot, 'http://facebook.com',
+                                     { channel: '#foo', nick: 'bar2' })).last
+    expect(reply.text).to include('That was already linked by')
   end
 end

metadata

@@ -1,160 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: cinch-links-titles
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Brian Haberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-07-31 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-cooldown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        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'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: cinch-storage
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '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::Dependency
   name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: time-lord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
 description: Cinch Plugin to print link titles to the channel
 email:
 - bhaberer@gmail.com
@@ -177,29 +156,27 @@ files:
 homepage: https://github.com/bhaberer/cinch-links-titles
 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: Link Titles
 test_files:
 - spec/cinch-links-titles_spec.rb
 - spec/spec_helper.rb
-has_rdoc: