tes-request 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9841f4d3a444ade45a6d1565c5dd55be1140a2465a855c3275254e2e8f7396b
-  data.tar.gz: 5141b7e96643c8e43583d48efeb6ad1c1671067f711e60b606ea524533752635
+  metadata.gz: 6ef4285a8107b16ad50d37d0d4ed27e4deb96be99ff6a20ed24e742ea3533183
+  data.tar.gz: b4e0fdc1dcafed9548b9027a53228ef31db168bb554c3aacdfadbef3e68b664a
 SHA512:
-  metadata.gz: bdee923d55c1fe276bda1b488b5e732aabedbfdc4e2076886f4a9f4272f7c67f7cbaae0cac74efb1ae406ecdc0d4733744f6958d3edc5290e9949936aa5ed2f7
-  data.tar.gz: 2e9570dc012cb3b301289d5f23bac869c474e2b1e0993bbe8b86545c825b0628c73dd5a691ac271561cd48be7ef490a22add7ce94c199af930a1d0418517a8c8
+  metadata.gz: 5d00ae75a43d6effbf933b9ff4229f1184bac0706dc4c13d459d25da1b9b332524f9c98da609e8a8cca32738aa279da36abcb09d5ae577644394761f083913e4
+  data.tar.gz: 2301ac3ba6c6cda67b7dd23ea539e0743fcfa45da5edcf73cc5c45598b35ecdaa160775b561a55167fad875ba8faf7245c2c70732f49cac2f58208b0dfdbab49

data/.travis.yml

@@ -1,14 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.7
-  - 2.3.3
-  - 2.3.4
-  - 2.4.0
-  - 2.4.1
-  - 2.5.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 before_install: gem install bundler
 install: bundle
 script:
@@ -18,4 +14,4 @@ deploy:
   api-key: $RUBYGEMS_API_KEY
   on:
     tags: true
-    rvm: 2.4.1
+    rvm: 2.5.1

data/lib/tes/request/expression.rb

@@ -5,7 +5,7 @@ module Tes
     class Expression
       include Comparable
 
-      REG_EXP_CHAIN = /^(!)?([0-9A-Za-z_.]+)(\?|==|>=|<=|<|>|=|!=)?([\w-\.]+)?/
+      REG_EXP_CHAIN = /^(!)?([0-9A-Za-z_.]+)(\?|==|>=|<=|<|>|=|!=)?([.\-\w]+)?/
 
       # @param [String] exp_str 表达式字符串
       def initialize(exp_str)

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

@@ -8,7 +8,7 @@ module Tes::Request::RSpec
   class CiSlicer
     SUPPORT_FILE_TYPES = [:yaml, :yml, :json, :properties]
 
-    def initialize(file_type, project_dir, res_replace_map_json_file=nil, pool_url=nil)
+    def initialize(file_type, project_dir, res_replace_map_json_file = nil, pool_url = nil)
       unless SUPPORT_FILE_TYPES.include?(file_type.to_sym)
         raise(ArgumentError, "Not supported file type:#{file_type}!")
       end
@@ -36,16 +36,38 @@ module Tes::Request::RSpec
       @cfg_target_dir
     end
 
-    def spec_tag_param_str(tags)
+    def rspec_tag_param_str(tags)
       case tags
-        when Array
-          tags.map {|t| "--tag #{t}"}.join(' ')
-        when String
-          "--tag #{tags}"
-        when nil
+      when Array
+        tags.map {|t| "--tag #{t}"}.join(' ')
+      when String
+        "--tag #{tags}"
+      when nil
+        nil
+      else
+        raise("不支持的类型:#{tags.class}")
+      end
+    end
+
+    def pytest_mark_param_str(tags)
+      case tags
+      when Array
+        if tags.empty?
           nil
+        elsif tags.size > 1
+          total_tag_str = tags.map {|t| t =~ /\S+\s+\S+/ ? "(#{t})" : t}.join(' or ')
+          "-m '#{total_tag_str}'"
         else
-          raise("不支持的类型:#{tags.class}")
+          tag = tags.first
+          (tag =~ /\S+\s+\S+/) ? "-m '#{tag}'" : "-m #{tag}"
+        end
+
+      when String
+        (tags =~ /\S+\s+\S+/) ? "-m '#{tags}'" : "-m #{tags}"
+      when nil
+        nil
+      else
+        raise("不支持的类型:#{tags.class}")
       end
     end
 
@@ -58,34 +80,39 @@ module Tes::Request::RSpec
       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")
-            JavaProperties.write(params, file)
-          end
-          puts "Generated #{jobs.size} jobs, Stored in:#{target_dir}/*.properties ."
+      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")
+          JavaProperties.write(params, file)
+        end
+        puts "Generated #{jobs.size} jobs, Stored in:#{target_dir}/*.properties ."
       end
     end
 
-    def get_job_rspec_run_args_str(job, split=' ')
-      tags_str = spec_tag_param_str(job[:tag])
+    def get_job_rspec_run_args_str(job, split = ' ')
+      if job[:specs].any? {|s| s.match(/_spec.rb\b/)}
+        tags_str = rspec_tag_param_str(job[:tag])
+      elsif job[:specs].any? {|s| s.match(/_test.py\b/) or s.match(/test_\w+.py\b/)}
+        tags_str = pytest_mark_param_str(job[:tag])
+      end
       paths_str = job[:specs].join(split)
       tags_str ? (tags_str + split + paths_str) : paths_str
     end
 
-    def get_job_env_profile_str(job, split=';')
+    def get_job_env_profile_str(job, split = ';')
       job[:profile].to_s(split)
     end
 
     private
+
     def gen_job_ci_params(job)
       {'RSPEC_PARAM' => get_job_rspec_run_args_str(job), 'REQUEST_ASKS' => get_job_env_profile_str(job)}
     end

data/lib/tes/request/version.rb

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

metadata

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