rbitter 0.2.0-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9c0ff087a6aacd028509c314aaefcbbf58dd36
-  data.tar.gz: 920cd1f50bf68313d4c53bc63ce702d94eec3e44
+  metadata.gz: 06bfae2b2f77d2fc7187c107ddcb42f3b8240860
+  data.tar.gz: 6956d800f7d306b1ae4b6b1b78b3a4e1c383e954
 SHA512:
-  metadata.gz: 234b2fddc686b01706d92146da6230d0c45f323bf0dd75447522f71f5543e21bc6afe2bf4ad98865d1524802e54aef9e7671d15abc2ea5b4f5198054dc0f9af2
-  data.tar.gz: 7d11d501b9f3fcb2b5f78a76d4c3c1f197e0562aca9e59cdcfdbd0c54f16bed0c6c673c6b4d96af0c7abb6dd09b9eb9ea64ee596bd359738912a10eb86fef3c4
+  metadata.gz: 8d745a88bc36645e6e3b2b2224a192a44e4ca6dfb09f136b82ba275bdcc29abe2fe01ff7c51bd9dd9d8d1187eaab56b58e66cf8977c4da625b2c8c547036efb9
+  data.tar.gz: 1676d89e1c4b4fdb7b24a3d0f6d9263148d327fb82547de298dc7ed81f734df502a734bd083b61b3c003e59719b6867cf19e25a46a4be78ab0f5ee667b0962bb

data/.gitignore

@@ -1,22 +1,23 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/build/
-/vendor/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-*.gem
-*.json
-*.sqlite
-*.png
-.rbitter
-.rbitter/*
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/build/
+/vendor/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+*.gem
+*.json
+*.sqlite
+*.png
+.rbitter
+.rbitter/*
+.ruby-version

data/.rspec

@@ -1,2 +1,2 @@
---color
---require spec_helper
+--color
+--require spec_helper

data/.travis.yml

@@ -1,15 +1,15 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.1.0
-  - 2.2.0
-  - jruby-19mode
-  - jruby-head
-  - rbx-2
-
-env: LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8"
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx-2
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.0
+  - 2.2.0
+  - jruby-19mode
+  - jruby-head
+  - rbx-2
+
+env: LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8"
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-2

data/Gemfile

@@ -1,12 +1,12 @@
-source "https://rubygems.org"
-
-group :test do
-  gem 'rspec', '~>3.0'
-  gem 'simplecov', :require => false, :group => :test
-  gem 'coveralls', :require => false
-end
-
-gem "bundler"
-gem 'jruby-openssl', platforms: :jruby
-
-gemspec
+source "https://rubygems.org"
+
+group :test do
+  gem 'rspec', '~>3.0'
+  gem 'simplecov', :require => false, :group => :test
+  gem 'coveralls', :require => false
+end
+
+gem "bundler"
+gem 'jruby-openssl', platforms: :jruby
+
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2015 Nidev Plontra
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2015 Nidev Plontra
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,8 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-task :default => :spec
-task :basic_test => :spec
-
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :basic_test => :spec
+

data/bin/rbitter

@@ -1,20 +1,20 @@
-#!/usr/bin/env ruby
-
-require "rbitter"
-
-Rbitter.rbitter_header
-
-if ARGV.length < 1 || (not Rbitter::BOOTSTRAP_ARGS.include?(ARGV[0]))
-  Rbitter.rbitter_help_msg
-  exit -1
-else
-  Rbitter.bootstrap(ARGV)
-
-  if ARGV[0] == "configure"
-    puts "Writing config.json done"
-    puts "You can put config.json one of these locations:"
-    puts "[1] config.json (current folder)"
-    puts "[2] .rbitter/config.json (current folder)"
-  end
-end
-
+#!/usr/bin/env ruby
+
+require "rbitter"
+
+Rbitter.rbitter_header
+
+if ARGV.length < 1 || (not Rbitter::BOOTSTRAP_ARGS.include?(ARGV[0]))
+  Rbitter.rbitter_help_msg
+  exit -1
+else
+  Rbitter.bootstrap(ARGV)
+
+  if ARGV[0] == "configure"
+    puts "Writing config.json done"
+    puts "You can put config.json one of these locations:"
+    puts "[1] config.json (current folder)"
+    puts "[2] .rbitter/config.json (current folder)"
+  end
+end
+

data/lib/rbitter/arcserver.rb

@@ -1,165 +1,169 @@
-# encoding: utf-8
-
-require "json"
-require "date"
-require "twitter"
-require "resolv"
-
-require "rbitter/records"
-require "rbitter/streaming"
-require "rbitter/dlthread"
-require "rbitter/xmlrpc"
-
-module Rbitter
-  class ArcServer
-    LOG_NORMAL = 0
-    LOG_INIT = 1
-    LOG_HALT = 2
-    LOG_ERROR = 4
-
-    def initialize(xmlrpcd_class = Rbitter::RPCServer)
-      @xmlrpcd_class = xmlrpcd_class
-      @dt = DLThread.new(
-        Rbitter['media_downloader']['download_dir'],
-        Rbitter['media_downloader']['large_image'])
-    end
-
-    def arsupport_init
-      ARSupport.connect_database
-
-      if not ARSupport.prepared?
-        puts "Initiate database table..."
-        if Rbitter['activerecord'] == 'mysql2'
-          ARSupport.prepare "DEFAULT CHARSET=utf8mb4"
-        else
-          ARSupport.prepare
-        end
-      end
-
-      ARSupport.update_database_scheme
-    end
-
-    def arsupport_halt
-      ARSupport.disconnect_database
-    end
-
-    def xmlrpcd_start
-      if Rbitter['xmlrpc']['enable']
-        @rpc_service = Thread.new {
-          rpc_server = @xmlrpcd_class.new(Rbitter['xmlrpc']['bind_host'], Rbitter['xmlrpc']['bind_port'])
-          rpc_server.main_loop
-        }
-      else
-        @rpc_service = nil
-      end
-    end
-
-    def xmlrpcd_stop
-      unless @rpc_service.nil?
-        if @rpc_service.alive?
-          puts "Finishing RPCServer (impl: #{@xmlrpcd_class})"
-          @rpc_service.terminate
-          @rpc_service.join
-          @rpc_service = nil
-        end
-      end
-    end
-
-    def mark(code, message)
-      Record.create({:marker => code,
-        :marker_msg => message, 
-        :userid => nil,
-        :username => nil,
-        :tweetid => nil,
-        :replyto => nil,
-        :tweet => nil,
-        :date => ARSupport.any_to_datestring(DateTime.now),
-        :rt_count => 0,
-        :fav_count => 0})
-    end
-
-    def mark_init
-      mark(LOG_INIT, "Archiving service started")
-    end
-
-    def mark_halt
-      mark(LOG_HALT, "Archiving service halted")
-    end
-
-    def mark_error(exception_string, err_msg)
-      mark(LOG_ERROR, "Errored (#{exception_string}, #{err_msg}")
-    end
-
-    def resurrect_loop?
-      if Rbitter.env['twitter']['connection']['reconnect']
-        puts "[rbitter] Try to reconnect..."
-        sleep Rbitter.env['twitter']['connection']['timeout_secs']
-        true
-      else
-        puts "[rbitter] Give up!"
-        false
-      end
-    end
-
-    def main_loop(streaming_adapter = Rbitter::StreamClient)
-      xmlrpcd_start if Rbitter['xmlrpc']['enable']
-
-      arsupport_init
-
-      begin
-        mark_init
-
-        streaming_adapter.new(Rbitter['twitter']).run { |a|
-          @dt << a['media_urls']
-
-          record = Record.find_or_initialize_by(tweetid: a['tweetid'])
-          record.update({:marker => 0,
-            :marker_msg => "normal", 
-            :userid => a['userid'],
-            :username => a['screen_name'],
-            :tweetid => a['tweetid'],
-            :replyto => a['replyto'],
-            :tweet => a['tweet'],
-            :date => a['date'],
-            :rt_count => a['rt_count'],
-            :fav_count => a['fav_count']})
-
-          record.save
-        }
-      rescue Interrupt => e
-        puts ""
-        puts "Interrupted..."
-        mark_error(e.to_s, "(exit) SIGINT - interrupted by user")
-      rescue Twitter::Error::Unauthorized => e
-        warn "Twitter access unauthorized:"
-        warn "  Possible solutions"
-        warn "  1. Configure Twitter token on config.json"
-        warn "  2. Check system time (Time is important on authentication)"
-        warn "  3. Check Twitter account status"
-      rescue Twitter::Error::ServerError => e
-        puts "Service unavailable now. Retry in 5 seconds..."
-        mark_error(e.to_s, "(retry) Twitter server unavailable / Timeout")
-
-        retry if resurrect_loop?
-      rescue Resolv::ResolvError, Errno::ECONNABORTED,
-        Errno::ECONNREFUSED, Errno::ECONNRESET => e
-        puts "Network problem. Retry in 5 seconds..."
-        mark_error(e.to_s, "(retry) Network problem")
-
-        retry if resurrect_loop?
-      rescue Twitter::Error => e
-        warn "Twitter Error: #{e.inspect}"
-        warn "Rbitter halts due to Twitter::Error"
-        mark_error(e.to_s, "(exit) Twitter Error")
-      ensure
-        xmlrpcd_stop if Rbitter['xmlrpc']['enable']
-        @dt.job_cleanup
-
-        mark_halt
-      end
-
-      arsupport_halt
-    end
-
-  end
-end
+# encoding: utf-8
+
+require "json"
+require "date"
+require "twitter"
+require "resolv"
+
+require "rbitter/records"
+require "rbitter/streaming"
+require "rbitter/dlthread"
+require "rbitter/xmlrpc"
+require "rbitter/progress"
+
+module Rbitter
+  class ArcServer
+    include Progress
+
+    LOG_NORMAL = 0
+    LOG_INIT = 1
+    LOG_HALT = 2
+    LOG_ERROR = 4
+
+    def initialize(xmlrpcd_class = Rbitter::RPCServer)
+      @xmlrpcd_class = xmlrpcd_class
+      @dt = DLThread.new(
+        Rbitter['media_downloader']['download_dir'],
+        Rbitter['media_downloader']['large_image'])
+    end
+
+    def arsupport_init
+      ARSupport.connect_database
+
+      if not ARSupport.prepared?
+        puts "Initiate database table..."
+        if Rbitter['activerecord'] == 'mysql2'
+          ARSupport.prepare "DEFAULT CHARSET=utf8mb4"
+        else
+          ARSupport.prepare
+        end
+      end
+
+      ARSupport.update_database_scheme
+    end
+
+    def arsupport_halt
+      ARSupport.disconnect_database
+    end
+
+    def xmlrpcd_start
+      if Rbitter['xmlrpc']['enable']
+        @rpc_service = Thread.new {
+          rpc_server = @xmlrpcd_class.new(Rbitter['xmlrpc']['bind_host'], Rbitter['xmlrpc']['bind_port'])
+          rpc_server.main_loop
+        }
+      else
+        @rpc_service = nil
+      end
+    end
+
+    def xmlrpcd_stop
+      unless @rpc_service.nil?
+        if @rpc_service.alive?
+          puts "Finishing RPCServer (impl: #{@xmlrpcd_class})"
+          @rpc_service.terminate
+          @rpc_service.join
+          @rpc_service = nil
+        end
+      end
+    end
+
+    def mark(code, message)
+      Record.create({:marker => code,
+        :marker_msg => message, 
+        :userid => nil,
+        :username => nil,
+        :tweetid => nil,
+        :replyto => nil,
+        :tweet => nil,
+        :date => ARSupport.any_to_datestring(DateTime.now),
+        :rt_count => 0,
+        :fav_count => 0})
+    end
+
+    def mark_init
+      mark(LOG_INIT, "Archiving service started")
+    end
+
+    def mark_halt
+      mark(LOG_HALT, "Archiving service halted")
+    end
+
+    def mark_error(exception_string, err_msg)
+      mark(LOG_ERROR, "Errored (#{exception_string}, #{err_msg}")
+    end
+
+    def resurrect_loop?
+      if Rbitter.env['twitter']['connection']['reconnect']
+        puts "[rbitter] Try to reconnect..."
+        sleep Rbitter.env['twitter']['connection']['timeout_secs']
+        true
+      else
+        puts "[rbitter] Give up!"
+        false
+      end
+    end
+
+    def main_loop(streaming_adapter = Rbitter::StreamClient)
+      xmlrpcd_start if Rbitter['xmlrpc']['enable']
+
+      arsupport_init
+
+      begin
+        mark_init
+
+        streaming_adapter.new(Rbitter['twitter']).run { |a|
+          @dt << a['media_urls']
+
+          record = Record.find_or_initialize_by(tweetid: a['tweetid'])
+          record.update({:marker => 0,
+            :marker_msg => "normal", 
+            :userid => a['userid'],
+            :username => a['screen_name'],
+            :tweetid => a['tweetid'],
+            :replyto => a['replyto'],
+            :tweet => a['tweet'],
+            :date => a['date'],
+            :rt_count => a['rt_count'],
+            :fav_count => a['fav_count']})
+
+          record.save
+          draw "[rbitter] saving tweet: #{a['tweetid']}"
+        }
+      rescue Interrupt => e
+        puts ""
+        puts "Interrupted..."
+        mark_error(e.to_s, "(exit) SIGINT - interrupted by user")
+      rescue Twitter::Error::Unauthorized => e
+        warn "Twitter access unauthorized:"
+        warn "  Possible solutions"
+        warn "  1. Configure Twitter token on config.json"
+        warn "  2. Check system time (Time is important on authentication)"
+        warn "  3. Check Twitter account status"
+      rescue Twitter::Error::ServerError => e
+        puts "Service unavailable now. Retry in 5 seconds..."
+        mark_error(e.to_s, "(retry) Twitter server unavailable / Timeout")
+
+        retry if resurrect_loop?
+      rescue Resolv::ResolvError, Errno::ECONNABORTED,
+        Errno::ECONNREFUSED, Errno::ECONNRESET => e
+        puts "Network problem. Retry in 5 seconds..."
+        mark_error(e.to_s, "(retry) Network problem")
+
+        retry if resurrect_loop?
+      rescue Twitter::Error => e
+        warn "Twitter Error: #{e.inspect}"
+        warn "Rbitter halts due to Twitter::Error"
+        mark_error(e.to_s, "(exit) Twitter Error")
+      ensure
+        xmlrpcd_stop if Rbitter['xmlrpc']['enable']
+        @dt.job_cleanup
+
+        mark_halt
+      end
+
+      arsupport_halt
+    end
+
+  end
+end