slack-ruby-client 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83beab009684f102b815d58a123f2a7dc50975fd
-  data.tar.gz: 151c2fc2b883a65ff6eaced3054b2db8e607b599
+  metadata.gz: f97d44d55767e0fbbe09b77361f94b2893283192
+  data.tar.gz: bfec69bffc973d6895feac2b74d1ed330374dd79
 SHA512:
-  metadata.gz: 0c584024b15b6f07310702399dea5a0ae82c703821d5a33a447e749ce677bedc0b38d2e01d89ebb983fe14f4819fa2a295ec43ca94372f7b142686255ba660d3
-  data.tar.gz: c797d350c47ed7acf6eb942a723cb57ccb79897360677aa12bdece2fbce3298c6bec06139a8f0e3c27602e62e4bcfb2dac4b9f63e81904ba938b191d0cbe8789
+  metadata.gz: cd2c5f47750c4adda9439145cc2e84cb13f78e0b73f48ac0ddd6e4b5489b16e32b392858d73fb15a85c2aee71fce394103072afa12c4b6d7edacc3b398bbb247
+  data.tar.gz: c307c1cab8e48397597947aca5c70db67d3a2986893d5e3628f4f2442fb6e59baf503a3208ebf9ae66a9c5481a28477efae7795a767602a06e81082a7895c585

data/.travis.yml

@@ -1,8 +1,12 @@
+language: ruby
+
+cache: bundler
+
 rvm:
   - 2.2
   - 2.1
   - 2.0
-  - rbx-2.9
+  - rbx-2
   - jruby-19mode
   - ruby-head
   - jruby-head
@@ -11,6 +15,8 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: jruby-19mode
+    - rvm: rbx-2
 
 git:
   submodules: false

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-### 0.5.2 (1/8/2015)
+### 0.5.3 (1/11/2016)
+
+* [#47](https://github.com/dblock/slack-ruby-client/pull/47): Fix: default to Celluloid newer API - [@jlyonsmith](https://github.com/jlyonsmith), [@dblock](https://github.com/dblock).
+* Fixed JRuby file encoding regression - [@dblock](https://github.com/dblock).
+
+### 0.5.2 (1/8/2016)
 
 * [#41](https://github.com/dblock/slack-ruby-client/issues/41): Added `Slack::Messages::Formatting#unescape` - [@dblock](https://github.com/dblock).
 * Added `files_comments` to Web API - [@dblock](https://github.com/dblock).

data/README.md

@@ -18,7 +18,7 @@ A Ruby client for the Slack [Web](https://api.slack.com/web) and [RealTime Messa
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-client, 0.5.2. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-client, 0.5.3. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ## Installation
 

data/Rakefile

@@ -11,13 +11,9 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-if RUBY_ENGINE == 'rbx'
-  task default: [:spec]
-else
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
 
-  task default: [:rubocop, :spec]
-end
+task default: [:rubocop, :spec]
 
 load 'slack/web/api/tasks/generate.rake'

data/lib/slack/config.rb

@@ -3,6 +3,10 @@ module Slack
     extend self
 
     attr_accessor :token
+
+    def reset
+      self.token = nil
+    end
   end
 
   class << self

data/lib/slack/messages/formatting.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Slack
   module Messages
     module Formatting

data/lib/slack/real_time/concurrency/celluloid.rb

@@ -1,6 +1,7 @@
 require 'websocket/driver'
 require 'socket'
 require 'forwardable'
+require 'celluloid/current'
 require 'celluloid/io'
 
 module Slack
@@ -9,7 +10,7 @@ module Slack
       module Celluloid
         class Socket < Slack::RealTime::Socket
           include ::Celluloid::IO
-          include ::Celluloid::Logger
+          include ::Celluloid::Internals::Logger
 
           BLOCK_SIZE = 4096
 

data/lib/slack/real_time/config.rb

@@ -31,7 +31,7 @@ module Slack
         [:Eventmachine, :Celluloid].each do |concurrency|
           begin
             return Slack::RealTime::Concurrency.const_get(concurrency)
-          rescue LoadError
+          rescue LoadError, NameError
             false # could not be loaded, missing dependencies
           end
         end

data/lib/slack/version.rb

@@ -1,3 +1,3 @@
 module Slack
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/integration/integration_spec.rb

@@ -1,14 +1,19 @@
-require 'slack'
-require 'logger'
+require 'spec_helper'
 
 RSpec.describe 'integration test', skip: !ENV['SLACK_API_TOKEN'] && 'missing SLACK_API_TOKEN' do
+  around do |ex|
+    WebMock.allow_net_connect!
+    VCR.turned_off { ex.run }
+    WebMock.disable_net_connect!
+  end
+
   before do
     Thread.abort_on_exception = true
   end
 
   let(:logger) { Logger.new(STDOUT) }
 
-  let(:queue) { Queue.new }
+  let(:queue) { QueueWithTimeout.new }
 
   let(:client) { Slack::RealTime::Client.new(token: ENV['SLACK_API_TOKEN']) }
 
@@ -34,16 +39,18 @@ RSpec.describe 'integration test', skip: !ENV['SLACK_API_TOKEN'] && 'missing SLA
   end
 
   def start_server
-    logger.debug '#start_server'
+    dt = rand(5) + 1
+    logger.debug "#start_server, waiting #{dt} second(s)"
+    sleep dt # prevent Slack 429 rate limit errors
     # start server and wait for on :open
     c = connection
     logger.debug "connection is #{c}"
-    queue.pop
+    queue.pop_with_timeout(5)
   end
 
   def wait_for_server
     logger.debug '#wait_for_server'
-    queue.pop
+    queue.pop_with_timeout(5)
     logger.debug '#wait_for_server, joined'
   end
 
@@ -67,8 +74,10 @@ RSpec.describe 'integration test', skip: !ENV['SLACK_API_TOKEN'] && 'missing SLA
 
       client.on :message do |data|
         logger.debug data
-        expect(data).to include('text' => message, 'subtype' => 'bot_message')
+        expect(data['text']).to eq message
+        expect(data['subtype']).to eq 'bot_message'
         logger.debug 'client.stop!'
+        expect(client.started?).to be true
         client.stop!
       end
 
@@ -80,6 +89,7 @@ RSpec.describe 'integration test', skip: !ENV['SLACK_API_TOKEN'] && 'missing SLA
   it 'gets hello' do
     client.on :hello do |data|
       logger.debug "client.on :hello, data=#{data}"
+      expect(client.started?).to be true
       client.stop!
     end
 

data/spec/slack/messages/formatting_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Slack::Messages::Formatting do

data/spec/slack/real_time/client_spec.rb

@@ -4,10 +4,16 @@ RSpec.describe Slack::RealTime::Client, vcr: { cassette_name: 'web/rtm_start' }
   let(:ws) { double(Slack::RealTime::Concurrency::Mock::WebSocket, on: true) }
   let(:url) { 'wss://ms173.slack-msgs.com/websocket/lqcUiAvrKTP-uuid=' }
   before do
+    @token = ENV.delete('SLACK_API_TOKEN')
+    Slack::Config.reset
+    Slack::RealTime::Config.reset
     Slack::RealTime.configure do |config|
       config.concurrency = Slack::RealTime::Concurrency::Mock
     end
   end
+  after do
+    ENV['SLACK_API_TOKEN'] = @token if @token
+  end
   context 'token' do
     before do
       Slack.configure do |config|

data/spec/slack/slack_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe Slack do
   let(:slack) { File.expand_path(File.join(__FILE__, '../../../bin/slack')) }
+  before do
+    @token = ENV.delete('SLACK_API_TOKEN')
+  end
+  after do
+    ENV['SLACK_API_TOKEN'] = @token if @token
+  end
   describe '#help' do
     it 'displays help' do
       help = `"#{slack}" help`

data/spec/slack/web/client_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 RSpec.describe Slack::Web::Client do
+  before do
+    Slack::Config.reset
+  end
   context 'with defaults' do
     let(:client) { Slack::Web::Client.new }
     describe '#initialize' do

data/spec/support/queue_with_timeout.rb

@@ -0,0 +1,34 @@
+# http://spin.atomicobject.com/2014/07/07/ruby-queue-pop-timeout/
+class QueueWithTimeout
+  def initialize
+    @mutex = Mutex.new
+    @queue = []
+    @recieved = ConditionVariable.new
+  end
+
+  def push(x)
+    @mutex.synchronize do
+      @queue << x
+      @recieved.signal
+    end
+  end
+
+  def <<(x)
+    push(x)
+  end
+
+  def pop(non_block = false)
+    pop_with_timeout(non_block ? 0 : nil)
+  end
+
+  def pop_with_timeout(timeout = nil)
+    @mutex.synchronize do
+      if @queue.empty?
+        @recieved.wait(@mutex, timeout) if timeout != 0
+        # if we're still empty after the timeout, raise exception
+        fail ThreadError, 'queue empty' if @queue.empty?
+      end
+      @queue.shift
+    end
+  end
+end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -185,12 +185,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -310,6 +310,7 @@ files:
 - spec/slack/web/api/error_spec.rb
 - spec/slack/web/client_spec.rb
 - spec/spec_helper.rb
+- spec/support/queue_with_timeout.rb
 - spec/support/real_time/concurrency/mock.rb
 - spec/support/real_time/connected_client.rb
 - spec/support/token.rb
@@ -324,17 +325,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Slack Web and RealTime API client.
@@ -361,6 +362,7 @@ test_files:
 - spec/slack/web/api/error_spec.rb
 - spec/slack/web/client_spec.rb
 - spec/spec_helper.rb
+- spec/support/queue_with_timeout.rb
 - spec/support/real_time/concurrency/mock.rb
 - spec/support/real_time/connected_client.rb
 - spec/support/token.rb