tes-request 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0275c362a3e421084ffed8f81836519569ca20
-  data.tar.gz: 4c0361fb7ce849ee3bab2980e0530fd50ea1025e
+  metadata.gz: e774934b2a6f8f2ab03e09decaa0dd67c673593d
+  data.tar.gz: 3962eafc89f185fa6934dcf17aa9d3c38ea8ce01
 SHA512:
-  metadata.gz: ae5cce1cfdac34fa69937fdc6b7e4af2580593173b83e34bc92b7ca05b85e223824d7368e52d5508440c9a959c9cba0193a5e3cbb0ffe8c715602dc20360bd39
-  data.tar.gz: 156bc1b8568c7c7bd76ba4daee49256142309b17da9104e181a527337f61477cc8d9713d46d5190e880c534523ce081b6be42e9d9a2caf1bef00d2447cfdd0ce
+  metadata.gz: de707683b0a3ec460a29c8760ae0c8dbfbf3bb0c08e6a9f2cfdde62382f1c7889aae31bcf2a36471c48d701e9b351f4828844962b34d47d6e60562d432b2a082
+  data.tar.gz: 780778bc28e7573fa19534b9b4354dc3b2254275d9fcc90ce376e99080e74cd7013d969b9d4ed118f2d76772c69c85cae7d3f5090f133dcb1d2e6750fc01c58a

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

@@ -71,18 +71,20 @@ module Tes
         # @param [Fixnum] minimum_pieces
         # @return [Array]
         def gen_pieces(profiles, minimum_pieces)
-          ret = []
+          common_jobs = []
+          standalone_jobs = []
+
           min_spec_count = profiles.size / minimum_pieces
 
           profiles.each do |to_merge_spec|
             # 0. 任务发布要求的特殊处理
             if to_merge_spec[:distribute] && to_merge_spec[:distribute][:standalone]
-              ret << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
+              standalone_jobs << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
               next
             end
 
             # 1. 优先相同要求的归并
-            join_piece = ret.find do |piece|
+            join_piece = common_jobs.find do |piece|
               piece[:specs].size <= min_spec_count and
                   piece[:profile] == to_merge_spec[:profile]
             end
@@ -91,7 +93,7 @@ module Tes
               join_piece[:specs] << to_merge_spec
             else
               # 2. 然后再是资源多少不同的归并
-              super_piece = ret.find do |piece|
+              super_piece = common_jobs.find do |piece|
                 if piece[:specs].size <= min_spec_count
                   cr = piece[:profile] <=> to_merge_spec[:profile]
                   cr && cr >= 0
@@ -104,8 +106,8 @@ module Tes
                 super_piece[:specs] << to_merge_spec
               else
                 # 3. 可整合计算的的归并,但要求已经达到的任务分片数已经达到了要求那么大,否则直接以新建来搞
-                if ret.size >= minimum_pieces
-                  merge_piece = ret.find do |piece|
+                if common_jobs.size >= minimum_pieces
+                  merge_piece = common_jobs.find do |piece|
                     piece[:specs].size <= min_spec_count and
                         piece[:profile].merge_able?(to_merge_spec[:profile])
                   end
@@ -117,15 +119,15 @@ module Tes
                   else
                     # 4. 最后再尝试独立出一个新的piece,在剩余数量达到一半要求的时候
                     # puts 'http://new'
-                    ret << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
+                    common_jobs << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
                   end
                 else
-                  ret << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
+                  common_jobs << {profile: to_merge_spec[:profile], specs: [to_merge_spec]}
                 end
               end
             end
           end
-          ret
+          standalone_jobs + common_jobs
         end
 
 

data/lib/tes/request/version.rb

@@ -1,5 +1,5 @@
 module Tes
   module Request
-    VERSION = '0.4'
+    VERSION = '0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tes-request
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - wuhuizuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties