actir 1.4.1 → 1.4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69363dbceeb2bc9e367b6608093693bc2989b6b8
-  data.tar.gz: 35c30e7d8621858453b9e0e6a0788b5fb48ce96b
+  metadata.gz: ae54b7de1a72de6f6257261eec1cf8506636fa5c
+  data.tar.gz: 97e0942beca3d46c156ab9d374b5385bfc0ee728
 SHA512:
-  metadata.gz: 75f39e38ffc1c86bf980810d0efabd19bff50f20a9a989e3d0f2c3bf870717eecbc146fef105979e49b544e80a6fef12e54c62ef12d4bdbd9b4e486985382ced
-  data.tar.gz: 80170ddaa345fb3beb0fec988020b8eca12f0af073a2e6e198e8de87d140877a53b47c118bd3222dac92ef413ef42393ac1f5a91ea26d37910fc7de849716cea
+  metadata.gz: 98811afbebabb6778a644cc436b25d67b5423945b165844623dab8c86779fd3b91f7910078768197d8a3bc1e57152608fb02f6711751be77d33c765f362b05a4
+  data.tar.gz: 3936f3bff3d132c170c7d41b1730442a5fafaea196db640ea0937eaa23f130d51bb8afa2ea0b47cd8b42f5962bbe55bb5b261433fc41e33f93c92f9fcf435432

data/lib/actir/parallel_tests/cli.rb

@@ -35,16 +35,16 @@ module Actir
         test_results = nil
         
         #修改全局变量$env至对应的预发布环境的名字
-        if options[:pre_name] 
-          # 不等于当前的预发环境
-          if options[:pre_name] != $env
-            $env = options[:pre_name]
-          end
-        else
-          if options[:pre_name] != $env
-            $env = "online"
-          end
-        end
+        # if options[:pre_name]
+        #   # 不等于当前的预发环境
+        #   if options[:pre_name] != $env
+        #     $env = options[:pre_name]
+        #   end
+        # else
+        #   if options[:pre_name] != $env
+        #     $env = "online"
+        #   end
+        # end
 
         report_time_taken do
           groups = @runner.tests_in_groups(options[:files], num_processes, options)
@@ -180,65 +180,65 @@ module Actir
         OptionParser.new do |opts|
           opts.banner = <<-BANNER.gsub(/^          /, '')
             Run all tests in parallel
-            Usage: ruby [switches] [--] [files & folders]
+            Usage: actir [switches] [--] [files & folders] [-] [testcase_name]
             Options are:
           BANNER
-          # opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: 1") { |n| options[:count] = n }
           opts.on("-n [TESTCASE]", String, "Run this testcase") { |casename| options[:testcase] = casename }
-          opts.on("--group-by [TYPE]", <<-TEXT.gsub(/^          /, '')
-          group tests by:
-                      found - order of finding files
-                      filesize - by size of the file
-                      default - filesize
-            TEXT
-            ) { |type| options[:group_by] = type.to_sym }
+          opts.on("-p [PROCESSES]", Integer, "How many processes to use, default: 1") { |p| options[:count] = p }
+          # opts.on("--group-by [TYPE]", <<-TEXT.gsub(/^          /, '')
+          # group tests by:
+          #             found - order of finding files
+          #             filesize - by size of the file
+          #             default - filesize
+          #   TEXT
+          #   ) { |type| options[:group_by] = type.to_sym }
           opts.on("-r [TIMES]", "--rerun [TIMES]", Integer, "rerun times for failure&error testcase, default: 0") { |n| options[:rerun] = n }
           #opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run") { |multiply| options[:multiply] = multiply }
-          opts.on("-i", "--isolate",
-            "Do not run any other tests in the group used by --single(-s)") do |pattern|
-            options[:isolate] = true
-          end
+          # opts.on("-i", "--isolate",
+          #   "Do not run any other tests in the group used by --single(-s)") do |pattern|
+          #   options[:isolate] = true
+          # end
           opts.on("-e", "--exec [COMMAND]", "execute this code parallel") { |path| options[:execute] = path }
-          opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
-          opts.on("--combine-stderr", "Combine stderr into stdout, useful in conjunction with --serialize-stdout") { options[:combine_stderr] = true }
-          opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
-          opts.on("--nice", "execute test commands with low priority") { options[:nice] = true }
+          # opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
+          # opts.on("--combine-stderr", "Combine stderr into stdout, useful in conjunction with --serialize-stdout") { options[:combine_stderr] = true }
+          # opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
+          # opts.on("--nice", "execute test commands with low priority") { options[:nice] = true }
           opts.on("--verbose", "Print more output") { options[:verbose] = true }
           opts.on("--log", "record exec result to logfile") { options[:log] = true}
           opts.on("--report", "make a report to show the test result") { options[:report] = true}
-          opts.on("--remote", "run testcase in remote environment") { options[:mode] = :remote }
-          opts.on("--local", "run testcase in local environment") { options[:mode] = :local }
-          # 填写预发环境，目前只支持bjpre2-4，别的后续再添加
-          opts.on("-p", "--pre [PRE]", <<-TEXT.gsub(/^          /, '')
-          set pre environment to run testcase:
-                      bjpre2
-                      bjpre3
-                      bjpre4
-            TEXT
-            ) { |pre| pre = "online" if ( pre != "bjpre2" && pre != "bjpre3" && pre != "bjpre4"); options[:pre_name] = pre }
+          # opts.on("--remote", "run testcase in remote environment") { options[:mode] = :remote }
+          # opts.on("--local", "run testcase in local environment") { options[:mode] = :local }
+          # # 填写预发环境，目前只支持bjpre2-4，别的后续再添加
+          # opts.on("-p", "--pre [PRE]", <<-TEXT.gsub(/^          /, '')
+          # set pre environment to run testcase:
+          #             bjpre2
+          #             bjpre3
+          #             bjpre4
+          #   TEXT
+          #   ) { |pre| pre = "online" if ( pre != "bjpre2" && pre != "bjpre3" && pre != "bjpre4"); options[:pre_name] = pre }
           #add by Hub
           #-u commnd, update baifubao's cookies
           opts.on("-u", "--update", "Update Baifubao's cookies") { options[:update] = true }
           #add by Hub 
           #-s commnd, show test mode,and remote env ipaddress
-          opts.on("-s", "--show [PATH]", "Show Test Mode") do |path|
-            abort "Please input project directory path!" if path == nil
-            $project_path = File.join(Dir.pwd, path)
-            puts division_str
-            if Actir::Config.get("config.test_mode.env") == :local
-              puts "mode : Local"
-            else
-              puts "mode : Remote"
-              node_name = Actir::Config.get("config.test_mode.docker.name")
-              address = Actir::Remote.get_remote_address
-              puts "node_num : " + address.size.to_s
-              address.each_with_index do |address, i|
-                puts $env + node_name + (i+1).to_s + " : " + address
-              end
-            end
-            puts division_str
-            exit
-          end
+          # opts.on("-s", "--show [PATH]", "Show Test Mode") do |path|
+          #   abort "Please input project directory path!" if path == nil
+          #   $project_path = File.join(Dir.pwd, path)
+          #   puts division_str
+          #   if Actir::Config.get("config.test_mode.env") == :local
+          #     puts "mode : Local"
+          #   else
+          #     puts "mode : Remote"
+          #     node_name = Actir::Config.get("config.test_mode.docker.name")
+          #     address = Actir::Remote.get_remote_address
+          #     puts "node_num : " + address.size.to_s
+          #     address.each_with_index do |address, i|
+          #       puts $env + node_name + (i+1).to_s + " : " + address
+          #     end
+          #   end
+          #   puts division_str
+          #   exit
+          # end
           opts.on("-h", "--help", "Show this.") { puts opts; exit }
         end.parse!(argv)
 

data/lib/actir/script/cookies_file.rb

@@ -0,0 +1,25 @@
+module Actir
+  class CookiesFile
+    class << self
+
+      # 获取cookies文件的路径
+      # 因为涉及到权限问题,路径需要放在个人账号目录下
+      # 通过whoami命令获取当前账户名称
+      # 暂时存放在/User/xx/目录下
+      def path
+        user_name = `whoami`
+        return "/Users/" + user_name + "/"
+      end
+
+      def name
+        return "cookies.yaml"
+      end
+
+      def exists?
+        File::exists?(path + name)
+      end
+
+    end
+
+  end
+end

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.4.1"
+  VERSION = "1.4.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.1.1
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -145,6 +145,7 @@ files:
 - lib/actir/remote.rb
 - lib/actir/script/cookies/cookies.yaml
 - lib/actir/script/cookies_baidu.rb
+- lib/actir/script/cookies_file.rb
 - lib/actir/version.rb
 - lib/actir/webdriver/browser.rb
 - lib/actir/webdriver/browser_options.rb