ruboty-tweetstream 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fd6a29c2eb198bc028cdaf0cc7795460543646
-  data.tar.gz: 0706a612363b5f0f7ae1dab7c8ba818841e2f8da
+  metadata.gz: 60de20eb65af9dbc59a729bc31db428057da2af6
+  data.tar.gz: 14f205071ce869d0cf2cec8f399f428e6e8d30f7
 SHA512:
-  metadata.gz: 2591f7c7baea9dd4fee1ea2b1dbe3f0da0ce41227ca003ab005b8b0ddbf6b01ed65ba632323d249ba9fa793b99fe85e5139673a5a0ff6bc5490a0850db21a859
-  data.tar.gz: d2f7fb74fbd96ec6e7c7ece17de47dcbc2a17ee1a8a8d7cb55bf26997fdfc9baf20639d3e75db666689558d21e54f9c9bc17e20402ab4d6462116e1986cb98ed
+  metadata.gz: 99c38dfcc3152f26807419e29063e2e9a92eda341fad717cc993602a6cfce2303f12a4b9781de640eb235441467dccd2a92ed5efcf13199e6d993e686b5d1228
+  data.tar.gz: c40db43353d008dc945017183ca930379131a44c83ef022e51ac1f0cc2b67857ee63a2eb605d15bfc7a8fe57b80462d0b57ae3f8e0278fe0591c929f1c86ea6c

data/lib/ruboty/handlers/tweetstream.rb

@@ -66,26 +66,26 @@ module Ruboty
       end
 
       def list(message)
-        sorted_streams = streams.sort_by {|_id, hash| hash[:username]}
-
-        if message[:all_flag]
-          stream_list = sorted_streams.map do |id, hash|
-            stream = "#{id}: @#{hash[:username]}"
-            stream << " (#{hash[:channel]})" unless hash[:channel].nil?
-            stream
-          end
-        else
-          stream_list = sorted_streams.map { |id, hash|
-            # Skip the channel that registered from other channel.
-            next unless hash[:channel] == message.channel
-
-            "#{id}: @#{hash[:username]}"
-          }.compact
-        end
-
-        if stream_list.empty?
+        if streams.empty?
           message.reply("The stream doesn't exist.")
         else
+          sorted_streams = streams.sort_by {|_id, hash| hash[:username]}
+
+          if message[:all_flag]
+            stream_list = sorted_streams.map do |id, hash|
+              stream = "#{id}: @#{hash[:username]}"
+              stream << " (#{hash[:channel]})" unless hash[:channel].nil?
+              stream
+            end
+          else
+            stream_list = sorted_streams.map { |id, hash|
+              # Skip the channel that registered from other channel.
+              next unless hash[:channel] == message.channel
+
+              "#{id}: @#{hash[:username]}"
+            }.compact
+          end
+
           message.reply(stream_list.join("\n"), code: true)
         end
       end

data/lib/ruboty/tweetstream/stream.rb

@@ -10,10 +10,11 @@ end
 module Ruboty
   module Tweetstream
     class Stream
-      attr_reader :hash, :thread
+      attr_reader :hash
 
       def initialize(hash)
         @hash = hash
+        @thread = nil
 
         @client = Twitter::Streaming::Client.new do |config|
           config.consumer_key        = CONSUMER_KEY
@@ -24,7 +25,7 @@ module Ruboty
       end
 
       def start(robot)
-        @thread = Thread.start do
+        @thread = interval_reconnect do
           @client.filter(follow: hash[:twitter_id].to_s) do |object|
             if object.is_a?(Twitter::Tweet) && object.is_pure_user_tweet?(hash[:username])
               Message.new(
@@ -35,8 +36,23 @@ module Ruboty
         end
       end
 
+      # Twitter::Streaming disconnects over time
+      def interval_reconnect
+        parent = Thread.start do
+          loop do
+            child = Thread.start do
+              yield
+            end
+            sleep 3600 # Disconnect every hour
+            child.kill
+          end
+        end
+
+        parent
+      end
+
       def stop
-        thread.kill
+        @thread.kill
       end
     end
   end

data/lib/ruboty/tweetstream/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Tweetstream
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/ruboty-tweetstream.gemspec

@@ -22,6 +22,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'awesome_print'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-tweetstream
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: awesome_print
-  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'
 description: Ruboty handler to stream specified user's tweet from Twitter.
 email:
 - kaihar4@gmail.com