podsorz 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 728879be777d0fc735cb208e256f5397a4930a712ae2da103fdf971698cde73c
-  data.tar.gz: 49e47437e30d2dbfa2ac8984ff0c8370e772c527c493183e0c6edd253ffc0797
+  metadata.gz: a4917923f5a634c8bf8f212ac3d6621ab13eab6c9442f189bf45143a88a25036
+  data.tar.gz: 4a3caaa94b2a16a5a05c2da94901fd18dd4c300a6f8e7239636516f9310a1e61
 SHA512:
-  metadata.gz: 3627912e4815e19f3ac624017c952a581c9909d57140316e258f5d8e8162fd216fd67f45e1aca4221efcc1325a2223481e8ca7408e6773ac69545ec6d0ca7c9a
-  data.tar.gz: aa28aaafbbe094033e71380bde262f01b9401fa2ee5a15b9e73f1a2b8d5fd266da70a0dda2ba79040032b8d9348ad912828fe0cd703266f904ea91ac888d9811
+  metadata.gz: bac63452c1fae9ad3d222f33f7b9e302b453431ae86d3578f8ec958364826a6c9a21aabc523925ab0d8160050726cb78549eca3a35905ae5f5b8b24b763f7991
+  data.tar.gz: 445fb40a279eb2a916d255b52fde91f6c343abf460673eeae81242c10aaa8b1b894d53100e91c92ede85669adc9a17d9a0bfccc9df90fb89e462e6582a290ca2

data/lib/podsorz/command/binary.rb

@@ -134,10 +134,17 @@ module PodsOrz
 			end
 		end
 
-		Logger.highlight("[cmd:#{cmd_type}] Exist static library pods : \n #{exist_binary_list.inspect}")
+		Logger.highlight("[cmd:#{cmd_type}] Exist static library pods :")
+		exist_binary_list.each do |item|
+			puts item.colorize(:green)
+		end
+
 		Logger.separator
-		Logger.warning("[cmd:#{cmd_type}] Not exist static library pods: \n #{empty_binary_list.inspect}")
 
+		Logger.warning("[cmd:#{cmd_type}] Not exist static library pods:")
+		empty_binary_list.each do |item|
+			puts item.colorize(:yellow)
+		end
 
 		result_hash[:binary] = has_binary_list
 		result_hash[:package] = can_package_list

data/lib/podsorz/core/Binary/binary_builder.rb

@@ -6,7 +6,7 @@ require "open3"
 
 module PodsOrz
 	class BinaryBuilder
-		attr_accessor :main_path, :kx_binary_path, :podfile_io, :pod_repo, :http_host
+		attr_accessor :main_path, :kx_binary_path, :podfile_io, :pod_repo, :http_host, :remote_binary_directory
 
 		def initialize(main_path, podfile_io)
 			@main_path = main_path
@@ -15,7 +15,8 @@ module PodsOrz
 			@podfile_io = podfile_io
 			@pod_repo = PodsOrz::PodsRepo.new()
 
-			@http_host = "http://192.168.6.23:8080"
+			@http_host = "http://192.168.6.127:8899"
+			@remote_binary_directory = "binary_pod"
 		end
 
 		def start_package_pod(pod)
@@ -82,7 +83,7 @@ module PodsOrz
 				binary_result = File.directory?(@kx_binary_path)
 				unless binary_result
 					Logger.warning("kx_binary directory not exist, generate default 'kx_binary' directory")	
-					Dir.mkdir(@kx_binary_path)
+					FileUtils.mkdir_p(@kx_binary_path, :mode => 0777)
 				end
 			end
 		end
@@ -99,7 +100,7 @@ module PodsOrz
 			pod_result = File.directory?(pod_path)
 			unless pod_result
 				Logger.warning("#{pod_path} directory not exist, generate default '#{pod_path}' directory")	
-				Dir.mkdir(pod_path)
+				FileUtils.mkdir_p(pod_path, :mode => 0777)
 			end
 		end
 
@@ -107,8 +108,8 @@ module PodsOrz
 			pod_version_path = File.expand_path("#{pod}/#{pod_version}", @kx_binary_path)
 			pod_version_result = File.directory?(pod_version_path)
 			unless pod_version_result
-				Logger.warning("#{pod_version_path} directory not exist, generate default '#{pod_version_path}' directory")	
-				Dir.mkdir(pod_version_path)
+				Logger.warning("#{pod_version_path} directory not exist, generate default '#{pod_version_path}' directory")
+				FileUtils.mkdir_p(pod_version_path, :mode => 0777)
 			end
 
 			pod_version_path
@@ -241,7 +242,7 @@ module PodsOrz
 							unless sentence_content.start_with?("#")
 								mt = /.*s.source = /.match(sentence)
 								unless mt.nil?
-									sentence = mt[0] + "{:http => \'#{http_host}/#{pod}/#{pod_version}/#{pod}.framework.zip\'}"
+									sentence = mt[0] + "{:http => \'#{@http_host}/#{remote_binary_directory}/#{pod}/#{pod_version}/#{pod}.framework.zip\'}"
 								end
 
 								mt = /.*s.ios.vendored_framework   = /.match(sentence)

data/lib/podsorz/core/Binary/binary_manager.rb

@@ -150,7 +150,11 @@ module PodsOrz
 					dest_dir = @binary_builder.detect_version_directory(pod, pod_version)
 
 					each_result = @binary_repo.push_binary_remote(pod, dest_dir, pod_version, false)
-					is_publish_success = false unless each_result
+					unless each_result
+						is_publish_success = false 
+						Logger.error("#{pod}(#{pod_version}) publish failure!")
+					end
+					
 				end
 
 				command.join

data/lib/podsorz/core/Binary/binary_repo.rb

@@ -1,14 +1,16 @@
 require "podsorz/util/logger"
 require 'open3'
+require "podsorz/core/Binary/binary_server"
 
 module PodsOrz
 	class BinaryRepo
-		attr_accessor :repo_name, :repo_url
+		attr_accessor :repo_name, :repo_url, :binary_server
 
 		def initialize()
 			@repo_name = "kuxiu_binary_specs"
 			@repo_url = "git@gitlab.91banban.com:ios_pods/binary-specs.git"
 			@source_code_repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+			@binary_server = PodsOrz::BinaryServer.new()
 		end
 
 		def check_binary_repo_exist()
@@ -132,6 +134,19 @@ module PodsOrz
 		def push_binary_remote(pod, file_path, pod_version, is_swift)
 			is_push_success = false
 
+			#1.上传文件到服务器
+			is_push_success = @binary_server.upload_pod_file(pod, file_path, pod_version)
+			return is_push_success unless is_push_success
+
+			#2.发布到binary_repo
+			is_push_success = start_publish_binary(pod, file_path, pod_version, is_swift)
+			
+          	is_push_success
+		end
+
+		def start_publish_binary(pod, file_path, pod_version, is_swift)
+			is_push_success = false
+
 			command = Thread.new do 
 				repo_push_cmd = []
 				repo_push_cmd << "cd #{file_path}"
@@ -168,9 +183,6 @@ module PodsOrz
           	is_push_success
 		end
 
-
-
-
 #Class End
 
 	end

data/lib/podsorz/core/Binary/binary_server.rb

@@ -1,21 +1,120 @@
 require "podsorz/util/logger"
+require "open3"
+require "thread"
 
 
 module PodsOrz
 	class BinaryServer
-		attr_accessor :remote_host
+		attr_accessor :http_host
 
 		def initialize()
-			@remote_host = "http://192.168.6.23:8080"
+			@http_host = "http://192.168.6.127:8899"
 		end
 
+		def upload_pod_file(pod, file_path, pod_version)
+			is_upload_success = false
 
-		def has_remote_source(pod, version)
-
+			# uplaod zip
+			is_upload_success = __action_upload(pod,file_path,pod_version,".framework.zip")
+			return is_upload_success unless is_upload_success
+			
+			# upload .podspec
+			is_upload_success = __action_upload(pod,file_path,pod_version,".podspec")
 			
+			is_upload_success 
+		end
+
+		def __action_upload(pod, file_path, pod_version, extension)
+			is_upload_success = false
+
+			file_name = "#{pod}#{extension}"
+			file_name_path = File.expand_path(file_name, file_path)
+
+			unless File.exist?(file_name_path)
+				Logger.error("#{file_name_path} not exist!")
+				is_upload_success = false
+				return is_upload_success
+			end 
+
+			mutex = Mutex.new()
+			condition_var = ConditionVariable.new
+
+			wait_thread = Thread.new do 
+				mutex.synchronize {
+					condition_var.wait(mutex, 30)
+				}
+			end
+
+			command = Thread.new do
+				mutex.synchronize {
+					upload_cmd = "curl #{@http_host}/upload -F \"podname=#{pod}\" -F \"version=#{pod_version}\"  -F \"file=@#{file_name_path};filename=#{file_name}\""
+					
+					Logger.warning("upload #{file_name}...\n #{upload_cmd}")
+
+					IO.popen(upload_cmd) do |io|
+						io_lines = io.readlines
+						io_lines.each do |line|
+							puts line
+							if line.include? "\"success\":"
+								is_upload_success = true if line.include? "true"
+								condition_var.signal
+							end
+						end
+						io.close
+					end
+				}
+			end
+
+			wait_thread.join()
+
+			Logger.error("upload #{file_name} failure!") unless is_upload_success
+
+			is_upload_success
 		end
 
+		def delete_pod_file(pod, pod_version)
+			is_delete_success = false
+
+			mutex = Mutex.new()
+			condition_var = ConditionVariable.new
+
+			wait_thread = Thread.new do 
+				mutex.synchronize {
+					condition_var.wait(mutex, 2)
+				}
+			end
+
+			command = Thread.new do 
+				mutex.synchronize {
+					delete_cmd = ""
+					if pod_version && pod_version.length > 0
+						delete_cmd = "curl #{@http_host}/delete -d \"podname=#{pod}\";\"version=#{pod_version}\""
+					else
+						delete_cmd = "curl #{@http_host}/delete -d \"podname=#{pod}\""
+					end
+					
+					Logger.warning("delete #{pod}...\n #{delete_cmd}")
+	
+					Open3.popen3(delete_cmd) do |stdin , stdout , stderr, wait_thr|
+						while line = stdout.gets
+							puts line
+							if line.include? "\"success\":"
+								is_delete_success = true if line.include? "true"
+								condition_var.signal
+							end
+						end
+					end
+				}
+			end
+
+			wait_thread.join()
+
+			Logger.error("delete #{pod} failure!") unless is_delete_success
+
+			is_delete_success
+		end
 
+#Class end
 	end
 
 end

data/lib/podsorz/core/PodFile/podfile_io.rb

@@ -4,11 +4,12 @@ require "podsorz/core/PodFile/podfile_model"
 module PodsOrz
 
 	class PodfileIO
-		attr_accessor :main_path, :total_sentences, :usable_sentences, :total_pod_models, :http_host
+		attr_accessor :main_path, :total_sentences, :usable_sentences, :total_pod_models, :http_host, :remote_binary_directory
 
 		def initialize(main_path)
 			@main_path = main_path
-			@http_host = "http://192.168.6.23:8080"
+			@http_host = "http://192.168.6.127:8899"
+			@remote_binary_directory = "binary_pod"
 
 			self.parse_podfile_orz
 		end
@@ -314,7 +315,7 @@ module PodsOrz
 			pod_name_list.each do |podname|
 				@total_pod_models.map { |model|
 					if model.name.start_with? podname.to_s
-						model.podspec = "#{@http_host}/#{model.name}/#{model.version}/#{model.name}.podspec" unless model.version.nil?
+						model.podspec = "#{@http_host}/#{remote_binary_directory}/#{model.name}/#{model.version}/#{model.name}.podspec" unless model.version.nil?
 					end
 				}
 			end

data/lib/podsorz/core/PodsOrz/pods_detector.rb

@@ -27,7 +27,7 @@ module PodsOrz
 				pods_result = File.directory?(@kx_pods_path)
 				unless pods_result
 					Logger.warning("kx_pods directory not exist, generate default 'kx_pods' directory")	
-					Dir.mkdir(@kx_pods_path)
+					FileUtils.mkdir_p(@kx_pods_path, :mode => 0777)
 				end
 			end
 		end

data/lib/podsorz/core/PodsOrz/pods_git_manager.rb

@@ -383,8 +383,7 @@ module PodsOrz
 			else
 				pods_sort = PodsOrz::PodsSort.new()
 				kx_pods_subPath = @pods_git_operator.get_pod_file_path("")
-				pods_list =  pods_sort.sort(pods_list,kx_pods_subPath)
-					
+				pods_list =  pods_sort.sort(pods_list,kx_pods_subPath)	
 			end
 		
 			pods_list.each {|pod|

data/lib/podsorz/version.rb

@@ -1,3 +1,3 @@
 module PodsOrz
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli