cinch-karma 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 85e1c22bb5600f38351ca7961c075ae56b3e5bd3
+  data.tar.gz: aa6e10363e33dc70e45df5b1db8e2bda64103a42
+SHA512:
+  metadata.gz: 44e85ba6839c0a853b8ce4436293278d3109962f6757a661607e69eb1b2529f7f8778561beb723abf870d0cfc5336f87e5db71096d98a3fe8d2b73637b463940
+  data.tar.gz: 7a1ba7a20611dca1e7273c17e8a40172cecce3ae77e4f9f8a0011dda162b2a5314319e628ca4f8330d49464ffb8890fe0e9ed90eac937c7159751225d58f3734

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

@@ -8,22 +8,21 @@ Gem::Specification.new do |gem|
   gem.version       = Cinch::Plugins::Karma::VERSION
   gem.authors       = ['Brian Haberer']
   gem.email         = ['bhaberer@gmail.com']
-  gem.description   = %q{Cinch Plugin to track karma (item++ / item--) in the channel}
-  gem.summary       = %q{Cinch Plugin to Track Karma}
+  gem.description   = %q(Cinch Plugin to track karma (item++ / item--) in the channel)
+  gem.summary       = %q(Cinch Plugin to Track Karma)
   gem.homepage      = 'https://github.com/bhaberer/cinch-karma'
   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-cooldown',  '~> 1.1.1'
-  gem.add_dependency              'cinch-storage',   '~> 1.1.0'
+  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.3'
+  gem.add_dependency 'cinch-storage', '~> 1.1'
 end

data/lib/cinch/plugins/karma.rb

@@ -3,74 +3,73 @@ require 'cinch'
 require 'cinch/cooldown'
 require 'cinch/storage'
 
-module Cinch::Plugins
-  # Cinch Plugin to monitor karma and report.
-  class Karma
-    include Cinch::Plugin
+module Cinch
+  module Plugins
+    # Cinch Plugin to monitor karma and report.
+    class Karma
+      include Cinch::Plugin
 
-    enforce_cooldown
+      enforce_cooldown
 
-    self.help = 'Use .karma <item> to see it\'s karma level. You can use ' +
-                '<item>++ or <item>-- [or (something with spaces)++] to ' +
-                'alter karma for an item'
+      self.help = 'Use .karma <item> to see it\'s karma level. You can use ' \
+                  '<item>++ or <item>-- [or (something with spaces)++] to ' \
+                  'alter karma for an item'
 
-    listen_to :channel
+      listen_to :channel
 
-    match /karma (.+)/
-    match /k (.+)/
+      match(/(?:k|karma) (.+)/)
 
-    def initialize(*args)
-      super
-      @storage = Cinch::Storage.new(config[:filename] || 'yaml/karma.yml')
-    end
+      def initialize(*args)
+        super
+        @storage = Cinch::Storage.new(config[:filename] || 'yaml/karma.yml')
+      end
 
-    def listen(m)
-      if m.message.match(/\S+[\+\-]{2}/)
+      def listen(m)
+        return unless m.message.match(/\S+[\+\-]{2}/)
         channel = m.channel.name
 
         # Scan messages for multiple karma items
-        m.message.scan(/(\s|\A)(\w+|\(.+?\))(\+\+|--)(\s|\z)/).each do |karma|
-          process_karma(channel, karma[1].gsub(/\(|\)/, '').downcase, karma[2])
+        m.message.scan(/(\s|\A)(\w+|\(.+?\))(\+\+|--)(\s|\z)/).each do |k|
+          process_karma(channel, k[1].gsub(/\(|\)/, '').downcase, k[2])
         end
 
         @storage.synced_save(@bot)
       end
-    end
 
-    def execute(m, item)
-      return if sent_via_pm?(m)
+      def execute(m, item)
+        return if sent_via_pm?(m)
 
-      channel = m.channel.name
-      item.downcase!
-      init_karma(channel, item)
+        channel = m.channel.name
+        item.downcase!
+        init_karma(channel, item)
 
-      m.reply "Karma for #{item} is #{@storage.data[channel][item]}"
-    end
+        m.reply "Karma for #{item} is #{@storage.data[channel][item]}"
+      end
 
-    private
+      private
 
-    def process_karma(channel, item, operation)
-      # Ensure the item's Karma has been init
-      init_karma(channel, item)
+      def process_karma(channel, item, operation)
+        # Ensure the item's Karma has been init
+        init_karma(channel, item)
 
-      case operation
-      when '++'
-        @storage.data[channel][item] += 1
-      when '--'
-        @storage.data[channel][item] -= 1
+        case operation
+        when '++'
+          @storage.data[channel][item] += 1
+        when '--'
+          @storage.data[channel][item] -= 1
+        end
       end
