arb-xmu-course 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1531ba75e5a898b024b5003718ff236d3bb3da34
-  data.tar.gz: 5fd20229501e38a2b358e019cde76bbdac95495e
+  metadata.gz: faa1cdb5d3d96c3a79fd07d63d077978eee9fa01
+  data.tar.gz: 3ff92b1591be12dd60f78699233e87d17f320188
 SHA512:
-  metadata.gz: 7e0454e279c13ee976735df9f6f065b3718d48bcbd45d2d84952e2cc809a17cc44a1aed13ea532ded10ea0c956b36968c9aef8972b53bd5012c9adcc2d2c128d
-  data.tar.gz: abc3b0b9fe0ebf9ee2960f9366f3b4438bfaa6078fce3f897adc3ffcd113fee6f79bf6c022fba901e9f80de4956b65015eeb7c1e7d5798fbaf8063017768781f
+  metadata.gz: ec55e9d04a7a59894d96752ebf0b584c12941543cdb8ed02869c94aac4156c282de91f35f6fa9f9c6f0d78e0565f75be4237304a9b7b95b50c916bd91a735b60
+  data.tar.gz: edb38c3d58380f07663e0c72b2d28c7e7d96b89e1df7e04fe52ece673569969679134253a1600b1e49a37e7dc8bfc5aabe3f91e6c51ef951a4cd64ad298c6d95

data/bin/arb-xmu-course

@@ -124,14 +124,14 @@ def create_attempt_thread(max_interval, client, course, xxlx, lcid, &block)
     loop do
       count+=1
       interval= 1+rand(max_interval)
-      sleep interval
       res = request_select_course(client, course, xxlx, lcid)
       if res['success']
-        global_puts '', "《#{course.name}》（#{course.class_name}班）已经成功选课！", ''
+        global_puts "《#{course.name}》（#{course.class_name}班）已经成功选课！" 
         break
       else
-        global_puts '', "《#{course.name}》（#{course.class_name}班）第#{count}次尝试选课失败，#{interval}秒后将重试。（#{filter_text(res['message'])}）", ''
+        global_puts  "《#{course.name}》（#{course.class_name}班）第#{count}次尝试选课失败，#{interval}秒后将重试。（#{filter_text(res['message'])}）"
       end
+      sleep interval
     end
     opened_thread_count=block.binding.local_variable_get(:opened_thread_count)
     exit unless opened_thread_count > 0
@@ -141,10 +141,10 @@ end
 
 def request_select_course(client, course_entity, xxlx, lcid)
   msg = client.get 'http://bkxk.xmu.edu.cn/xsxk/elect.html',
-                   method: 'handleZxxk',
-                   jxbid: course_entity.id,
-                   xxlx: xxlx,
-                   xklc: lcid
+    method: 'handleZxxk',
+    jxbid: course_entity.id,
+    xxlx: xxlx,
+    xklc: lcid
   JSON::parse msg.body
 end
 
@@ -164,7 +164,7 @@ def process_ids(str_ids)
 end
 
 def try_to_select_courses(client, courses, xxlx, lcid)
-  global_puts '', '输入要选的课程ID（重复无效，支持语法糖：x-y，会尝试选择ID从x到y的所有课程）， 以空格分割：'
+  global_puts '输入要选的课程ID（重复无效，支持语法糖：x-y，会尝试选择ID从x到y的所有课程）， 以空格分割：'
   ids = process_ids(global_gets.split(' '))
   global_puts '输入最大重试间隔时间，要求不得低于3秒：'
   max_interval = global_gets.to_i
@@ -224,7 +224,11 @@ def filter_text(raw)
 end
 
 def global_puts(*args)
-  $stdout.puts *args
+  fileout=File.open($logfile,'a') if $logfile
+  [fileout,$stdout].compact.each do |stream|
+    stream.puts '',Time.now,*args
+  end
+  fileout.close rescue nil
 end
 
 def global_gets(*args)
@@ -241,12 +245,12 @@ CLIENT = HTTPClient.new
 
 begin
   opts = Slop.parse do |o|
-    o.banner="为缓解选课服务器压力，请酌情选择较大的“最大重试间隔”，此外，在任何需要输入的地方输入“q”或“quit”可以结束本程序。\n
-用法：命令行输入arb-xmu-course[空格][选项]，选项在以下列出。   -Powered By AryBin"
+    o.banner="为缓解选课服务器压力，请酌情选择较大的“最大重试间隔”，此外，在任何需要输入的地方输入“q”或“quit”可以结束本程序。       -Powered By AryBin"
 
     o.bool *%w{-h --help}, '显示帮助'
     o.bool *%w{-c --clear}, '清除本地账户信息'
     o.bool *%w{-r --reset}, '重置账户信息'
+    o.string *%w{-l --log},'记录到指定的日志文件'
 
     #院选课程 xxlx=4
     o.bool *%w{-s --school}, '院选选课模式'
@@ -271,29 +275,29 @@ end
 
 #error
 exit unless opts
+$logfile = opts[:log]
 
 case true
-  when opts.version?
-    global_puts Arb::Xmu::Course::VERSION
-  when opts.help?
-    global_puts(opts)
-  when opts.clear?
-    File.delete(TOKEN_FILE_NAME)
-    exit
-  when opts.reset?
-    set_up_account
-  when opts.school?
-    select_school_elective(CLIENT)
-  when opts.general?
-    select_general_elective(CLIENT)
-  when opts.public?
-    select_public(CLIENT)
-  when opts.General?
-    select_general_required(CLIENT)
-  when opts.School?
-    select_school_required(CLIENT)
-  when opts.across?
-    select_across(CLIENT)
-  else
-    puts opts
+when opts.clear?
+  File.delete(TOKEN_FILE_NAME)
+when opts.reset?
+  set_up_account
+when opts.school?
+  select_school_elective(CLIENT)
+when opts.general?
+  select_general_elective(CLIENT)
+when opts.public?
+  select_public(CLIENT)
+when opts.General?
+  select_general_required(CLIENT)
+when opts.School?
+  select_school_required(CLIENT)
+when opts.across?
+  select_across(CLIENT)
+when opts.version?
+  puts Arb::Xmu::Course::VERSION
+when opts.help?
+  puts(opts)
+else
+  puts opts
 end

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

@@ -1,7 +1,7 @@
 module Arb
   module Xmu
     module Course
-      VERSION = '2.3.0'
+      VERSION = '2.4.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arb-xmu-course
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - arybin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler