twterm 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb6aa751c551429a11611090d53bc7e12131069
-  data.tar.gz: 2087324f9ac8e6243182382cc99330d82cda778e
+  metadata.gz: 224b8dc2d3619a2042816816273a0526a7cb9666
+  data.tar.gz: f1e33882f1154a83dfb5c744d1d613f4844aba48
 SHA512:
-  metadata.gz: c653d2bb79a6dec49cdc5344e93466c2e24858828b683a7a529374efc21ab0f600a67fd08252c38df5b19098934275f589d79a71011739798e514fdbc83e9b81
-  data.tar.gz: f6d47f77d40ad6cf2808190ce8a5311640252d28354a49b76f1ff56708ccba1a2990996f417dcb646bfa3d1d0d283a4c7b38521d89fff562fb5e290ae99f904e
+  metadata.gz: 57087dc1e7f65520af3ab90af85e7d8511855ca40696709173e8797aa2d1a004fba09dd2eebcb6ce8dd03cceaf03d530a8f5ad827a6ed318e05fb5940db644ee
+  data.tar.gz: 204684237b545673c87f0edb02fbf80b7c077095b59531ba5b1c43ff1055ccee7585354d9612dee02cf54fa88ebbaca72d250f81418c2d4a3c8d6153d1aa63ae

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.4.0
 
 script: bundle exec rspec

data/lib/twterm/client.rb

@@ -25,8 +25,6 @@ module Twterm
         end
       end
 
-      initialize_user_stream
-
       direct_message_manager
 
       @@instances << self

data/lib/twterm/streaming_client.rb

@@ -1,4 +1,5 @@
 require 'twterm/event/favorite'
+require 'twterm/event/follow'
 require 'twterm/event/notification'
 require 'twterm/event/status/mention'
 require 'twterm/event/status/timeline'
@@ -12,71 +13,75 @@ module Twterm
     CONSUMER_SECRET = 'OFLKzrepRG2p1hq0nUB9j2S9ndFQoNTPheTpmOY0GYw55jGgS5'.freeze
 
     def connect_user_stream
-      streaming_client.stop_stream
+      return if user_stream_connected?
 
       @streaming_thread = Thread.new do
         begin
           publish(Event::Notification.new(:message, 'Trying to connect to Twitter...'))
-          streaming_client.userstream
-        rescue EventMachine::ConnectionError
-          publish(Event::Notification.new(:error, 'Connection failed'))
+          streaming_client.user do |event|
+            keep_alive!
+
+            case event
+            when Twitter::Tweet
+              status = Status.new(event)
+              publish(Event::Status::Timeline.new(status))
+              publish(Event::Status::Mention.new(status)) if status.text.include?('@%s' % screen_name)
+            when Twitter::Streaming::Event
+              case event.name
+              when :favorite
+                user = User.new(event.source)
+                status = Status.new(event.target_object)
+
+                event = Event::Favorite.new(user, status, self)
+                publish(event)
+              when :follow
+                source = User.new(event.source)
+                target = User.new(event.target)
+
+                event = Event::Follow.new(source, target, self)
+
+                publish(event)
+              end
+            when Twitter::DirectMessage
+            when Twitter::Streaming::FriendList
+              user_stream_connected!
+            when Twitter::Streaming::DeletedTweet
+              publish(Event::Status::Delete.new(event.id))
+            end
+          end
+        rescue Twitter::Error::TooManyRequests
+          publish(Event::Notification.new(:error, 'Rate limit exceeded'))
+          sleep 120
+          retry
+        rescue Errno::ENETUNREACH, Resolv::ResolvError
+          publish(Event::Notification.new(:error, 'Network is unavailable'))
           sleep 30
           retry
+        rescue Twitter::Error => e
+          publish(Event::Notification.new(:error, e.message))
         end
       end
     end
 
-    def initialize_user_stream
-      return if user_stream_initialized?
-
-      streaming_client.on_friends do
-        user_stream_connected!
-      end
-
-      streaming_client.on_timeline_status do |tweet|
-        status = Status.new(tweet)
-        publish(Event::Status::Timeline.new(status))
-        publish(Event::Status::Mention.new(status)) if status.text.include?('@%s' % screen_name)
-      end
-
-      streaming_client.on_delete do |status_id|
-        publish(Event::StatusDeleted.new(status_id))
-      end
-
-      streaming_client.on_event(:favorite) do |event|
-        user = User.new(Twitter::User.new(event[:source]))
-        status = Status.new(Twitter::Status.new(event[:target_object]))
-
-        event = Event::Favorite.new(user, status, self)
-        publish(event)
-      end
-
-      streaming_client.on_event(:follow) do |event|
-        source = User.new(Twitter::User.new(event[:source]))
-        target = User.new(Twitter::User.new(event[:target]))
-
-        event = Event::Follow.new(source, target, self)
-        publish(:followed, event)
-      end
+    private
 
-      streaming_client.on_no_data_received do
-        user_stream_disconnected!
+    def keep_alive!
+      @keep_alive_timer.kill if @keep_alive_timer.is_a?(Thread)
+      @keep_alive_timer = Thread.new do
+        sleep(120)
+        @user_stream_connected = false
+        @streaming_thread.kill
         connect_user_stream
       end
-
-      user_stream_initialized!
     end
 
-    private
-
     def streaming_client
-      @streaming_client ||= TweetStream::Client.new(
-        consumer_key:       CONSUMER_KEY,
-        consumer_secret:    CONSUMER_SECRET,
-        oauth_token:        @access_token,
-        oauth_token_secret: @access_token_secret,
-        auth_method:        :oauth
-      )
+      @streaming_client ||= Twitter::Streaming::Client.new do |config|
+        config.consumer_key       = CONSUMER_KEY
+        config.consumer_secret    = CONSUMER_SECRET
+        config.access_token        = @access_token
+        config.access_token_secret = @access_token_secret
+      end
     end
 
     def user_stream_connected?

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

data/lib/twterm.rb

@@ -9,7 +9,6 @@ require 'oauth'
 require 'readline'
 require 'singleton'
 require 'set'
-require 'tweetstream'
 require 'twitter'
 require 'twitter-text'
 require 'yaml'
@@ -65,6 +64,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.1.1'
+    REQUIRE_VERSION = '1.3.0'
   end
 end

data/twterm.gemspec

@@ -21,9 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'curses', '>= 1.0.1'
   spec.add_dependency 'launchy', '>= 2.4.3'
   spec.add_dependency 'oauth', '>= 0.4.7'
-  spec.add_dependency 'tweetstream', '~> 2.6'
-  spec.add_dependency 'twitter', '~> 5.13'
-  spec.add_dependency 'twitter-text', '>= 1.11.0'
+  spec.add_dependency 'twitter', '~> 6.0.0'
+  spec.add_dependency 'twitter-text', '1.14.0'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -52,48 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.7
-- !ruby/object:Gem::Dependency
-  name: tweetstream
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A full-featured CLI Twitter client