tuya-ci-DSL 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d935cdbb2b50a62d9e4a705f842bf05f79cce620
-  data.tar.gz: da70153b7be180663c578738feec074b8d3fcfe5
+  metadata.gz: a5bb46b1b4cda6e39577b28d949b0a1f91b10491
+  data.tar.gz: 8b80824cff9ff9a50625f6ea468d972f8e774309
 SHA512:
-  metadata.gz: 8d4b3e1e4230825d4c3173643b56f8548c94a3d4e7e0d33047e4deb32509c006d066efdc416ea5bc101ff7c469105e402b17e717b524e031700d15c5912c45b9
-  data.tar.gz: d3e1f9727e7800e8a2cac70af07fc305d289428d91df4180ddc01e1c6dbe3f1f45a2e4009a989c9eb6f857fa923470d9ed9ddde3a840e86625ddc96d1180b0e7
+  metadata.gz: d0269bf8f4abc9cfbeb9d8f7f222a822d0902c38c45a264130f172613aac7fc9417d42667e1b730d778d1a0ee7136d262cf37d53badcd7330d44e36967f13131
+  data.tar.gz: bde2f19ad421425240e1e85ff492b8ccd557cf5053fba485a820ccc0904040f29d120f9238e922c4227fab4a218a0046551b54495b0608863baf1266317f64cc

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

@@ -70,6 +70,20 @@ end
 after_project_build do |options|
 end
 
+building_project_pod_update_end do |options|
+end
+
+# trigger 执行策略
+# strategy_always_open
+# strategy_always_close
+# strategy_auto
+# 如果不指定 strategy 默认为 strategy_always_open
+strategy do |options|
+	[strategy_auto, :test]
+	[strategy_always_open, :test]
+	[strategy_always_close, :test]
+end
+
 error do |exception, position, options, process|
 end
 "

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

@@ -10,6 +10,10 @@ module TuyaCIDSL
 			dsl = TuyaCIDSL::TuyaDSL.instance
 			dsl.load_monitors
 
+			data = Hash.new
+			data[:test] = "some data"
+			dsl.insert_strategy data
+
 
 			options_p = {:branch=>"develop_3.8.0", :dependBranch=>"master", :updateComponents=>"[{\"id\":509,\"name\":\"TYUIKit\",\"branch\":\"develop\",\"version\":\"0.1.4-rc.1\"},{\"id\":500,\"name\":\"TYBusinessLibrary\",\"branch\":\"master\",\"version\":\"6.4.2-rc.3\"}]", :deleteComponents=>"[{\"id\":683,\"name\":\"TYSmartApplicationImpl\",\"branch\":\"develop\",\"version\":\"\"}]", :advanceFields=>"{}", :isIntegrate=>"0", :hashKey=>"48a62cb2cf577a0de28f60d561e8adb2", :buildId=>"146", :jobName=>"TuyaSmartV3.8.0_90"}
 			options_m = {:repo=>"TYSpecs", :branch=>"develop", :project=>"TestDemo", :version=>"10.4.1-rc.4", :hashKey=>"66f6f34a45ae9f71c77836069cd758ea", :buildId=>"12", :moduleName=>"TestDemo"}

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

@@ -1,14 +1,24 @@
 class TuyaCIMonitor
 	attr_accessor :methods, :name
+
+	ALWAYS_OPEN = 1
+	ALWAYS_CLOSE = 2
+	AUTO = 3
+
 	def initialize
 		# puts 'in initialize'
 		@methods = {}
 	end
 
-	def exe_action(action, options)
+	def exe_action(action, options, key)
 		method = @methods[action.to_sym]
 		begin
-			method.call options if method
+			strategy_method = @methods[:strategy]
+			strategy, strategy_key = strategy_method.call options if strategy_method
+			unless strategy.class == Fixnum
+				strategy = ALWAYS_OPEN
+			end
+			trigger_call method, action, options, key, strategy, strategy_key
 		rescue Exception => e
 			if e.class == TuyaCIMonitorStopError
 				puts "Trigger Exception cached, tuya_stop_build has been used. the stop message is: #{$!}".red
@@ -22,6 +32,37 @@ class TuyaCIMonitor
 		end
 	end
 
+	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
+			call_strategy = false
+		elsif strategy == AUTO
+			monitors = TuyaCIDSL::TuyaDSL.instance
+			call_strategy = true if ( (monitors.strategy_auto.has_key? strategy_key) && method )
+		end
+
+		if call_strategy
+			puts "Trigger '#{action}' in '#{key}'".green
+			method.call options
+		end
+	end
+
+	def strategy_always_open
+		ALWAYS_OPEN
+	end
+
+	def strategy_always_close
+		ALWAYS_CLOSE
+	end
+
+	def strategy_auto
+		AUTO
+	end
+
+
 	def tuya_stop_build(message)
 		raise TuyaCIMonitorStopError, message
 	end

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

@@ -4,6 +4,8 @@ module TuyaCIDSL
 
 	class TuyaDSL
 
+		attr_accessor :strategy_auto
+
 		include Singleton
 
 		def initialize
@@ -11,6 +13,7 @@ module TuyaCIDSL
 			@default_folder = 'CIMonitors'
 			@files = []
 			@monitors = {}
+			@strategy_auto = {}
 			load_files
 		end
 
@@ -26,6 +29,10 @@ module TuyaCIDSL
 			end
 		end
 
+		def insert_strategy(strategy)
+			@strategy_auto = strategy
+		end
+
 		def load_monitors
 			@files.each do |item|
 				add_monitor item
@@ -55,13 +62,13 @@ module TuyaCIDSL
 
 		private
 
+
+		# trigger 执行策略
 		def trigger(action, options)
 			# puts "trigger action: #{action} options: #{options}"
-
 			@monitors.each_key do |key|
-				puts "Start trigger: #{action} in #{key}".green
 				item = @monitors[key]
-				item.exe_action action, options
+				item.exe_action action, options, key
 			end
 
 		end

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

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

metadata

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