cinch-twitterstatus 1.0.0 → 1.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 5f2a2dbea0eb64b6be134d7650be065f23132950eeedec17cba6dfe21fa543dd
+  data.tar.gz: 34ff00fb7bee7625b26619e80a0326ed6e3eebeac19ce6d4cee078bbb5c0bd83
+SHA512:
+  metadata.gz: d589f98bffa2c599f7630efe12ac828a02b5e83beb20ce6f44e875828cb746cf9ec70b26394ed6c5dd13dbb1eea8fefc32637c5738fce71a73edea4ff2a9f58b
+  data.tar.gz: e852f71819fae6834bccb1d3bb22e70e8c176bc5c4bb0677a7f1792e446de050d935456a9ba03221ba991770951e84ed47dd44f0ec92dcb33ad0e037827ee002

data/.travis.yml

@@ -1,27 +1,44 @@
 ---
 language: ruby
 rvm:
-- 1.9.2
-- 1.9.3
+  - 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
 env:
   global:
-  - secure: ! 'RYlcShCnPWh5tG/gHK2BSqxtBz/GWe66kTv9LBj0dhJAj+/aYxMCO4bnSXQ5
+    - JRUBY_OPTS=-Xcext.enabled=true
+    - secure: ! 'Yz/VAtfbXwk6JD/2/z6c2SGygNGELrF0dlZ/M5nOrDiKNm8lxpC6w19esGbB
 
-      XFAaRb4OIZ94uaKck1G4sY/crUmcvphNsKSpt8EemY1JL1JLPuoXFblJYPUZ
+      CYt8UtqylceJ2UxYngHLVH48oPb+A5fv21/jDJMqHeO/N4WjwQUOzBZXfZG6
 
-      XWAmMLvYBRmMxvjJgZ3NO0k5RRnTP35i2Fowsj4b3jIul7eJ6ys='
-  - secure: ! 'GKCjuQvI131Rbk5Dd5t4wrN1jP1K7A1wm0abIvWmoTgxOHUIcRwcQTzwrACX
+      lpugXIsT9Q10q0AsXry65YuzZtpY7VkVQUNSBYte7jTcWbLmIWQ='
+    - secure: ! 'CbdMyExVnyHfPQ+scSky8JIlqK0dU7idBrtvipQIA2dGfIIj0lzuUDEqvtAv
 
-      SOf3K7ep185d/q8h7EQ+BZ9DuGLA48c3dLhd1Nf1CplK8QfjZy4UbpZ6AAd1
+      +9A7Mw01ddxQ/tXdixHDBNOhp9Ddz+4/0OSMyIb/5uFy+l7b2B2K4A4R5crI
 
-      8JnB+si7lTYHNRW1YjMg239iOdGUyaK1bSrFk0iYXWUkS80LPnE='
-  - secure: ! 'T7gEZtRyUKS2mcrHpIUmBTMsPGJ5EWcYUQmiIHFch+cSR9hFBc1HvITa4W8M
+      RBc5W5rgzRLnDD7HL4BZMRDpx3sJRLcIH9S4bclXyjkzQ7yzVDc='
+    - secure: ! 'Pl14JkhwMe+HHi1Ht0znd0+TnSzdSGvtG4pX8+oSWuIyfTd3xfoj7Pf1S4P/
 
-      VJfA9qHWI7ybI/q5zJtxh7sXw9YSNntRveEFSWZSoOiRtxZa7Y+ZHoyS56bL
+      7SVnixq2gQh13OaL4Tj2sR6+AHz6n+onareFoKkZPSJuDRh6yXFfvKIdx4MV
 
-      6ttPIfaAPwqhc1IPJBWnoIJF83VNn6hUoVni5M72wGi+wptqAWo='
-  - secure: ! 'SzPZg486jGoOYKQoH9PAdtL91R6DxVKpu4wvBm5K4zMIKnUd7jOtfYs7Ukm5
+      l5lIJbSI4icPWOMk6ObMCzIb/m3m4Z/BG3O5E/6AcJDQa7rspL0='
+    - secure: ! 'Xrh52mNuRCf1kJHpZctrz3gfBZQ/rlC+qz/MlvZ9L7sm1CFSIoJdizrOYawt
 
-      FngWZo5MX5shTp32DCmgpKR9HBX4rxRxTzeriWRztQ22k59w6ftKlnmmEyLw
+      cKOyLfsLrcnJqGbq0s++cSQ2QDggEGxtVkMXxIw7dBFn2icZsKsTN5rh28UR
 
-      lHDU487H20FD7KqwTdHfufD8U1hLmQP8+xjLkEDyiIiJOnLAFfE='
+      W2TakLhFB8f+LQ+/P9PvV1wlSOJQRFItLjjOtcEoQVLi51Pwuzw='

data/README.md

@@ -6,7 +6,8 @@
 [![Coverage Status](https://coveralls.io/repos/bhaberer/cinch-twitterstatus/badge.png?branch=master)](https://coveralls.io/r/bhaberer/cinch-twitterstatus?branch=master)
 [![Code Climate](https://codeclimate.com/github/bhaberer/cinch-twitterstatus.png)](https://codeclimate.com/github/bhaberer/cinch-twitterstatus)
 
-Posts the content of a linked Tweet to the channel.
+Posts the content of a linked Tweet to the channel, can also follow users and
+post their tweets.
 
 ## Installation
 
@@ -32,14 +33,16 @@ For the gem to work alll you will need to is add the gem to your plugins:
       end
     end
 
-And, acquire Twitter credentials. They are simple to acquire, see https://dev.twitter.com/apps/new
+And, acquire Twitter credentials. They are simple to acquire,
+see https://dev.twitter.com/apps/new
 
-Once you have said credentials you will need to pass them to the Plugin's config like so:
+Once you have said credentials you will need to pass them to the Plugin's
+config like so:
 
-    c.plugins.options[Cinch::Plugins::TwitterStatus] = { :consumer_key    => 'consumer_key',
-                                                         :consumer_secret => 'consumer_secret',
-                                                         :oauth_token     => 'oauth_token',
-                                                         :oauth_secret    => 'oauth_secret' }
+    c.plugins.options[Cinch::Plugins::TwitterStatus] = { consumer_key:    'consumer_key',
+                                                         consumer_secret: 'consumer_secret',
+                                                         access_token:    'access_token',
+                                                         access_secret:   'access_secret' }
 
 Then post a link to a specific tweet and the bot should post the content of said tweet to the channel.
 

data/cinch-twitterstatus.gemspec

@@ -4,23 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cinch/plugins/twitterstatus/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cinch-twitterstatus"
-  gem.version       = Cinch::Twitterstatus::VERSION
-  gem.authors       = ["Brian Haberer"]
-  gem.email         = ["bhaberer@gmail.com"]
+  gem.name          = 'cinch-twitterstatus'
+  gem.version       = Cinch::Plugins::TwitterStatus::VERSION
+  gem.authors       = ['Brian Haberer']
+  gem.email         = ['bhaberer@gmail.com']
   gem.description   = %q{Cinch IRC bot Plugin that access the Twitter API to post the content of linked twitter statuses to the channel.}
   gem.summary       = %q{Cinch Plugin to post tweets to channel.}
-  gem.homepage      = "https://github.com/bhaberer/cinch-twitterstatus"
+  gem.homepage      = 'https://github.com/bhaberer/cinch-twitterstatus'
+  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.require_paths = ["lib"]
+  gem.add_development_dependency 'rake', '~> 12.3.3'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'coveralls', '~> 0.7'
+  gem.add_development_dependency 'cinch-test', '~> 0.1', '>= 0.1.4'
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'cinch-test'
-
-  gem.add_dependency 'twitter', '~> 4.8.1'
+  gem.add_dependency 'cinch', '~> 2'
+  gem.add_dependency 'cinch-toolbox', '~> 1.1.7'
+  gem.add_dependency 'twitter', '~> 5.16', '>= 5.16.0'
 end

data/lib/cinch-twitterstatus.rb

@@ -1,2 +1,3 @@
+# -*- encoding: utf-8 -*-
 require 'cinch/plugins/twitterstatus/version'
-require 'cinch/plugins/twitterstatus/twitterstatus'
+require 'cinch/plugins/twitterstatus'

data/lib/cinch/plugins/twitterstatus.rb

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+require 'cinch'
+require 'cinch/toolbox'
+require 'twitter'
+
+module Cinch
+  module Plugins
+    # Cinch Plugin to post twitter statuses
+    class TwitterStatus
+      include Cinch::Plugin
+
+      self.help = 'Just link to a specific twitter status and I will ' \
+                  'post the content of that tweet.'
+
+      listen_to :channel
+
+      def initialize(*args)
+        super
+        @client = twitter_client
+      end
+
+      def listen(m)
+        Cinch::Toolbox.extract_urls(m.message).each do |url|
+          next unless url.match(%r(^https?://mobile|w{3}?\.?twitter\.com/))
+          msg = format_tweet(url)
+          m.reply msg unless msg.nil?
+        end
+      rescue Twitter::Error::NotFound, Twitter::Error::Forbidden
+        debug 'User posted an invalid twitter status'
+      end
+
+      def format_tweet(url)
+        # Parse the url and get the relevant data
+        user, status = parse_twitter_url(url)
+
+        # Return blank if we didn't get a good user and status
+        return if user.nil? || status.nil?
+
+        tweet_text(user, status)
+      end
+
+      def tweet_text(user, status)
+        # Scrub the tweet for returns so we don't have multilined responses.
+        status = status.gsub(/[\n]+/, ' ') if status.match(/\n/)
+        "@#{user} tweeted \"#{status}\""
+      end
+
+      private
+
+      def parse_twitter_url(url)
+        tweet_id = url[%r{statuse?s?/(\d+)/?}, 1]
+        user = url[%r{/?#?!?/([^\/]+)/statuse?s?}, 1]
+        [user, @client.status(tweet_id).text]
+      end
+
+      def twitter_client
+        Twitter::REST::Client.new do |c|
+          c.consumer_key = config[:consumer_key]
+          c.consumer_secret = config[:consumer_secret]
+          c.access_token = config[:access_token]
+          c.access_token_secret = config[:access_secret]
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,9 @@
+# -*- encoding: utf-8 -*-
 module Cinch
-  module Twitterstatus
-    VERSION = "1.0.0"
+  module Plugins
+    # Versioning info
+    class TwitterStatus
+      VERSION = '1.1.3'
+    end
   end
 end

data/spec/cinch-twitterstatus_spec.rb

@@ -5,37 +5,50 @@ describe Cinch::Plugins::TwitterStatus do
   include Cinch::Test
 
   before(:all) do
-    @bot = make_bot(Cinch::Plugins::TwitterStatus, 
-                    { filename:        '/dev/null',
-                      hostname:        'marvintesting.tumblr.com',
-                      consumer_key:    ENV['CONSUMER_KEY'],
+    @bot = make_bot(Cinch::Plugins::TwitterStatus,
+                    { filename: '/dev/null',
+                      watchers: { '#foo' => ['weirdo513'] },
+                      consumer_key: ENV['CONSUMER_KEY'],
                       consumer_secret: ENV['CONSUMER_SECRET'],
-                      oauth_token:     ENV['OAUTH_TOKEN'],
-                      oauth_secret:    ENV['OAUTH_SECRET'] })
+                      oauth_token: ENV['OAUTH_TOKEN'],
+                      oauth_secret: ENV['OAUTH_SECRET'] })
+    @status =
+      { normal: 'https://twitter.com/weirdo513/status/344186643609174016',
+        protected: 'https://twitter.com/brewtopian/status/68071618055901184',
+        invalid: 'https://twitter.com/weirdo513/status/3INVALI643609174016',
+        multiline: 'https://twitter.com/Peeardee/status/502209346038951937'}
   end
 
-  it 'should return the texof e when linked in the channel' do
-    get_replies(make_message(@bot, 'https://twitter.com/weirdo513/status/344186643609174016', 
-                             { channel: '#foo', nick: 'bar' })).
-      first.text.should == "@weirdo513 tweeted \"HOW IS THAT MIC STILL ON JESUS\""
-  end
+  describe "Twitter Link Parsing" do
+    it 'should return the text of the tweet when linked in the channel' do
+      msg = get_replies(make_message(@bot, @status[:normal],
+                                     { channel: '#foo', nick: 'bar' })).first
+      expect(msg.text).to eq('@weirdo513 tweeted "HOW IS THAT MIC STILL ON JESUS"')
+    end
 
-  it 'should not return any text if the status is invalid' do
-    get_replies(make_message(@bot, 'https://twitter.com/weirdo513/status/3INVALI643609174016', 
-                             { channel: '#foo', nick: 'bar' })).
-      should be_empty
-  end
+    it 'should return the text of the tweet when linked in the channel' do
+      msg = get_replies(make_message(@bot, @status[:multiline],
+                                     { channel: '#foo', nick: 'bar' })).first
+      expect(msg.text).to eq('@Peeardee tweeted "Dear My RP Group, I *will* be working on the Enforcer schedule during our Call of Cthulhu session tonight. Will make frequent sanity rolls."')
+    end
 
-  it 'should not return any text if the status is protected' do
-    get_replies(make_message(@bot, 'https://twitter.com/brewtopian/status/68071618055901184', 
-                             { channel: '#foo', nick: 'bar' })).
-      should be_empty
-  end
+    it 'should not return any text if the status is invalid' do
+      msg = get_replies(make_message(@bot, @status[:invalid],
+                                     { channel: '#foo', nick: 'bar' }))
+      expect(msg).to be_empty
+    end
 
-  it 'should not run without credentials set' do
-    bot = make_bot(Cinch::Plugins::TwitterStatus)
-    get_replies(make_message(bot, 'https://twitter.com/weirdo513/status/344186643609174016',
-                             { channel: '#foo', nick: 'bar' }))
+    it 'should not return any text if the status is protected' do
+      msg = get_replies(make_message(@bot, @status[:protected],
+                                     { channel: '#foo', nick: 'bar' }))
+      expect(msg).to be_empty
+    end
+
+    it 'should not run without credentials set' do
+      bot = make_bot(Cinch::Plugins::TwitterStatus)
+      msg = get_replies(make_message(bot, @status[:normal],
+                                     { channel: '#foo', nick: 'bar' }))
+      expect(msg).to be_empty
+    end
   end
 end
-

metadata

@@ -1,96 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cinch-twitterstatus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.3
 platform: ruby
 authors:
 - Brian Haberer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2021-01-27 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: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !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'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
   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.1.4
+- !ruby/object:Gem::Dependency
+  name: cinch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: cinch-toolbox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: '5.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 5.16.0
 description: Cinch IRC bot Plugin that access the Twitter API to post the content
   of linked twitter statuses to the channel.
 email:
@@ -99,43 +128,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - cinch-twitterstatus.gemspec
 - lib/cinch-twitterstatus.rb
-- lib/cinch/plugins/twitterstatus/twitterstatus.rb
+- lib/cinch/plugins/twitterstatus.rb
 - lib/cinch/plugins/twitterstatus/version.rb
 - spec/cinch-twitterstatus_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bhaberer/cinch-twitterstatus
-licenses: []
-post_install_message: 
+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
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.6
+signing_key:
+specification_version: 4
 summary: Cinch Plugin to post tweets to channel.
 test_files:
 - spec/cinch-twitterstatus_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/cinch/plugins/twitterstatus/twitterstatus.rb

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'cinch'
-require 'twitter'
-
-module Cinch::Plugins
-  class TwitterStatus
-    include Cinch::Plugin
-
-    self.help = 'Just link to a specific twitter status and I will post the content of that tweet.'
-
-    listen_to :channel
-
-    def initialize(*args)
-      super
-      if config
-        Twitter.configure do |c|
-          c.consumer_key =        config[:consumer_key]
-          c.consumer_secret =     config[:consumer_secret]
-          c.oauth_token =         config[:oauth_token]
-          c.oauth_token_secret =  config[:oauth_secret]
-        end
-      end
-    end
-
-    def listen(m)
-      urls = URI.extract(m.message, ["http", "https"])
-      urls.each do |url|
-        if url.match(/^https?:\/\/mobile|w{3}?\.?twitter\.com/)
-          if tweet = url.match(/https?:\/\/mobile|w{3}?\.?twitter\.com\/?#?!?\/([^\/]+)\/statuse?s?\/(\d+)\/?/)
-            status = Twitter.status(tweet[2]).text
-            status.gsub!(/[\n]+/, " ") if status.match(/\n/)
-            user = tweet[1]
-            unless user.nil? || status.nil?
-              m.reply "@#{user} tweeted \"#{status}\""
-            end
-          end
-        end
-      end
-    rescue Twitter::Error::NotFound
-      debug "User posted an invalid twitter status"
-    rescue Twitter::Error::Forbidden
-      debug "User attempted to post a Protected Tweet or you have not set valid Twitter credentials."
-    end
-  end
-end