tes-request 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e774934b2a6f8f2ab03e09decaa0dd67c673593d
-  data.tar.gz: 3962eafc89f185fa6934dcf17aa9d3c38ea8ce01
+  metadata.gz: ee579434188f04c4db17b2e3a6320309674553e1
+  data.tar.gz: 10cc0dc545f2940cd09f04a7c7f881f88e64cdc6
 SHA512:
-  metadata.gz: de707683b0a3ec460a29c8760ae0c8dbfbf3bb0c08e6a9f2cfdde62382f1c7889aae31bcf2a36471c48d701e9b351f4828844962b34d47d6e60562d432b2a082
-  data.tar.gz: 780778bc28e7573fa19534b9b4354dc3b2254275d9fcc90ce376e99080e74cd7013d969b9d4ed118f2d76772c69c85cae7d3f5090f133dcb1d2e6750fc01c58a
+  metadata.gz: a617bedb04228f37f07e8eec36a050eb4bf3cd0f6b84430cef820e824209719c9c42fb4265a4ce1688806ca5106d2931ebdb3e897e55bac1774dcf9d14d0a22f
+  data.tar.gz: f431578c1a9224b366d30a7d1dd9d7768f3e5cb7d3f0406f083826f64de7746f0a90a0f32438fed38691b2c96f47d41dd666dfe80aa153de8932cabef2941486

data/lib/tes/request/ask.rb

@@ -9,20 +9,21 @@ module Tes
       # @param [String] ask_str 单个资源的请求要求字符串
       def initialize(ask_str)
         snippets = ask_str.strip.sub(/^\*\d+:/, '').sub(/^&\d+\./, '').split(/\s*,\s*/)
-        expressions = snippets.map { |s| Expression.new(s) }
-        @data = expressions.inject({}) { |t, e| t.merge(e.data[:left_exp] => e) }
+        expressions = snippets.map {|s| Expression.new(s)}
+        @data = expressions.inject({}) {|t, e| t.merge(e.data[:left_exp] => e)}
         # @reference 是表达式列表
         @reference = []
         @greedy = false
+        @lock_type = :lock
       end
 
       attr_reader :data, :reference
-      attr_accessor :greedy
+      attr_accessor :greedy, :lock_type
 
       # 计算数据是否满足要求
       # @param [Object] data
       def match?(data)
-        @data.all? { |_n, exp| exp.match?(data) }
+        @data.all? {|_n, exp| exp.match?(data)}
       end
 
       def <=>(other)
@@ -45,10 +46,10 @@ module Tes
               elsif self.data < other.data
                 -1
               else
-                a_to_b_results = @data.map { |n, e| exp_compare_lab.call(e, other.data[n]) }
-                if a_to_b_results.all? { |ret| ret and ret <= 0 }
+                a_to_b_results = @data.map {|n, e| exp_compare_lab.call(e, other.data[n])}
+                if a_to_b_results.all? {|ret| ret and ret <= 0}
                   -1
-                elsif a_to_b_results.all? { |ret| ret and ret >= 0 }
+                elsif a_to_b_results.all? {|ret| ret and ret >= 0}
                   # 这时必须要求other的表达式全部能被self覆盖.
                   (other.data.keys - @data.keys).size > 0 ? nil : 1
                 else
@@ -65,6 +66,16 @@ module Tes
           else
             ret
         end
+        case [lock_type, other.lock_type]
+          when [:lock, :share]
+            return ret unless ret
+            ret >=0 ? 1 : nil
+          when [:share, :lock]
+            return ret unless ret
+            ret <=0 ? -1 : nil
+          else
+            ret
+        end
       end
 
       # 相对other要求多的和严格的
@@ -75,8 +86,9 @@ module Tes
           o_e && e <= o_e
         end
 
-        diff_ask = self.new('')
+        diff_ask = self.class.new('')
         diff_ask.data.merge!(diff_data)
+        diff_ask.lock_type = lock_type
         diff_ask
       end
 
@@ -95,13 +107,15 @@ module Tes
           self_gt_other = self.-(other)
           other_gt_self = other.-(self)
 
-          ask1 = self.new('')
-          ask2 = self.new('')
+          ask1 = self.class.new('')
+          ask2 = self.class.new('')
           ask1.data.merge!(self.data)
           ask1.data.merge!(other_gt_self)
           ask2.data.merge!(other.data)
           ask2.data.merge!(self_gt_other)
-          ask1 >= ask2 ? ask1 : ask2
+          ask = ask1 >= ask2 ? ask1 : ask2
+          ask.lock_type = (lock_type == other.lock_type ? lock_type : :lock)
+          ask
         end
       end
 

data/lib/tes/request/expression.rb

@@ -103,7 +103,7 @@ module Tes
               ret = @data[:expect_val] <=> other.data[:expect_val]
               ret == 0 ? -1 : ret
             when %w(<= =)
-              @data[:expect_val] <= other.data[:expect_val] ? 1 : nil
+              @data[:expect_val] > other.data[:expect_val] ? -1 : nil
             when %w(<= <)
               ret = other.data[:expect_val] <=> @data[:expect_val]
               ret == 0 ? -1 : ret

data/lib/tes/request/profile.rb

@@ -5,6 +5,7 @@ module Tes
     class Profile
       include Comparable
 
+      REG_LOCK_HEADER = /^(@|\$)\s*\|+\s*/
       REG_POINT_ASK = /^\*(\d+):/
       REG_REFER_ASK = /^&(\d+)\./
       REG_POINT_ASK_GREEDY = /^\[\*(\d+)\]:/
@@ -17,16 +18,21 @@ module Tes
 
         # 不因申明顺序不一致性等其他差异而误判环境要求的一致性
         point_asks = {}
-        profile_lines.each do |line|
+        profile_lines.each do |raw_line|
+          lock_type = (raw_line =~ REG_LOCK_HEADER and raw_line =~ /^\$/) ? :share : :lock
+          line = raw_line.sub(REG_LOCK_HEADER, '')
+
           case line
             when REG_POINT_ASK
               mt = line.match(REG_POINT_ASK)
               ask = Ask.new line.sub(REG_POINT_ASK, '')
+              ask.lock_type = lock_type
               point_asks[mt[1]] = ask
             when REG_POINT_ASK_GREEDY
               mt = line.match(REG_POINT_ASK_GREEDY)
               ask = Ask.new line.sub(REG_POINT_ASK_GREEDY, '')
               ask.greedy= true
+              ask.lock_type = lock_type
               point_asks[mt[1]] = ask
             when REG_REFER_ASK
               mt= line.match(REG_REFER_ASK)
@@ -39,7 +45,9 @@ module Tes
               ref_exp = Expression.new line.sub(REG_REFER_ASK_GREEDY, '')
               src_ask.reference << ref_exp
             else
-              @data << Ask.new(line)
+              ask = Ask.new(line)
+              ask.lock_type =lock_type
+              @data << ask
           end
         end
 
@@ -49,15 +57,15 @@ module Tes
       attr_reader :data
 
       def <=>(other)
-        all_self_hash = self.data.group_by { |e| e.to_s }
+        all_self_hash = self.data.group_by {|e| e.to_s}
         all_self_hash_keys = Set.new all_self_hash.keys
-        all_other_hash = other.data.group_by { |e| e.to_s }
+        all_other_hash = other.data.group_by {|e| e.to_s}
         all_other_hash_keys = Set.new all_other_hash.keys
 
         # 如果相等或者可比较则直接返回(只在相等的时候有效)
         return 0 if all_self_hash == all_other_hash
 
-        hash1 = Hash[all_self_hash_keys.to_a.map { |e| [e, true] }]
+        hash1 = Hash[all_self_hash_keys.to_a.map {|e| [e, true]}]
         all_other_hash_keys.to_a.each do |k|
           hash1.include?(k)
         end
@@ -99,7 +107,7 @@ module Tes
       # @param [Hash<String,Hash>] pool 所有空闲可用的资源池
       def request(pool)
         get_candidates_lab = ->(ask, answer_cache) do
-          pool.keys.select { |k| !answer_cache.include?(k) && ask.match?(pool[k]) }
+          pool.keys.select {|k| !answer_cache.include?(k) && ask.match?(pool[k])}
         end
 
         answers_flat = []
@@ -146,16 +154,17 @@ module Tes
         ret = []
         point = 0
         @data.each do |ask|
+          header = (ask.lock_type == :share ? '$|' : '@|')
           if ask.reference and ask.reference.size > 0
             point_ask = ask
             refer_asks = ask.reference
             point += 1
-            ret << ("*#{point}:" + point_ask.to_s)
+            ret << header + ("*#{point}:" + point_ask.to_s)
             refer_asks.each do |r_ask|
               ret << ("&#{point}." + r_ask.to_s)
             end
           else
-            ret << ask.to_s
+            ret << header + ask.to_s
           end
         end
         ret.join(split)
@@ -163,11 +172,15 @@ module Tes
 
       private
       def compare_when_keys_same(hash_self, hash_other)
-        size_compare_results = hash_self.keys.map { |k| hash_self[k].size <=> hash_other[k].size }
-        if size_compare_results.all? { |v| v && v <= 0 }
-          size_compare_results.any? { |v| v == -1 } ? -1 : 0
-        elsif size_compare_results.all? { |v| v && v >= 0 }
-          size_compare_results.any? { |v| v == 1 } ? 1 : 0
+        size_compare_results = hash_self.keys.map {|k| hash_self[k].size <=> hash_other[k].size}
+        lock_compare_result = hash_self.keys.map do |k|
+          hash_self[k].select {|a| a.lock_type == :lock}.size <=>
+              hash_other[k].select {|a| a.lock_type == :lock}.size
+        end
+        if size_compare_results.all? {|v| v && v <= 0} and lock_compare_result.all? {|v| v && v <= 0}
+          (size_compare_results.any? {|v| v == -1} or lock_compare_result.any? {|v| v == -1}) ? -1 : 0
+        elsif size_compare_results.all? {|v| v && v >= 0} and lock_compare_result.all? {|v| v && v >= 0}
+          (size_compare_results.any? {|v| v == 1} or lock_compare_result.any? {|v| v == 1}) ? 1 : 0
         else
           nil
         end
@@ -175,7 +188,7 @@ module Tes
 
       def compare_when_keys_subset(hash_self, hash_other)
         subset_keys = hash_self.keys
-        hash_other_subset = subset_keys.inject({}) { |t, k| t.merge(k => hash_other[k]) }
+        hash_other_subset = subset_keys.inject({}) {|t, k| t.merge(k => hash_other[k])}
         ret = compare_when_keys_same(hash_self, hash_other_subset)
         ret && (ret <= 0 ? -1 : nil)
       end
@@ -184,11 +197,11 @@ module Tes
       def merge_when_keys_diff!(hash_self, hash_other)
         merge_able_lab = ->(to, from) do
           from.keys.all? do |f_ask|
-            if to.any? { |k, _| f_ask <=> k }
+            if to.any? {|k, _| f_ask <=> k}
               true
             else
               if f_ask.data['type']
-                to.keys.none? { |e| e.data['type'] && e.data['type'] and e.data['type'] == f_ask.data['type'] }
+                to.keys.none? {|e| e.data['type'] && e.data['type'] and e.data['type'] == f_ask.data['type']}
               else
                 true
               end
@@ -198,30 +211,53 @@ module Tes
         merge_lab = ->(to, from) do
           # 现将内容全部拼起来,然后合并资源
           ret_hash = {}
-          to.each { |ask, ask_dup_list| ret_hash[ask] = ask_dup_list }
+          to.each do |ask, ask_dup_list|
+            lock_list = ask_dup_list.select {|a| a.lock_type == :lock}
+            share_list = ask_dup_list.select {|a| a.lock_type == :share}
+            ret_hash[ask] = lock_list + share_list
+          end
           from.each do |ask, ask_dup_list|
-            # 是否有相同要求的资源要求
+            ask_dup_lock_type_size = ask_dup_list.select {|a| a.lock_type == :lock}.size
+
+            # 是否有相同要求的资源要求,有则合并(包括锁定方式)
             if ret_hash[ask]
-              unless ret_hash[ask].size >= ask_dup_list
+              if ret_hash[ask].size < ask_dup_list
                 ret_hash[ask] += ask_dup_list[ret_hash[ask].size..-1]
               end
+
+              if ask_dup_lock_type_size > ret_hash[ask].select {|a| a.lock_type == :lock}.size
+                ret_hash[ask][0...ask_dup_lock_type_size].each {|a| a.lock_type = :lock}
+              end
             else
               # 没有
 
               # 是否总结果中有可合并的资源请求
-              merge_able_ask = ret_hash.keys.find { |a| a <=> ask }
+              merge_able_ask = ret_hash.keys.find {|a| a <=> ask}
               if merge_able_ask
                 if merge_able_ask >= ask
                   if ret_hash[merge_able_ask].size < ask_dup_list.size
                     ret_hash[merge_able_ask] += ask_dup_list[ret_hash[merge_able_ask].size..-1]
                   end
+                  if ask_dup_lock_type_size > ret_hash[merge_able_ask].select {|a| a.lock_type == :lock}.size
+                    ret_hash[merge_able_ask][0...ask_dup_lock_type_size].each {|a| a.lock_type = :lock}
+                  end
                 else
                   if ret_hash[merge_able_ask].size <= ask_dup_list.size
+                    merge_able_lock_size = ret_hash[merge_able_ask].select {|a| a.lock_type == :lock}.size
                     ret_hash.delete(merge_able_ask)
+                    if ask_dup_lock_type_size < merge_able_lock_size
+                      ask_dup_list[0...merge_able_lock_size].each {|a| a.lock_type = :lock}
+                    end
                     ret_hash[ask] = ask_dup_list
                   else
+                    merge_able_lock_size = ret_hash[merge_able_ask].select {|a| a.lock_type == :lock}.size
+                    sum_lock_size = [merge_able_lock_size, ask_dup_lock_type_size].max
                     ret_hash[ask] = ask_dup_list
                     ret_hash[merge_able_ask].pop(ask_dup_list.size)
+
+                    (0...(sum_lock_size - ret_hash[merge_able_ask].select {|a| a.lock_type == :lock}.size)).each do |i|
+                      ret_hash[ask][i].lock_type = :lock
+                    end
                   end
                 end
               else
@@ -243,10 +279,10 @@ module Tes
       end
 
       def merge(other)
-        all_self_hash = self.data.group_by { |e| e.to_s }
-        all_self_hash = Hash[all_self_hash.map { |k, v| [Ask.new(k), v] }]
-        all_other_hash = other.data.group_by { |e| e.to_s }
-        all_other_hash = Hash[all_other_hash.map { |k, v| [Ask.new(k), v] }]
+        all_self_hash = self.data.group_by {|e| e.to_s}
+        all_other_hash = other.data.group_by {|e| e.to_s}
+        all_self_hash = Hash[all_self_hash.map {|k, v| [Ask.new(k), v]}]
+        all_other_hash = Hash[all_other_hash.map {|k, v| [Ask.new(k), v]}]
         all_self_hash_keys = Set.new all_self_hash.keys
         all_other_hash_keys = Set.new all_other_hash.keys
 
@@ -274,7 +310,7 @@ module Tes
         new_instance = self.class.new([])
 
 
-        result.values.flatten.each { |v| new_instance.data.push v }
+        result.values.flatten.each {|v| new_instance.data.push v}
         new_instance
       end
     end

data/lib/tes/request/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tes-request
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - wuhuizuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties
@@ -105,7 +105,6 @@ files:
 - lib/tes/request/client.rb
 - lib/tes/request/expression.rb
 - lib/tes/request/profile.rb
-- lib/tes/request/rake_task.rb
 - lib/tes/request/rspec/ci_slicer.rb
 - lib/tes/request/rspec/distribute.rb
 - lib/tes/request/rspec/function.rb
@@ -133,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Request libs and bins for TES(Test Env Service)

data/lib/tes/request/rake_task.rb

@@ -1,90 +0,0 @@
-require 'rake'
-require 'rake/tasklib'
-require 'yaml'
-require 'java-properties'
-require_relative 'rspec/distribute'
-
-class Tes::Request::RakeTask < ::Rake::TaskLib
-  SUPPORT_FILE_TYPES = [:yaml, :yml, :json, :properties]
-
-  def initialize(name, type)
-    desc "Generate RSpec distribute jobs #{type} file for CI"
-    task name, [:project_dir, :type, :count, :version, :lang] do |_, task_args|
-      rspec_distribute = ::Tes::Request::RSpec::Distribute.new(task_args[:project_dir])
-      jobs = rspec_distribute.distribute_jobs(task_args[:type],
-                                              task_args[:count].to_i,
-                                              task_args[:version],
-                                              task_args[:lang])
-      target_dir = File.join(task_args[:project_dir], '.ci_jobs')
-      save_job_files(jobs, target_dir, type)
-    end
-  end
-
-  def spec_tag_param_str(tags)
-    case tags
-      when Array
-        tags.map { |t| "--tag #{t}" }.join(' ')
-      when String
-        "--tag #{tags}"
-      when nil
-        nil
-      else
-        raise("不支持的类型:#{tags.class}")
-    end
-  end
-
-  def save_job_files(jobs, target_dir, file_type)
-    unless SUPPORT_FILE_TYPES.include?(file_type)
-      raise(ArgumentError, "Not supported file type:#{file_type}!")
-    end
-
-    job_configs_for_ci = jobs.map { |j| gen_job_ci_params(j) }
-    FileUtils.rm_rf(target_dir)
-    FileUtils.mkdir(target_dir)
-    case file_type
-      when :json
-        save_file = File.join(target_dir, 'ci_tasks.json')
-        File.open(save_file, 'w') { |f| f.write job_configs_for_ci.to_json }
-        puts "Generated #{jobs.size} jobs, Stored in:#{save_file} ."
-      when :yml, :yaml
-        save_file = File.join(target_dir, 'ci_tasks.yml')
-        File.open(save_file, 'w') { |f| f.write job_configs_for_ci.to_yaml }
-        puts "Generated #{jobs.size} jobs, Stored in:#{save_file} ."
-      when :properties
-        job_configs_for_ci.each_with_index do |params, i|
-          file = File.join(target_dir, "#{i}.properties")
-          save_job_properties(params, file)
-        end
-        puts "Generated #{jobs.size} jobs, Stored in:#{target_dir}/*.properties ."
-    end
-  end
-
-  def save_job_properties(job_cfg, save_file)
-    # context = ["# gen at #{Time.now}"]
-    JavaProperties.write(job_cfg, save_file)
-    #
-    # context = ["# gen at #{Time.now}"]
-    # tag_opt_cli_args = spec_tag_param_str(job_cfg[:tag])
-    # rspec_param = if tag_opt_cli_args
-    #                 "RSPEC_PARAM = #{tag_opt_cli_args} \\\n\t#{piece[:files].join(" \\\n\t")}"
-    #               else
-    #                 "RSPEC_PARAM = #{piece[:files].join(" \\\n\t")}"
-    #               end
-    # context << "REQUEST_ASKS = #{piece[:profile].to_s(";\\\n\t")}"
-    # File.open(file, 'w') { |f| f.write context.join("\n") }
-  end
-
-  def get_job_rspec_run_args_str(job, split=' ')
-    tags_str = spec_tag_param_str(job[:tag])
-    paths_str = job[:specs].join(split)
-    tags_str ? (tags_str + split + paths_str) : paths_str
-  end
-
-  def get_job_env_profile_str(job, split=';')
-    job[:profile].to_s(split)
-  end
-
-  def gen_job_ci_params(job)
-    {'RSPEC_PARAM' => get_job_rspec_run_args_str(job), 'REQUEST_ASKS' => get_job_env_profile_str(job)}
-  end
-end