tuya-ci-DSL 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5bb46b1b4cda6e39577b28d949b0a1f91b10491
-  data.tar.gz: 8b80824cff9ff9a50625f6ea468d972f8e774309
+  metadata.gz: 7d888aefc22a4cb176670515597d9b25829b3c62
+  data.tar.gz: d15f941ee449a50bbf4687f6a1f621fc742c80bd
 SHA512:
-  metadata.gz: d0269bf8f4abc9cfbeb9d8f7f222a822d0902c38c45a264130f172613aac7fc9417d42667e1b730d778d1a0ee7136d262cf37d53badcd7330d44e36967f13131
-  data.tar.gz: bde2f19ad421425240e1e85ff492b8ccd557cf5053fba485a820ccc0904040f29d120f9238e922c4227fab4a218a0046551b54495b0608863baf1266317f64cc
+  metadata.gz: 45f8b08ff69578d133c076cdc26519ec45de171c9a76ad81a33a24c6b10f9e5f6e62ea313c6fa854ef528408f2173621dc7919333aaa8f1555e8c1a9a19f7cc6
+  data.tar.gz: 69d05f5c4b56a6b5197843cd832b3b819e81af62bc09fff163ccc1d95e154673c31e3a90146bfa426aeb17b9e628baeceb5959711383b84e65e83b96c52d5198

data/lib/tuya/ci/DSL/trigger_create.rb

@@ -74,14 +74,15 @@ building_project_pod_update_end do |options|
 end
 
 # trigger 执行策略
-# strategy_always_open
 # strategy_always_close
+# strategy_always_open
 # strategy_auto
-# 如果不指定 strategy 默认为 strategy_always_open
+# 如果不指定 strategy 默认为 strategy_open
+# :test 为trigger 标识符 只有在 strategy_auto 时才有效
 strategy do |options|
-	[strategy_auto, :test]
-	[strategy_always_open, :test]
-	[strategy_always_close, :test]
+	 [strategy_auto, :bool_key]
+	# [strategy_always_close, :bool_key]
+	# [strategy_always_open, :bool_key]
 end
 
 error do |exception, position, options, process|

data/lib/tuya/ci/DSL/trigger_test.rb

@@ -10,8 +10,11 @@ module TuyaCIDSL
 			dsl = TuyaCIDSL::TuyaDSL.instance
 			dsl.load_monitors
 
-			data = Hash.new
-			data[:test] = "some data"
+			# data = Hash.new
+			# data[:test] = "some data"
+			# dsl.insert_strategy data
+
+			data = {"bool_key"=>{"value"=>true}, "choice_key"=>{"value"=>"option-key-001"}, "choices_key"=>{"value"=>["options-key-001", "options-key-002"]}, "string_key"=>{"value"=>"defaultstring"}}
 			dsl.insert_strategy data
 
 

data/lib/tuya/ci/DSL/tuya_ci_monitor.rb

@@ -15,6 +15,7 @@ class TuyaCIMonitor
 		begin
 			strategy_method = @methods[:strategy]
 			strategy, strategy_key = strategy_method.call options if strategy_method
+
 			unless strategy.class == Fixnum
 				strategy = ALWAYS_OPEN
 			end
@@ -35,18 +36,23 @@ class TuyaCIMonitor
 	def trigger_call(method, action, options, key, strategy, strategy_key)
 
 		call_strategy = false
-		if strategy == ALWAYS_OPEN
-			call_strategy = true if method
-		elsif strategy == ALWAYS_CLOSE
+		if strategy == ALWAYS_CLOSE
 			call_strategy = false
+		elsif strategy == ALWAYS_OPEN
+			call_strategy = true
 		elsif strategy == AUTO
 			monitors = TuyaCIDSL::TuyaDSL.instance
-			call_strategy = true if ( (monitors.strategy_auto.has_key? strategy_key) && method )
+			if monitors.strategy_auto.has_key? strategy_key
+				call_strategy = true
+				options[:strategy] = monitors.strategy_auto[strategy_key]
+			end
 		end
 
 		if call_strategy
-			puts "Trigger '#{action}' in '#{key}'".green
-			method.call options
+			if method
+				puts "Trigger '#{action}' in '#{key}'".green
+				method.call options
+			end
 		end
 	end
 
@@ -81,7 +87,7 @@ class TuyaCIMonitor
 	def exe_error(process, error, position, options)
 		method = @methods['error'.to_sym]
 		# require 'tuya/ci/DSL/exe/dsl_exe'
-		method.call error, position, options, process
+		method.call error, position, options, process if method
 	end
 
 	def exe

data/lib/tuya/ci/DSL/tuya_dsl.rb

@@ -30,6 +30,16 @@ module TuyaCIDSL
 		end
 
 		def insert_strategy(strategy)
+
+			unless strategy.class == Hash
+				return
+			end
+
+			strategy.keys.each do |item|
+				unless item.is_a?(Symbol)
+					strategy[item.to_sym] = strategy[item]
+				end
+			end
 			@strategy_auto = strategy
 		end
 

data/lib/tuya/ci/DSL/version.rb

@@ -1,7 +1,7 @@
 module Tuya
   module Ci
     module DSL
-      VERSION = "0.1.6"
+      VERSION = "0.1.9"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tuya-ci-DSL
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - fangdong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler