actir 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b904ce416932f09ab858ed1c1dc89cea7db0f81
-  data.tar.gz: 5e0b1d3d0a0aa65b8c26addaaa58092f682202f6
+  metadata.gz: 27433c3533caed0417a12e065175d9c3724fa333
+  data.tar.gz: b5fc2249a62dbd097ff732cc631840d6aa9098f7
 SHA512:
-  metadata.gz: 15f5ffdb6691788e9bda1ae1b77d2f5e3096d529d75be2579b26b9b2d9668089a82074299f79a23a4c07f2a014b55bd7ba327366c571742d2dfae7c0799854d3
-  data.tar.gz: 9547b0964f9b4b85608c1bf0bf8f04e60616dcfe2237742a9ea02459c05403baff8f4fb323ce59787c22097ab8a5efbf0e50971718651a5990054b7c8cbf83e6
+  metadata.gz: 2fd1547beb07768fdc19c1b3c30c302832a04c22e18ddee211e58b2583ce913637819dc339058fddad1f0a0394444bb6424051596f8284bfbbbcabe22bcafe8b
+  data.tar.gz: 3adf250ea0091676d483f3864eb4e0c879d3dc594b88aba4fd3811503862d97d137a4603ed215bec1134bf2cd006c7898cd89415f03d60f9c37ab2650175bd78

data/lib/actir/config.rb

@@ -14,7 +14,7 @@ module Actir
     
     class << self
 
-      attr_accessor :config_dir
+      attr_accessor :default_config_dir
       
       #
       # 从yaml文件中读取youzan的cookies
@@ -23,10 +23,10 @@ module Actir
       #
       # @return [Hash] youzan的cookies的hash
       #
-      def youzan_cookies(youzan_user)
-        cfg_str = "cookies." + youzan_user
-        get(cfg_str)
-      end
+      # def youzan_cookies(youzan_user)
+      #   cfg_str = "cookies." + youzan_user
+      #   get(cfg_str)
+      # end
       
       #
       # 从yaml文件中读取出所有内容
@@ -53,7 +53,7 @@ module Actir
       #
       # @return [Hash] 对应配置项的hash
       #
-      def get(key)
+      def get(key, config_path = nil)
         #按照点分割字符串
         key_array = key.split(".")  
         #先取出数组中的第一个元素当做配置文件名称，并从数组中移除此元素
@@ -62,8 +62,8 @@ module Actir
         cfg_name = key_array.shift 
         hash = {}
         #加载yaml配置文件，加锁
-        lock(file_name) do 
-          hash = cfg_name ? load_file(file(file_name))[cfg_name] : load_file(file(file_name))
+        lock(file_name, config_path) do
+          hash = cfg_name ? load_file(file(file_name, config_path))[cfg_name] : load_file(file(file_name, config_path))
         end
         #遍历key数组
         until key_array.empty? do
@@ -84,16 +84,16 @@ module Actir
       #              
       #        value : [String] 要修改的值的字符串     
       #
-      def set(key, value)
+      def set(key, value, config_path = nil)
         #按照点分割字符串
         key_array = key.split(".")  
         #先取出数组中的第一个元素当做配置文件名称，并从数组中移除此元素
         file_name = key_array.shift
         cfg_str = key_array.shift
         old_value = ""
-        lock(file_name) do 
+        lock(file_name, config_path) do
           #先读出所有的内容
-          str_array = IO.readlines(file(file_name))
+          str_array = IO.readlines(file(file_name, config_path))
           str_array.each_with_index do |line, index|
             if ( cfg_str != "" && line =~ /(\s*#{cfg_str}\:\s*)(.*)/ )
               cfg_key = $1
@@ -109,7 +109,7 @@ module Actir
               end
             end
           end
-          config_file = File.open(file(file_name), "w")
+          config_file = File.open(file(file_name, config_path), "w")
           str_array.each do |line|
             config_file.puts line
           end
@@ -129,16 +129,16 @@ module Actir
       #
       #                     不同则返回false
       #
-      def is_same_day?(file_name)
+      def is_same_day?(file_name, config_path = nil)
         now_date = Time.new.strftime("%m-%d")
-        modify_date = get_modify_time(file_name)
+        modify_date = get_modify_time(file_name, config_path)
         now_date == modify_date
       end
 
       #获取配置文件的修改时间(只精确到日期，不考虑具体时间)
       #返回String,格式为：04-27... 12-29
-      def get_modify_time(file_name)
-        sh_str = "ls -l " + file(file_name) + " | awk '{print $6 \"-\" $7}'"
+      def get_modify_time(file_name, config_path = nil)
+        sh_str = "ls -l " + file(file_name, config_path) + " | awk '{print $6 \"-\" $7}'"
         stat_str = `#{sh_str}`  
         #从中取出月份和日期
         stat_str =~ /(\d+).*\-(\d+)/
@@ -155,8 +155,8 @@ module Actir
       end
       
       # 多进程操作文件时加锁
-      def lock(file_name)
-        File.open(file(file_name), 'r') do |f|
+      def lock(file_name, config_path = nil)
+        File.open(file(file_name, config_path), 'r') do |f|
           begin
             f.flock File::LOCK_EX
             yield
@@ -167,13 +167,14 @@ module Actir
       end
 
       #配置文件路径
-      def file(file_name)
+      def file(file_name, config_path = nil)
+        config_dir = (config_path == nil) ? default_config_dir : config_path
         File.expand_path(File.join(config_dir, "/#{file_name}.yaml"), __FILE__)
       end
       
       #默认配置文件夹路径
-      def config_dir
-        @config_dir ||= File.join($project_path, "config")
+      def default_config_dir
+        @default_config_dir ||= File.join($project_path, "config")
       end
       
       private

data/lib/actir/parallel_tests/cli.rb

@@ -60,7 +60,7 @@ module Actir
 
           #更新百度支付-百付宝的cookies
           #-u为强制更新，若没有加强制更新命令，则每天自动更新一次
-          if options[:update] || !(Actir::Config.is_same_day?("cookies"))
+          if options[:update] || !(Actir::Config.is_same_day?("cookies", Actir::CookiesBaidu.cookies_path))
             begin
               Actir::CookiesBaidu.update_all
             rescue Exception => e

data/lib/actir/script/cookies/cookies.yaml

@@ -0,0 +1,12 @@
+card1:
+  BAIDUID:      "CA5C0BFFF8A6BCB719914F355E613A1E%3AFG%3D1"
+  BDUSS:        "EFtRFVRZ3FQblIySk1xeTlvSTVRS3JPTEdyQ35iUXFxdGt1bFNmTXgzU3hZUE5XQUFBQUFBJCQAAAAAAAAAAAEAAAD-BrRddGVzdHdsMjAxNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALHTy1ax08tWV"
+card2:
+  BAIDUID:
+  BDUSS:
+card3:
+  BAIDUID:
+  BDUSS:
+card4:
+  BAIDUID:
+  BDUSS:

data/lib/actir/script/cookies_baidu.rb

@@ -7,7 +7,17 @@ module Actir
 
       # 更新百度账号所有的配置文件
       def update_all(address = [])
-        baidu_card = Actir::Config.get("cookies.baidu")
+        baidu_card = Actir::Config.get(baifubao_key)
+        # 确认目前可用的卡的数目和cookies文件上的是否匹配
+        # TODO 先不实现,cookies文件上的cards数量过多目前看不影响
+        # baidu_card_cookies = Actir::Config.get("cookies", cookies_path)
+        # if baidu_card_cookies != nill && baidu_card != nil
+        #   if baidu_card_cookies.size > baidu_card.size
+        #
+        #   end
+        # else
+        #   raise "no baifubao cards"
+        # end
         baidu_card.each do |card, value|
           update_cookies(card, address)
         end
@@ -16,16 +26,16 @@ module Actir
       #将所有百度支付卡的available状态恢复为true
       def re_available
         #每次登陆都判断一下cookies文件的上一次修改时间和当前时间
-        #如果日期不同，则刷新所有的cookies文件中baidu-card的状态
-        unless Actir::Config.is_same_day?("cookies")
-          Actir::Config.lock("cookies") do
-            str_array = IO.readlines(cookies_file)
+        #如果日期不同，则刷新所有的pay文件中baidu-card的状态
+        unless Actir::Config.is_same_day?("cookies", cookies_path)
+          Actir::Config.lock("pay") do
+            str_array = IO.readlines(baifubao_account_file)
             str_array.each_with_index do |line, index|
               if line =~ /available\:\s*false/  
                 str_array[index] = line.gsub(/false/, 'true')
               end
             end
-            cookiesfile = File.open(cookies_file, 'w')
+            cookiesfile = File.open(baifubao_account_file, 'w')
             str_array.each do |line|
               cookiesfile.puts line
             end
@@ -40,10 +50,14 @@ module Actir
         # old_config = Actir::Config.config_dir
         # Actir::Config.config_dir = script_config_path
         #通过配置文件判断取出可用的卡的参数
-        baidu_card = Actir::Config.get("cookies.baidu")
+        baidu_card = Actir::Config.get(baifubao_key)
         card = {}
         baidu_card.each do |key, value|
           if value["available"] == true
+            # 顺便取一下cookies
+            baidu_card_cookies = Actir::Config.get("cookies." + key, cookies_path)
+            value["BAIDUID"] = baidu_card_cookies["BAIDUID"]
+            value["BDUSS"] = baidu_card_cookies["BDUSS"]
             #有可用的卡，取出cookies等参数
             card.store(key, value)
             break
@@ -56,7 +70,7 @@ module Actir
       # 设置不可用的卡
       # 入参传入卡的key
       def set_useless_card(card)
-        Actir::Config.set("cookies.baidu." + card + "." + "available", "false")
+        Actir::Config.set(baifubao_key + "." + card + "." + "available", "false")
       end
 
       # 更新baidu_cookies失败后的清理操作。目前需要手动调用，后续优化
@@ -66,14 +80,12 @@ module Actir
         end
       end
 
-      private
-
       # 更新配置文件中的baidu_cookies
       def update_cookies(card, address = [])
         #打开百付宝
         open_baifubao(address)
         #获取对应卡的账号密码
-        args = Actir::Config.get("cookies.baidu." + card)
+        args = Actir::Config.get(baifubao_key + "." + card)
         #登录百付宝
         login_baifubao(args["username"], args["password"])
         #获取cookies
@@ -109,7 +121,7 @@ module Actir
 
       # 获取cookies
       def get_baifubao_cookies
-        sleep 5
+        sleep 3
         id =  @browser.cookies[:BAIDUID][:value]
         ss =  @browser.cookies[:BDUSS][:value]
         @browser.close
@@ -120,20 +132,31 @@ module Actir
 
       def modify_cookies(card, cookies)
         cookies.each do |key, value|
-          Actir::Config.set("cookies.baidu."+card+"."+key.to_s , "\""+value.to_s+"\"")
+          Actir::Config.set("cookies" + "." + card + "." + key.to_s , "\"" + value.to_s + "\"", cookies_path)
         end
       end
 
-      # 配置文件所在文件夹的路径
-      def script_config_path
-        File.join(File.dirname(__FILE__), "config")
+      # 配置文件的上一级路径
+      def cookies_path
+        File.join(File.dirname(__FILE__), "cookies")
       end
 
       # 配置文件相对路径
       def cookies_file
-        File.join(Actir::Config.config_dir, "/cookies.yaml")
+        File.join(File.dirname(__FILE__), "cookies", "/cookies.yaml")
       end
 
+      # 百度账号配置文件
+      def baifubao_account_file
+        File.join(Actir::Config.default_config_dir, "/pay.yaml")
+      end
+
+      def baifubao_key
+        "pay.baifubao"
+      end
+
+      private
+
       def text_baifubao_username
         @browser.text_field(:id => 'TANGRAM__PSP_4__userName')
       end
@@ -156,5 +179,3 @@ module Actir
 
 end
 
-#Actir::CookiesBaidu.re_available
-

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/lib/actir/webdriver/browser.rb

@@ -75,6 +75,7 @@ class Browser
       if hasLoaded == 1
         break
       end
+      sleep(0.05)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -143,6 +143,7 @@ files:
 - lib/actir/parallel_tests/test/result.rb
 - lib/actir/parallel_tests/test/runner.rb
 - lib/actir/remote.rb
+- lib/actir/script/cookies/cookies.yaml
 - lib/actir/script/cookies_baidu.rb
 - lib/actir/version.rb
 - lib/actir/webdriver/browser.rb