tycli-public 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b7a4f859f04c8d94b57642435824bee59f013e
-  data.tar.gz: 53b8bf1da7fcd9d60509876b2f75c7afd022fe9a
+  metadata.gz: bbd695f107cca40fe98f67a4cf624722b0c37bcf
+  data.tar.gz: a50cca500aa97781350724c114f6471315c7711e
 SHA512:
-  metadata.gz: 5637a49fdcc4789acc6fb5ce040fa5c6973baed4883e5e1c5a999db44986aa15a0129c181dec79f58fcf3604faeab63cab01e82668f218a1db7969bd8159e6ad
-  data.tar.gz: d250e5df5a7480228df20a953056231eff3fe1b27cc1a46fb31b5426ef74c29b116f6a4aea35eada8d8044e9deb6dc27c8c738b66bdd88212372b10173fdf4ac
+  metadata.gz: 07560e9235f91991089de5678de8a50477e9cf83506130d25e98f101e3a61c3e3d4283c6546e4dae5c78b046a1b84bf2fc2a605b465be77c10d2d6e4ceb468aa
+  data.tar.gz: 80f30f4077e2f914bd44925fe6a1802b6d1f30b41caa02d92e4e9eb9d67ef3a8ae564836ccf271d5c246ecbf45a8407349507e464459e38f431c2c07754d8ae3

data/lib/tycli/command/group/status.rb

@@ -9,6 +9,7 @@ module Tuya
 				self.command = 'status'
 
 				def run
+
 					require 'tycli/group'
 
 					Tuya::TYGroup.status

data/lib/tycli/command/lib/create.rb

@@ -63,12 +63,9 @@ module Tuya
 					if File.exist? "./#{@name}"
 						puts "#{@name} is alerady exits".red
 					else
-						result = `pod lib create #{@name} --template-url=https://github.com/TuyaInc/pod-template.git`
-						result.each_line do |s|
-							if s.include?("fatal")
-								puts "#{s}".red
-							end
-						end
+						command = %W(lib create #{@name} --template-url=https://github.com/TuyaInc/pod-template.git)
+						require 'tycli/executable'
+						EXE.exe("pod", command, true )
 					end
 				end
 			end

data/lib/tycli/command/repo/push.rb

@@ -24,7 +24,6 @@ module Tuya
 					@is_commit = argv.flag?('commit', true)
 
 					@version = argv.option('version')
-					# @version = '0.0.1' unless @version
 					@podspec = argv.shift_argument
 
 				end
@@ -32,7 +31,7 @@ module Tuya
 				def run
 					puts "Pushing the podspec: #{@podspec} to version: #{@version}".green
 
-					Tuya::SpecRepo.push(@version, @is_commit, @podspec)
+					Tuya::SpecRepo.push(@version, @is_commit, @podspec, @verbose)
 				end
 			end
 		end

data/lib/tycli/repo/spec.rb

@@ -1,6 +1,16 @@
 module Tuya
 	class PodSpec
 
+		def self.local_pod_version_exist(version, spec, lib_name)
+
+			require 'tycli/system'
+
+			system = Tuya::System.instance
+			local_path = system.pod_config.repos_dir + spec + lib_name + version
+
+			File.directory?(local_path)
+		end
+
 		def self.ask_pod_spec
 
 			files = podspec_files(nil)

data/lib/tycli/spec_repo.rb

@@ -1,6 +1,6 @@
 module Tuya
 	class SpecRepo
-		def self.push(version, is_commit_all, podspec)
+		def self.push(version, is_commit_all, podspec, verbose)
 
 			require 'tycli/repo/spec'
 			require 'tycli/git'
@@ -43,18 +43,54 @@ module Tuya
 
 			podspecs.each do |podspec_file|
 
-				puts "\nPush #{podspec_file}...".yellow
+				puts "\nPushing #{podspec_file}...".yellow
 
 				pod_push =  "pod repo push #{group.spec} #{podspec_file} --sources='#{group.url},https://github.com/CocoaPods/Specs.git,https://github.com/TuyaInc/TYPublicSpecs.git' --use-libraries --allow-warnings"
 
+				if verbose
+					pod_push = "#{pod_push} --verbose"
+				end
+
 				pod_push_result = `#{pod_push}`
 
-				pod_push_result.each_line do |s|
-					if s.include?("fatal") || s.include?("Couldn't find")
-						puts "!!!#{s}".red
+				push_result = Tuya::PodSpec.local_pod_version_exist(version, group.spec, File.basename(FileUtils.pwd))
+
+
+				if verbose
+					if pod_push_result.length > 10000
+
+						require 'tycli/util/file_util'
+						log_name = "repo_push_result_#{podspec_file}_#{version}.log"
+
+						if push_result
+							log_name = "success_#{log_name}"
+							puts "\nThe detail log is :#{log_name}\n".yellow
+						else
+							log_name = "error_#{log_name}"
+							puts "\nThe detail error log is :#{log_name}\n".red
+						end
+
+						TYUtil::TYFile.new_file("log", log_name, pod_push_result)
+					else
+
+						puts "The detail log is:\n".red
+						puts pod_push_result.magenta
 					end
 				end
+
+				if push_result
+					puts "Push #{podspec_file} Successful\n".green
+				else
+					suggest_log(podspec_file, pod_push_result)
+				end
+
 			end
 		end
+
+		def self.suggest_log(podspec_file, content)
+			puts "\nPush #{podspec_file} Failed  you can use 'tuya repo push --verbose for more information' ".red
+			require 'tycli/util/puts_util'
+			TYUtil::TYPuts.filter(content, TYUtil::TYPuts::ERROR_KEYS)
+		end
 	end
 end

data/lib/tycli/util/file_util.rb

@@ -0,0 +1,12 @@
+module TYUtil
+	class TYFile
+		def self.new_file(path, name, content)
+
+			`mkdir -p ./#{path}/`
+
+			fh = File.new("./#{path}/#{name}", "w")
+			fh.puts content
+			fh.close
+		end
+	end
+end

data/lib/tycli/util/puts_util.rb

@@ -1,17 +1,25 @@
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+
+require 'colored'
+
 module TYUtil
 	class TYPuts
 
+
 		ERROR_KEYS = [
 			"fatal",
 			"error",
+			"ERROR",
 			"can not",
-			"not found"
+			"not found",
+			"Couldn"#Couldn't find
 		]
 
 		def self.filter_color(target, keys, color, pre)
 			target.each_line do |s|
 
+				# p 111
+				# p s
 				eval_command = ""
 				keys.each do |key|
 					temp = ""
@@ -20,16 +28,60 @@ module TYUtil
 					end
 					eval_command = "#{eval_command}#{temp}s.include?('#{key}')"
 				end
+				# p eval_command
 				if eval_command.length > 0 && (eval eval_command)
-					out = "#{pre} #{s}".gsub!("'","")
-					eval "puts '#{out}'.#{color}"
+					# p 11111
+					# p pre
+					# p 222
+
+					out = "#{pre} #{s}"
+					if out.include?("''")
+						out.gsub!("'","")
+					end
+
+					# p "#{pre} #{s}"
+					# p 33
+					# p out
+
+					# puts "puts '#{out}'.#{color}"
+
+					# eval "puts '#{out}'.#{color}"
 				end
 			end
 
 		end
 
+		def self.filter_content(target, keys, pre)
+
+			regular_temp = ""
+			is_put_pre = false
+			keys.each do |key|
+				temp = ""
+				if regular_temp.length > 0
+					temp = "|"
+				end
+				regular_temp = "#{regular_temp}#{temp}(.*)#{key}(.*)"
+			end
+
+			regular = "^(#{regular_temp})$"
+			target.gsub(/#{regular}/) do |matched|
+
+				if !is_put_pre
+					is_put_pre = true
+					puts pre.yellow
+					puts "\n"
+				end
+
+				if matched.length < 2000
+					puts matched.magenta
+					puts "\n"
+				end
+			end
+		end
+
 		def self.filter(target, keys)
-			filter_color(target, keys, 'yellow', '[!tuya-cli]')
+			# filter_color(target, keys, 'yellow', '[!tuya-cli suggested]')
+			filter_content(target, keys, '「tuya-cli」 Maybe the reason for the error is :')
 		end
 	end
 end

data/lib/tycli/version.rb

@@ -1,3 +1,3 @@
 module Tycli
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tycli-public
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - fangdong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - lib/tycli/spec_repo.rb
 - lib/tycli/system.rb
 - lib/tycli/util/ask.rb
+- lib/tycli/util/file_util.rb
 - lib/tycli/util/puts_util.rb
 - lib/tycli/version.rb
 homepage: https://docs.tuya.com/cn/