arb-xmu-course 2.5.5 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8449dc7e0973933485064102644ea365626ce3b
-  data.tar.gz: 2e84d30861491cce5f727a0ba1244bd5605a5d18
+  metadata.gz: c65fe569b430a9aacfe396ad8f2a2a795d7d048a
+  data.tar.gz: 71e303551dd4ecf712a3cdb1fab4cff9f7458e32
 SHA512:
-  metadata.gz: 6d80799b51ae6d567851d277e5a963bf760a6c6c5adb6dd2bb65bb05cffe3dafa094179bb18cf8f3389c2237ebff83218779ab56c67da0d6f5f1647560773973
-  data.tar.gz: 43d4be9ff5d45ab468bd86694b42398a9a8e0f58f7ab6bd28c1e04b3df74309a7fe0293eaea0d5f2c4b76ffa29c716c1817c5579a8960bce05b58e1f19c2fa44
+  metadata.gz: ef465fd71053009cb6281304ec5cb199c189d02964965c883bd46c2c7622351034e9f1cb92b63e7844d39ebb12ed85fd182937ee71eef86cebda6b23ed99b0ce
+  data.tar.gz: 59f04359f3a4eff3c8336d181cea48dbc416d407e49a4f7adccbf71330136e8f45e28dffadd80406b2f71c9cf43f92caf22f72e4aa99a410b14412247a9c12ff

data/bin/arb-xmu-course

@@ -45,7 +45,7 @@ def select_course_common(client, url, xxlx)
 rescue Timeout::Error, HTTPClient::TimeoutError
   exit_with_error "服务器无响应，程序结束运行。"
 rescue Exception => e
-  exit_with_error "因未知错误，程序结束运行。(#{e})"
+  exit_with_error "程序结束运行。(#{e})"
 end
 
 def set_up_account
@@ -124,7 +124,6 @@ end
 
 def create_attempt_thread(max_interval, client, course, xxlx, lcid, retry_count, &block)
   Thread.new do
-    begin
       count=0
       loop do
         count+=1
@@ -138,17 +137,14 @@ 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 
-          retry if retry_count!=0 and retry_count-=1 and global_puts('网络超时，重新连接中……')
+        rescue Exception=>e
+          retry if retry_count!=0 and retry_count-=1 and global_puts("网络超时，重新连接中……（#{e}）")
           exit_with_error('超时次数耗尽，程序结束运行。') if retry_count==0
         end
       end
       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 Exception=>e
-      exit_with_error "因未知错误，程序结束运行。(#{e})"
-    end
   end
 end
 
@@ -250,8 +246,6 @@ 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)

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

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

metadata

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