-    end
 
-    def sent_via_pm?(m)
-      if m.channel.nil?
+      def sent_via_pm?(m)
+        return false unless m.channel.nil?
         m.reply 'You must use that command in the main channel.'
-        return true
+        true
       end
-    end
 
-    def init_karma(channel, item = nil)
-      @storage.data[channel] ||= {}
-      @storage.data[channel][item] ||= 0 unless item.nil?
+      def init_karma(channel, item = nil)
+        @storage.data[channel] ||= {}
+        @storage.data[channel][item] ||= 0 unless item.nil?
+      end
     end
   end
 end

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

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

data/spec/cinch-karma_spec.rb

@@ -4,69 +4,79 @@ describe Cinch::Plugins::Karma do
   include Cinch::Test
 
   before(:each) do
-    @bot = make_bot(Cinch::Plugins::Karma, { :filename => '/dev/null' })
+    @bot = make_bot(Cinch::Plugins::Karma, { filename: '/dev/null' })
   end
 
   it 'should default to zero karma' do
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is 0"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is 0')
   end
 
   it 'should allow users to add karma' do
-    msg = make_message(@bot, 'foo++', { :channel => '#foo' })
+    msg = make_message(@bot, 'foo++', { channel: '#foo' })
     get_replies(msg)
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is 1"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is 1')
   end
 
   it 'should allow users to add karma mid message' do
-    msg = make_message(@bot, 'd asd asdasd foo++ dasdasd sadasd sad', { :channel => '#foo' })
+    msg = make_message(@bot, 'd asd asdasd foo++ dasdasd sadasd sad', { channel: '#foo' })
     get_replies(msg)
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is 1"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is 1')
   end
 
   it 'should allow users to add karma with items with spaces via ()' do
-    msg = make_message(@bot, '(foo bar)++', { :channel => '#foo' })
+    msg = make_message(@bot, '(foo bar)++', { channel: '#foo' })
     get_replies(msg)
-    msg = make_message(@bot, '!karma foo bar', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo bar is 1"
+    msg = make_message(@bot, '!karma foo bar', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo bar is 1')
   end
 
   it 'should allow users to remove karma' do
-    msg = make_message(@bot, 'foo--', { :channel => '#foo' })
+    msg = make_message(@bot, 'foo--', { channel: '#foo' })
     get_replies(msg)
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is -1"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is -1')
   end
 
   it 'should allow users to remove karma mid message' do
-    msg = make_message(@bot, 'd asd asdasd foo-- dasdasd sadasd sad', { :channel => '#foo' })
+    msg = make_message(@bot, 'd asd asdasd foo-- dasdasd sadasd sad', { channel: '#foo' })
     get_replies(msg)
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is -1"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is -1')
   end
 
   it 'should allow users to remove karma with items with spaces via ()' do
-    msg = make_message(@bot, '(foo bar)--', { :channel => '#foo' })
+    msg = make_message(@bot, '(foo bar)--', { channel: '#foo' })
     get_replies(msg)
-    msg = make_message(@bot, '!karma foo bar', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo bar is -1"
+    msg = make_message(@bot, '!karma foo bar', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo bar is -1')
   end
   it 'should not allow users to check karam via pm' do
     msg = make_message(@bot, '!karma foo')
-    get_replies(msg).first.text.should == "You must use that command in the main channel."
+    expect(get_replies(msg).first.text)
+      .to eq('You must use that command in the main channel.')
   end
 
   it 'should not allow users to add karma via pm' do
     msg = make_message(@bot, 'foo++')
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is 0"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is 0')
   end
 
   it 'should not allow users to remove karma via pm' do
     msg = make_message(@bot, 'foo--')
-    msg = make_message(@bot, '!karma foo', { :channel => '#foo' })
-    get_replies(msg).first.text.should == "Karma for foo is 0"
+    msg = make_message(@bot, '!karma foo', { channel: '#foo' })
+    expect(get_replies(msg).first.text)
+      .to eq('Karma for foo is 0')
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'coveralls'
 Coveralls.wear!
+
 require 'cinch-karma'
 require 'cinch/test'

metadata

@@ -1,128 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cinch-karma
 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-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.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-cooldown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
+    - - ! '>='
+      - !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.1
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !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'
 description: Cinch Plugin to track karma (item++ / item--) in the channel
 email:
 - bhaberer@gmail.com
@@ -145,29 +142,27 @@ files:
 homepage: https://github.com/bhaberer/cinch-karma
 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 to Track Karma
 test_files:
 - spec/cinch-karma_spec.rb
 - spec/spec_helper.rb
-has_rdoc: