arb-xmu-course 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d9749a7ca5b3de907847ce8b2e51137ab9b84f
-  data.tar.gz: 81fce379eb920807337b6afd4149a56857e75e60
+  metadata.gz: a8449dc7e0973933485064102644ea365626ce3b
+  data.tar.gz: 2e84d30861491cce5f727a0ba1244bd5605a5d18
 SHA512:
-  metadata.gz: af256a6e2b86a1793897591bace50c8aee2e683dc18f49e0773f3d71dd9a26d9b1e494bb44bb2a0d32219347acda87bf550ac8a00c33714e9b27c9fd9d849184
-  data.tar.gz: 76e683228d86d17d698e4e64ce8ab7f4f24ed6abee8fd1f4c9231eccd2ae9ecdb7d8d7888bbab6a72946cbe696c61c205f0290a3f71289327b58de26af2c3bd7
+  metadata.gz: 6d80799b51ae6d567851d277e5a963bf760a6c6c5adb6dd2bb65bb05cffe3dafa094179bb18cf8f3389c2237ebff83218779ab56c67da0d6f5f1647560773973
+  data.tar.gz: 43d4be9ff5d45ab468bd86694b42398a9a8e0f58f7ab6bd28c1e04b3df74309a7fe0293eaea0d5f2c4b76ffa29c716c1817c5579a8960bce05b58e1f19c2fa44

data/bin/arb-xmu-course

@@ -44,6 +44,8 @@ def select_course_common(client, url, xxlx)
   end
 rescue Timeout::Error, HTTPClient::TimeoutError
   exit_with_error "服务器无响应，程序结束运行。"
+rescue Exception => e
+  exit_with_error "因未知错误，程序结束运行。(#{e})"
 end
 
 def set_up_account
@@ -136,7 +138,7 @@ def create_attempt_thread(max_interval, client, course, xxlx, lcid, retry_count,
             global_puts  "《#{course.name}》（#{course.class_name}班）第#{count}次尝试选课失败，#{interval}秒后将重试。（#{filter_text(res['message'])}）"
           end
           sleep interval
-        rescue Timeout::Error, HTTPClient::TimeoutError
+        rescue 
           retry if retry_count!=0 and retry_count-=1 and global_puts('网络超时，重新连接中……')
           exit_with_error('超时次数耗尽，程序结束运行。') if retry_count==0
         end
@@ -144,9 +146,8 @@ def create_attempt_thread(max_interval, client, course, xxlx, lcid, retry_count,
       opened_thread_count=block.binding.local_variable_get(:opened_thread_count)
       exit unless opened_thread_count > 0
       block.binding.local_variable_set :opened_thread_count, opened_thread_count-1
-    rescue Interrupt
     rescue Exception=>e
-      exit_with_error("未知原因导致程序运行出错，请联系作者。（#{e}）")
+      exit_with_error "因未知错误，程序结束运行。(#{e})"
     end
   end
 end
@@ -249,13 +250,14 @@ def global_gets(*args)
   tmp = $stdin.gets.chomp
   exit if quit_flags.include? tmp
   tmp
+rescue Interrupt
+  exit_with_error "因手动退出，程序结束运行。"
 end
 
 def exit_with_error(*args)
   global_puts(*args) and exit
 end
 
-
 TOKEN_FILE_NAME = 'encrypted_token'
 TOKEN_SEPARATOR = ':'
 CLIENT = HTTPClient.new

data/lib/arb/xmu/course/version.rb

@@ -1,7 +1,7 @@
 module Arb
   module Xmu
     module Course
-      VERSION = '2.5.4'
+      VERSION = '2.5.5'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arb-xmu-course
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - arybin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler