tes-request 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef4285a8107b16ad50d37d0d4ed27e4deb96be99ff6a20ed24e742ea3533183
-  data.tar.gz: b4e0fdc1dcafed9548b9027a53228ef31db168bb554c3aacdfadbef3e68b664a
+  metadata.gz: 9d21fe3a21348ae9f66ebb0df7ed5c2abb0ee2fd4557fb1d94d466dccdcacd01
+  data.tar.gz: f62fc78836dfcff2a9c396d8b0ff01b6faffd4db30b336539b6fb6235b7fa625
 SHA512:
-  metadata.gz: 5d00ae75a43d6effbf933b9ff4229f1184bac0706dc4c13d459d25da1b9b332524f9c98da609e8a8cca32738aa279da36abcb09d5ae577644394761f083913e4
-  data.tar.gz: 2301ac3ba6c6cda67b7dd23ea539e0743fcfa45da5edcf73cc5c45598b35ecdaa160775b561a55167fad875ba8faf7245c2c70732f49cac2f58208b0dfdbab49
+  metadata.gz: 3cfd26da444df310cc3c944a8532506e994feab473b4af862ce22b35661afdb1f7c770363bb2100fc03e5443354c76298579a49d288120d8ce3d572bc381d475
+  data.tar.gz: 0195a973dcb123132510993c85a48b6dbff6d8528d60c661337e216ba29810188edc882fee80544d259b07f7d72c88cf3710f97c185aa194fd9b4214dda1f142

data/lib/tes/request/rspec/distribute.rb

@@ -16,7 +16,7 @@ module Tes
 
         # @param [String] project_dir 测试项目的根目录路径
         # @param [String] ci_yaml_file 测试项目内的描述spec测试的配置文件路径(相对`project_dir`)
-        def initialize(project_dir, ci_yaml_file=@@ci_yaml_file)
+        def initialize(project_dir, ci_yaml_file = @@ci_yaml_file)
           @project_dir = project_dir
           @ci_cfg = YAML.load_file(File.join(@project_dir, ci_yaml_file))
         end
@@ -29,7 +29,7 @@ module Tes
         # @param [Hash] res_addition_attr_map 资源属性需要调整的映射表
         # @param [Hash,nil] adapt_pool
         # @return [Array<Hash>]
-        def distribute_jobs(type, count, res_addition_attr_map={}, adapt_pool = {})
+        def distribute_jobs(type, count, res_addition_attr_map = {}, adapt_pool = {})
           task_cfg = get_rspec_task(type)
           spec_paths = spec_files(type)
           rspec_parser = Tes::Request::RSpec::ProfileParser.new(spec_paths)
@@ -83,16 +83,16 @@ module Tes
         end
 
         private
+
         # 生产任务碎片,尽量接近传递的参数值
         # @param [Fixnum] minimum_pieces
         # @return [Array]
         def gen_pieces(profiles, minimum_pieces)
           common_jobs = []
           standalone_jobs = []
-
           min_spec_count = profiles.size / minimum_pieces
 
-          profiles.each do |to_merge_spec|
+          profiles.sort_by {rand}.each do |to_merge_spec|
             # 0. 任务发布要求的特殊处理
             if to_merge_spec[:distribute] && to_merge_spec[:distribute][:standalone]
               standalone_jobs << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
@@ -100,31 +100,31 @@ module Tes
             end
 
             # 1. 优先相同要求的归并
-            join_piece = common_jobs.find do |piece|
+            join_piece = common_jobs.select do |piece|
               piece[:specs].size <= min_spec_count and
                   piece[:profile] == to_merge_spec[:profile]
-            end
+            end.sample
             if join_piece
               join_piece[:specs] << to_merge_spec
             else
               # 2. 然后再是资源多少不同的归并
-              super_piece = common_jobs.find do |piece|
+              super_piece = common_jobs.select do |piece|
                 if piece[:specs].size <= min_spec_count
                   cr = piece[:profile] <=> to_merge_spec[:profile]
                   cr && cr >= 0
                 else
                   false
                 end
-              end
+              end.sample
               if super_piece
                 super_piece[:specs] << to_merge_spec
               else
                 # 3. 可整合计算的的归并,但要求已经达到的任务分片数已经达到了要求那么大,否则直接以新建来搞
                 if common_jobs.size >= minimum_pieces
-                  merge_piece = common_jobs.find do |piece|
+                  merge_piece = common_jobs.select do |piece|
                     piece[:specs].size <= min_spec_count and
                         piece[:profile].merge_able?(to_merge_spec[:profile])
-                  end
+                  end.sample
                   if merge_piece
                     merge_piece[:profile] = merge_piece[:profile] + to_merge_spec[:profile]
                     merge_piece[:specs] << to_merge_spec
@@ -164,7 +164,7 @@ module Tes
         end
 
         # @return [Array<String>]
-        def filter_spec_by_path(pattern, exclude_pattern=nil)
+        def filter_spec_by_path(pattern, exclude_pattern = nil)
           pattern_filter_lab = ->(p) do
             spec_info = get_spec_path_info(p)
             direct_return = (spec_info[:locations] or spec_info[:ids])
@@ -172,24 +172,24 @@ module Tes
           end
 
           ret = case pattern
-                  when String
-                    pattern_filter_lab.call(pattern)
-                    Dir[File.join(@project_dir, pattern)]
-                  when Array
-                    pattern.inject([]) {|t, ep| t + pattern_filter_lab.call(ep)}
-                  else
-                    raise('Error pattern type')
+                when String
+                  pattern_filter_lab.call(pattern)
+                  Dir[File.join(@project_dir, pattern)]
+                when Array
+                  pattern.inject([]) {|t, ep| t + pattern_filter_lab.call(ep)}
+                else
+                  raise('Error pattern type')
                 end
 
           return ret unless exclude_pattern
 
           case exclude_pattern
-            when String
-              ret -= Dir[File.join(@project_dir, exclude_pattern)]
-            when Array
-              ret -= exclude_pattern.inject([]) {|t, ep| t + Dir[File.join(@project_dir, ep)]}
-            else
-              raise('Error exclude_pattern type')
+          when String
+            ret -= Dir[File.join(@project_dir, exclude_pattern)]
+          when Array
+            ret -= exclude_pattern.inject([]) {|t, ep| t + Dir[File.join(@project_dir, ep)]}
+          else
+            raise('Error exclude_pattern type')
           end
 
           ret
@@ -203,7 +203,7 @@ module Tes
         #   或者
         #     type=res_type,res_attr1=2,res_attr3>=4
         # @return [Array<String>] 按照`res_exclude_pattern` 剔除后的 `spec_paths`
-        def exclude_spec_by_resource(spec_paths, res_exclude_patterns=[])
+        def exclude_spec_by_resource(spec_paths, res_exclude_patterns = [])
           return spec_paths if res_exclude_patterns.empty?
 
           spec_paths.reject do |spec_path|

data/lib/tes/request/version.rb

@@ -1,5 +1,5 @@
 module Tes
   module Request
-    VERSION = '0.11'
+    VERSION = '0.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tes-request
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - wuhuizuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties