tuya-ci-DSL 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204f1ee85290441a131eac43962c84950cb84f65
-  data.tar.gz: a9ba70a216d33a98c760245f28be4fe6a49a8452
+  metadata.gz: d9601dceb5f3616b3e5724483ed54231aafaeba0
+  data.tar.gz: 6fe69ec922230449ca23329f1c39794765cd77e6
 SHA512:
-  metadata.gz: 53a5269753be9410d5a2d83a78627606e885a310d767f8e8e70bed0bb9d6e66646cb388db6725a6019eee3385cc7cf120701b038bad0e923d1b8f3b3badc9955
-  data.tar.gz: b59a278586172c456157ec82de6a109955c18911e3879d87c2fcc0a43a60360bd45719844167b2a3f786e3e0c68608458cf41572b9a9e8fc215ba9ca3d89dde6
+  metadata.gz: 7ef33bcabe9d78a88a0cc3dcb2a8103d7b298166f7a4eb0ff1aad3bf938262496d2ffdbe1b083b5b9d6837f24d93e2f50302c6422adf1180a459b848eed2b6b1
+  data.tar.gz: d29c4f984d8a1b3d50dd40aa5cf88347f3b9596ed6e2905e6f538bd52b715e7056741ffa8538f9240f20a87112faf7e25779e29984937d96f80da54d3f2fe372

data/lib/tuya/ci/DSL/exe/dsl_exe.rb

@@ -13,7 +13,10 @@ module TuyaCIDSL
 
 		def execute
 			if @from_git
-				`cp -a #{@folder_path} ./`
+				command_cp = "cp -a #{@folder_path} ./"
+				puts "Trigger will copy shell by:#{command_cp}"
+				system command_cp
+
 				run_shell
 				delete
 			else
@@ -22,19 +25,13 @@ module TuyaCIDSL
 		end
 
 		def download(git)
+
 			@from_git = true
+			git_downloader = TYCiCore::GitDownloader.new git
 			@git = git
-			@folder = git.scan(/^.*\/(.*).git$/)[0][0]
-			@folder_path = "#{ENV['HOME']}/.dsl/#{folder}"
-
-			if File.exist? @folder_path
-				`git -C #{@folder_path} add .`
-				`git -C #{@folder_path} reset --hard`
-				`git -C #{@folder_path} fetch`
-				`git -C #{@folder_path} rebase`
-			else
-				`git clone #{git} #{@folder_path}`
-			end
+			@folder = git_downloader.folder
+			git_downloader.download '.dsl'
+			@folder_path = git_downloader.folder_path
 		end
 
 		private

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

@@ -9,12 +9,22 @@ class TuyaCIMonitor
 		method = @methods[action.to_sym]
 		begin
 			method.call options if method
-		rescue Exception
-			puts "Trigger Exception cached, you can puts detail in your error method".red
-			exe_error action, $!, $@, options
+		rescue Exception => e
+			if e.class == TuyaCIMonitorStopError
+				puts "Trigger Exception cached, tuya_stop_build has been used. the build is end here".red
+				raise $!
+			else
+				puts "Trigger Exception cached, you can puts detail in your error method".red
+				exe_error action, $!, $@, options
+			end
+
 		ensure
 		end
 	end
+
+	def tuya_stop_build(message)
+		raise TuyaCIMonitorStopError, message
+	end
 	
 	def tuya_sh(shell)
 		dsl = TuyaCIDSL::DSLExecute.new shell
@@ -65,6 +75,23 @@ class TuyaCIMonitor
 	end
 end
 
+class TuyaCIMonitorStopError < StandardError
+
+	attr_reader :object
+
+	# def initialize(object)
+	# 	@object = object
+	# end
+
+	# begin
+	# 	raise TuyaCIMonitorStopError.new("an object"), "a message"
+	# rescue TuyaCIMonitorStopError => e
+	# 	puts e.message # => "a message"
+	# 	puts e.object # => "an object"
+	# end
+
+end
+
 class TuyaCIMonitorMethods
 	attr_accessor :name, :args, :block
 	def initialize

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

@@ -14,6 +14,18 @@ module TuyaCIDSL
 			load_files
 		end
 
+		def load_monitors_git(git)
+			git_downloader = TYCiCore::GitDownloader.new git
+			git_downloader.download '.dsl_common'
+			load_monitors_path git_downloader.folder_path
+		end
+
+		def load_monitors_path(path)
+			if File.exist? path
+				@files += Dir["#{path}/**/*"].reject{|o|File.directory?(o)}
+			end
+		end
+
 		def load_monitors
 			@files.each do |item|
 				add_monitor item
@@ -55,9 +67,6 @@ module TuyaCIDSL
 			if File.exist? "./#{@default_folder}/"
 				@files += Dir["./#{@default_folder}/**/*"].reject{|o|File.directory?(o)}
 			end
-			# puts `pwd`
-			# puts "files is now:"
-			# puts @files
 		end
 
 		def add_monitor(file)

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

@@ -1,7 +1,7 @@
 module Tuya
   module Ci
     module DSL
-      VERSION = "0.1.0"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tuya-ci-DSL
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - fangdong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler