cinch-links-tumblr 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 91013bda65cc2b0e05aa6df0d3b43cb27ca85587
+  data.tar.gz: caf13eaa8e35864cee94fb5b24b7f32e04294451
+SHA512:
+  metadata.gz: ea9418a600451ea5a47e6dd173272dde50fc3f6d0f37106beebd8f5869661cbbef5b0c23e37a19965e07b48b93e9f4efb24fff51b29abe1a23c3d792f8717b62
+  data.tar.gz: f5aff35cb90c8b35354a5c7f9843f8d7ef5a6775e1214c3b09b74e8bb1198f5d8d4c210077f49e762d3269084ee61e304b36ebb2f6a1062899c1749e8bc713c4

data/.travis.yml

@@ -1,8 +1,27 @@
 ---
 language: ruby
+env:
+  global:
+    - "JRUBY_OPTS=-Xcext.enabled=true"
 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: ! 'bANxESoL2yYVy4pzpRKSWqQkQ4e5kplZbVgUwjplXU91HfJbnubgdFPcQ9ol

data/cinch-links-tumblr.gemspec

@@ -18,15 +18,12 @@ 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_development_dependency  'json'
-
-  gem.add_dependency              'cinch',         '~> 2.0.12'
-  gem.add_dependency              'cinch-storage', '~> 1.1.0'
-  gem.add_dependency              'cinch-toolbox', '~> 1.1.0'
-  gem.add_dependency              'tumblr-rb',     '~> 2.1.1'
-  gem.add_dependency              'weary',         '~> 1.1.3'
+  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-storage', '~> 1.1'
+  gem.add_dependency 'cinch-toolbox', '~> 1.1'
+  gem.add_dependency 'tumblr-rb', '~> 2.1', '>= 2.1.1'
 end

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

@@ -6,131 +6,131 @@ require 'cinch'
 require 'cinch/storage'
 require 'cinch/toolbox'
 
-module Cinch::Plugins
-  # Cinch Plugin to tumbl links from a given channel to a configured tumblr.
-  class LinksTumblr
-    include Cinch::Plugin
-
-    listen_to :channel
-
-    match /tumblr/
-
-    self.help = 'Use .tumblr for the url/password for the channel\'s tumblr.'
-
-    def initialize(*args)
-      super
-      @storage = Cinch::Storage.new(config[:filename] || 'yaml/tumblr.yml')
-      @storage.data ||= {}
-      @hostname = config[:hostname]
-      @password = config[:password]
-      @creds = { consumer_key:    config[:consumer_key],
-                 consumer_secret: config[:consumer_secret],
-                 token:           config[:token],
-                 token_secret:    config[:token_secret] }
-      credential_check
-    end
+module Cinch
+  module Plugins
+    # Cinch Plugin to tumbl links from a given channel to a configured tumblr.
+    class LinksTumblr
+      include Cinch::Plugin
+
+      listen_to :channel
+
+      match(/tumblr/)
+
+      self.help = 'Use .tumblr for the url/password for the channel\'s tumblr.'
+
+      def initialize(*args)
+        super
+        @storage = Cinch::Storage.new(config[:filename] || 'yaml/tumblr.yml')
+        @storage.data ||= {}
+        @hostname = config[:hostname]
+        @password = config[:password]
+        @creds = { consumer_key: config[:consumer_key],
+                   consumer_secret: config[:consumer_secret],
+                   token: config[:token],
+                   token_secret: config[:token_secret] }
+        credential_check
+      end
 
-    def execute(m)
-      return if Cinch::Toolbox.sent_via_private_message?(m)
+      def execute(m)
+        return if Cinch::Toolbox.sent_via_private_message?(m)
+        return unless @hostname
 
-      if @hostname
         msg = "Links are available @ http://#{@hostname}"
         msg << " Password: #{@password}" unless @password.nil?
         m.user.send msg
       end
-    end
 
-    def listen(m)
-      urls = URI.extract(m.message, %w(http https))
-      urls.each do |url|
-        @storage.data[m.channel.name] ||= []
+      def listen(m)
+        urls = URI.extract(m.message, %w(http https))
+        urls.each do |url|
+          @storage.data[m.channel.name] ||= []
 
-        # Check to see if we've seen the link
-        unless @storage.data[m.channel.name].include?(url)
-          tumble(url, m.user.nick)
+          # Check to see if we've seen the link
+          unless @storage.data[m.channel.name].include?(url)
+            tumble(url, m.user.nick)
 
-          # Store the links to try and cut down on popular urls getting
-          # tumbled 20 times
-          @storage.data[m.channel.name] << url
+            # Store the links to try and cut down on popular urls getting
+            # tumbled 20 times
+            @storage.data[m.channel.name] << url
+          end
+          @storage.synced_save(@bot)
         end
-        @storage.synced_save(@bot)
       end
-    end
 
-    private
-
-    def tumble(url, nick)
-      title = Cinch::Toolbox.get_page_title(url)
-      # Imgur
-      if url.match(%r(^https?:\/\/.*imgur\.com))
-        post_image(url, title, nick)
-      # Images
-      elsif url.match(/\.jpg|jpeg|gif|png$/i)
-        post_image(url, title, nick)
-      # Youtube / Vimeo
-      elsif url.match(%r(https?://[^\/]*\.?(youtube|youtu|vimeo)\.))
-        post_video(url, title, nick)
-      # Everything else
-      else
-        post_link(url, title, nick)
+      private
+
+      def tumble(url, nick)
+        title = Cinch::Toolbox.get_page_title(url)
+        # Imgur
+        if url.match(%r{^https?://.*imgur\.com})
+          post_image(url, title, nick)
+        # Images
+        elsif url.match(/\.jpg|jpeg|gif|png$/i)
+          post_image(url, title, nick)
+        # Youtube / Vimeo
+        elsif url.match(%r{https?://[^\/]*\.?(youtube|youtu|vimeo)\.})
+          post_video(url, title, nick)
+        # Everything else
+        else
+          post_link(url, title, nick)
+        end
       end
-    end
 
-    def post_imgur(url, title, nick)
-      # Imgur direct links
-      imgur = url[%r(^https?://.*imgur\.com.*/([A-Za-z0-9]+\.\S{3})), 1]
+      def post_imgur(url, title, nick)
+        # Imgur direct links
+        imgur = url[%r{^https?://.*imgur\.com.*/([A-Za-z0-9]+\.\S{3})}, 1]
 
-      unless imgur
-        # It may not be a jpg, but most browsers will read the meta regardless.
-        imgur = url[%r(^https?://.*imgur\.com.*/([A-Za-z0-9]+)/?), 1] + '.jpg'
+        unless imgur
+          # It may not be a jpg, but most browsers will read the meta.
+          imgur = url[%r{^https?://.*imgur\.com.*/([A-Za-z0-9]+)/?}, 1] + '.jpg'
+        end
+        post_image("http://i.imgur.com/#{imgur}", title, nick)
       end
-      post_image("http://i.imgur.com/#{imgur}", title, nick)
-    end
 
-    def post_link(url, title = nil, nick = nil)
-      document = tumblr_header(:link, title: title, tags: nick)
-      document << url
-      tumblr_post(document)
-    end
+      def post_link(url, title = nil, nick = nil)
+        document = tumblr_header(:link, title: title, tags: nick)
+        document << url
+        tumblr_post(document)
+      end
 
-    def post_image(url, title = nil, nick = nil)
-      document = tumblr_header(:text, title: title, tags: [nick, 'image'])
-      document << "<p><a href='#{url}'>" +
-                  "<img src='#{url}' style='max-width: 650px;'/></a><br/>" +
-                  "<a href='#{url}'>#{url}</a></p>"
-      tumblr_post(document)
-    end
+      def post_image(url, title = nil, nick = nil)
+        document = tumblr_header(:text, title: title, tags: [nick, 'image'])
+        document << "<p><a href='#{url}'>" \
+                    "<img src='#{url}' style='max-width: 650px;'/></a><br/>" \
+                    "<a href='#{url}'>#{url}</a></p>"
+        tumblr_post(document)
+      end
 
-    def post_video(url, title, nick = nil)
-      document = tumblr_header(:video,
-                               caption: title, tags: [nick, 'video'])
-      document << url
-      tumblr_post(document)
-    end
+      def post_video(url, title, nick = nil)
+        document = tumblr_header(:video,
+                                 caption: title, tags: [nick, 'video'])
+        document << url
+        tumblr_post(document)
+      end
 
-    def tumblr_header(type = :text, options = {})
-      opts = { type: type, hostname: @hostname }.update(options)
-      doc = Psych.dump(opts)
-      doc << "---\n"
-      doc
-    end
+      def tumblr_header(type = :text, options = {})
+        opts = { type: type, hostname: @hostname }.update(options)
+        doc = Psych.dump(opts)
+        doc << "---\n"
+        doc
+      end
 
-    def credential_check
-      if @creds.values.include?(nil)
+      def credential_check
+        return unless @creds.values.include?(nil)
         fail ArgumentError,
              'Credentials are not set correctly, please see documentation.'
       end
-    end
 
-    def tumblr_post(doc)
-      client = Tumblr::Client.new(@hostname, @creds)
-      post = Tumblr::Post.load(doc)
-      request = post.post(client)
+      def tumblr_post(doc)
+        client = Tumblr::Client.new(@hostname, @creds)
+        post = Tumblr::Post.load(doc)
+        request = post.post(client)
 
-      request.perform do |response|
-        unless response.success?
-          debug 'Something went wrong posting to Tumblr ' +
-                "#{response.code} #{response.message}"
+        request.perform do |response|
+          unless response.success?
+            debug 'Something went wrong posting to Tumblr ' \
+                  "#{response.code} #{response.message}"
+          end
         end
       end
     end

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

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

data/spec/cinch-links-tumblr_spec.rb

@@ -13,54 +13,56 @@ describe Cinch::Plugins::LinksTumblr do
   end
 
   it 'should return the links url and password if one is defined' do
-    get_replies(make_message(@bot, '!tumblr', { channel: '#foo', nick: 'bar' })).
-      first.text.should == "Links are available @ http://marvintesting.tumblr.com Password: password"
+    msg = make_message(@bot, '!tumblr', { channel: '#foo', nick: 'bar' })
+    expect(get_replies(msg).first.text)
+      .to eq('Links are available @ http://marvintesting.tumblr.com Password: password')
   end
 
   it 'should not send url and password if sent via pm' do
-    get_replies(make_message(@bot, '!tumblr')).
-      first.text.should == "You must use that command in the main channel."
+    reply = get_replies(make_message(@bot, '!tumblr')).first
+    expect(reply.text).to eq('You must use that command in the main channel.')
   end
 
   it 'should not return a password if one is not defined' do
-    get_replies(make_message(build_bot, '!tumblr', { channel: '#foo', nick: 'bar' })).
-      first.text.should == "Links are available @ http://marvintesting.tumblr.com"
-  end    
+    msg = make_message(build_bot, '!tumblr', { channel: '#foo', nick: 'bar' })
+    expect(get_replies(msg).first.text)
+      .to eq('Links are available @ http://marvintesting.tumblr.com')
+  end
 
   it 'should capture links' do
     get_replies(make_message(@bot, 'http://github.com', { channel: '#foo', nick: 'bar' }))
     post = get_last_tumblr_post
-    post['url'].should == 'http://github.com'
-    post["type"].should == 'link'
+    expect(post['url']).to eq('http://github.com')
+    expect(post["type"]).to eq('link')
   end
 
   it 'should capture youtube links and post them as videos' do
     get_replies(make_message(@bot, 'https://www.youtube.com/watch?v=-xiAbDkXDgg', { channel: '#foo', nick: 'bar' }))
     post = get_last_tumblr_post
-    post['caption'].should == '<p>Lo Pan Style (Gangnam Style Parody) Official - YouTube</p>'
-    post['tags'].should == ['bar', 'video']
-    post['type'].should == 'video'
+    expect(post['caption']).to eq('<p>Lo Pan Style (Gangnam Style Parody) Official - YouTube</p>')
+    expect(post['tags']).to eq(['bar', 'video'])
+    expect(post['type']).to eq('video')
   end
 
   it 'should capture imgur links' do
     get_replies(make_message(@bot, 'http://imgur.com/oMndYK7', { channel: '#foo', nick: 'bar' }))
     post = get_last_tumblr_post
-    post['title'].should == 'Anybody with a cat will relate. - Imgur'
-    post['type'].should == 'text'
+    expect(post['title']).to eq('Anybody with a cat will relate. - Imgur')
+    expect(post['type']).to eq('text')
   end
 
   it 'should capture imgur links and tumble them with title' do
     get_replies(make_message(@bot, 'http://i.imgur.com/NWq5WIq.gif', { channel: '#foo', nick: 'bar' }))
     post = get_last_tumblr_post
-    post['title'].should == '"ball, ball, ball, BALL!!" - Corgi - Imgur'
-    post['type'].should == 'text'
+    expect(post['title']).to eq('"ball, ball, ball, BALL!!" - Corgi - Imgur')
+    expect(post['type']).to eq('text')
   end
 
   it 'should capture image links' do
     get_replies(make_message(@bot, 'http://tmp.weirdo513.org/choc.jpg', { channel: '#foo', nick: 'bar' }))
     post = get_last_tumblr_post
-    post['title'].should == 'Image from http://tmp.weirdo513.org'
-    post['type'].should == 'text'
+    expect(post['title']).to eq('Image from http://tmp.weirdo513.org')
+    expect(post['type']).to eq('text')
   end
 end
 
@@ -106,6 +108,6 @@ def build_bot(password = nil)
             token:           ENV['TOKEN'],
             token_secret:    ENV['TOKEN_SECRET'] }
   conf[:password] = password unless password.nil?
-  
+
   make_bot(Cinch::Plugins::LinksTumblr, conf)
 end

metadata

@@ -1,176 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: cinch-links-tumblr
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+        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-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
+        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: tumblr-rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: '2.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: weary
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '2.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 description: Cinch gem that logs every link posted in the channel to a Tumblr
 email:
 - bhaberer@gmail.com
@@ -193,29 +156,27 @@ files:
 homepage: https://github.com/bhaberer/cinch-links-tumblr
 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 Tumblr Plugin
 test_files:
 - spec/cinch-links-tumblr_spec.rb
 - spec/spec_helper.rb
-has_rdoc: