podsorz 0.0.10 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 728879be777d0fc735cb208e256f5397a4930a712ae2da103fdf971698cde73c
-  data.tar.gz: 49e47437e30d2dbfa2ac8984ff0c8370e772c527c493183e0c6edd253ffc0797
+  metadata.gz: 1cda97fc6e3f8d32835447c79c16ee066b46e30e637ae1886c47d02ee5f713d7
+  data.tar.gz: fd509646cfb5c7e46990772350534dec9e372793a6760eb0b052ee09a1a351a4
 SHA512:
-  metadata.gz: 3627912e4815e19f3ac624017c952a581c9909d57140316e258f5d8e8162fd216fd67f45e1aca4221efcc1325a2223481e8ca7408e6773ac69545ec6d0ca7c9a
-  data.tar.gz: aa28aaafbbe094033e71380bde262f01b9401fa2ee5a15b9e73f1a2b8d5fd266da70a0dda2ba79040032b8d9348ad912828fe0cd703266f904ea91ac888d9811
+  metadata.gz: 9fa515f5789e098e8c203a16ff9c05616f32da7cc36fbd8274d486ba934ddec83563aa052c6ce16854d11531fe38e4ec1b2e1787dfd5d09d92810a302f847e66
+  data.tar.gz: 3f28e79b36f487470d94dca15b0334e81377004ea127e9d82aa6068f59b3fa9c411d7c62d1d59d5c2fbc23b028fd8cc4f7d4866b60d394cc07cce81c0562ec6d

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_CLEAN: "true"

data/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for rdebug-ide",
+            "type": "Ruby",
+            "request": "attach",
+            "cwd": "${workspaceRoot}",
+            "remoteHost": "127.0.0.1",
+            "remotePort": "1234",
+            "remoteWorkspaceRoot": "${workspaceRoot}"
+        }
+    ]
+}

data/lib/podsorz/command/binary.rb

@@ -14,7 +14,7 @@ module PodsOrz
 					prepare_work(dir_path)
 
 					git_manager = PodsOrz::PodsGitManager.new(dir_path)
-					result_hash = filter_binary_pods_list(git_manager, :package)
+					result_hash = filter_binary_pods_list(dir_path,git_manager, :package)
 					package_list = result_hash[:package]
 
 					binary_manager = PodsOrz::BinaryManager.new(dir_path)
@@ -32,7 +32,7 @@ module PodsOrz
 					prepare_work(dir_path)
 
 					git_manager = PodsOrz::PodsGitManager.new(dir_path)
-					filter_binary_pods_list(git_manager, :show)
+					filter_binary_pods_list(dir_path,git_manager, :show)
 				end
 					
 			end
@@ -45,7 +45,7 @@ module PodsOrz
 					prepare_work(dir_path)
 
 					git_manager = PodsOrz::PodsGitManager.new(dir_path)
-					result_hash = filter_binary_pods_list(git_manager, :package)
+					result_hash = filter_binary_pods_list(dir_path,git_manager, :package)
 					package_list = result_hash[:package]
 
 					binary_manager = PodsOrz::BinaryManager.new(dir_path)
@@ -59,12 +59,12 @@ module PodsOrz
 	end
 
 	def self.prepare_work(dir_path)
-		pods_repo = PodsOrz::PodsRepo.new()
+		pods_repo = PodsOrz::PodsRepo.new(dir_path)
 		pods_repo.check_repo_exist()
 	end
 
 
-	def self.filter_binary_pods_list(git_manager, cmd_type)
+	def self.filter_binary_pods_list(dir_path,git_manager, cmd_type)
 		result_hash = {
 			:binary => [],
 			:package => []
@@ -104,7 +104,7 @@ module PodsOrz
 		can_package_list = []
 
 		#2.查询Podfile_orz是否为已发版本状态
-		binary_repo = PodsOrz::BinaryRepo.new()
+		binary_repo = PodsOrz::BinaryRepo.new(dir_path)
 		binary_repo.check_binary_repo_exist()
 
 		origin_binary_list.each do |pod|
@@ -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/command/check.rb

@@ -1,6 +1,8 @@
 # require "podsorz/core/PodsOrz/pods_check_merge"
 # require "../../PodsOrz/lib/podsorz/core/PodsOrz/pods_check_merge.rb"
 require "podsorz/core/PodsOrz/pods_check_merge"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 module PodsOrz
 	def self.check_command
@@ -16,7 +18,8 @@ module PodsOrz
 					exit()
 				end
 
-                kx_pods_path = File.expand_path("../kx_pods", dir_path)
+				@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
+                kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", dir_path)
                 # puts "kx_pods_path #{kx_pods_path}"
 				checkManger = PodsOrz::PodsCheckMerge.new()
                 checkManger.branchList(kx_pods_path)

data/lib/podsorz/command/install.rb

@@ -18,7 +18,7 @@ module PodsOrz
 				exit() unless is_same
 
 				#获取binary 列表
-				list_hash = PodsOrz.filter_binary_pods_list(git_manager, :binary)
+				list_hash = PodsOrz.filter_binary_pods_list(dir_path,git_manager, :binary)
 
 				git_manager.install_pod(dir_path, list_hash[:binary])
 			end

data/lib/podsorz/command/sort.rb

@@ -15,8 +15,9 @@ module PodsOrz
 					exit()
 				end
 
-                kx_pods_path = File.expand_path("../kx_pods", dir_path)
+                
                 @orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
+				kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", dir_path)
                 pods_list = @orzconfig_parse.fix_pod_list
                 if pods_list.empty?
                     Logger.warning("fix_pods is empty nothing to do")

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

@@ -6,16 +6,17 @@ 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
 			@kx_binary_path = File.expand_path("../kx_binary", main_path)
 
 			@podfile_io = podfile_io
-			@pod_repo = PodsOrz::PodsRepo.new()
+			@pod_repo = PodsOrz::PodsRepo.new(main_path)
 
-			@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

@@ -11,7 +11,7 @@ module PodsOrz
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
 			@podfile_io = PodsOrz::PodfileIO.new(main_path)
 
-			@binary_repo = PodsOrz::BinaryRepo.new()
+			@binary_repo = PodsOrz::BinaryRepo.new(main_path)
 			@binary_repo.check_binary_repo_exist()
 
 			@binary_builder = PodsOrz::BinaryBuilder.new(main_path, @podfile_io)
@@ -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,21 @@
 require "podsorz/util/logger"
 require 'open3'
+require "podsorz/core/Binary/binary_server"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 module PodsOrz
 	class BinaryRepo
-		attr_accessor :repo_name, :repo_url
+		attr_accessor :repo_name, :repo_url, :binary_server
 
-		def initialize()
+		def initialize(main_path)
 			@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"
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			# 替换成config配置参数
+			# @source_code_repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+			@source_code_repo_url = @orzconfig_parse.remote_url_codespec
+			@binary_server = PodsOrz::BinaryServer.new()
 		end
 
 		def check_binary_repo_exist()
@@ -132,6 +139,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 +188,6 @@ module PodsOrz
           	is_push_success
 		end
 
-
-
-
 #Class End
 
 	end

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

@@ -1,21 +1,127 @@
 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}")
+
+					Open3.popen3(cmd_list.join(";")) do |stdin , stdout , stderr, wait_thr|
+						while line = stdout.gets
+							puts line
+							if line.include? "\"success\":"
+								is_upload_success = true if line.include? "true"
+								condition_var.signal
+							end
+						end
+					end
+
+					IO.popen(upload_cmd) do |io|
+						io_lines = io.readlines
+						io_lines.each do |line|
+							puts line
+							
+						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/Config/orz_config_templet.rb

@@ -1,31 +1,67 @@
-module GitConfig
-	#App 当前版本
-	APP_RELEASE_VERSION = "2.0.12"
-	
-	#作者姓名xiangqi简写
-	BRANCH_AUTHOR_SUFFIX = "xq" 
-end
+#############
+#开发人员专用
+#############
 
 #想要开发修改的的Pod
-    $FIX_POD_LIST = [
+$FIX_POD_LIST = [
 #        "KXModuleOrz",
 #        "KXModuleQuestionRepo",
-    ]
+]
+
+
+module GitConfig
+    #App 当前版本
+    APP_RELEASE_VERSION = "2.1.2"
+
+    #作者姓名xiangqi简写
+    BRANCH_AUTHOR_SUFFIX = "yyt"
 
 
 
-#------Binary Static library------#
+    #App pods的远端仓库地址 源码
+    REMOTE_URL_SOURCECODE = 'git@gitlab.91banban.com:zhuita-ios/pod_group/pods'
+    #App podspec的发布地址仓库
+    REMOTE_URL_CODESPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/specs.git'
+    #App 二进制存放地址 service
+    REMOTE_URL_SOURCEBINARY = 'http://192.168.6.127:8899'
+    #App 二进制 podspec的发布地址仓库
+    REMOTE_URL_BINARYSPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/specs.git'
+    
+end
+
+module FileConfig
+    #开发pods组件时仓库名称（需要与主工程同一级文件夹）
+    FILE_DEVPODS_NAME = 'zt_pods'
+
+    #ztPods/kxPods下的Pod源码库打包成二进制库相关 需要用到该行标识注释
+    FILE_PACKAGE_FILTER_MARK = 'ztPods'
+    
+    #与cocoapods同一级的私有repo仓库文件夹名称
+    FILE_CODEREPO_NAME = "ZhuiTaRepo"
+    
+    #与cocoapods同一级的私有二进制 repo仓库文件夹名称
+    FILE_BINARYREPO_NAME = "ZhuiTaRepo"
+    
+end
+    
+    
+
+
+
+#############
+#打包人员专用
+#############
+
+#------Binary Static library ------#
 #是否全部Pod以二进制静态库加载，false代表以源码显示【打包机】请用源码
-    $is_all_binary = false
+$is_all_binary = false
 #当is_all_binary = false 所有pod即将显示源码时，仍然希望部分Pod二进制静态库加载
-    $static_lib_list = [
+$static_lib_list = [
 #         "AFNetworking",
-    ]
+]
 
 #------Package Action------#
 #当is_all_binary = false 并不是针对所有pod 打binary包，仍然希望部分pod打包成二进制静态库的Pod
-    $will_package_list = [
+$will_package_list = [
 #        "AFNetworking",
-    ]
-
-#
+]

data/lib/podsorz/core/Config/orz_env_detector.rb

@@ -15,7 +15,7 @@ module PodsOrz
 			result = File.exist?(podfile_path)
 			unless result
 				Logger.warning("Podfile not exist, create empty Podfile")
-				IO.popen("cd #{directoryPath};touch Podfile")
+				IO.popen("cd #{directoryPath};pod init")
 			end
 		end
 
@@ -23,12 +23,30 @@ module PodsOrz
 			podfile_path = File.expand_path("Podfile_orz.rb", directoryPath)
 			result = File.exist?(podfile_path)
 			unless result
-				Logger.error("Podfile_orz.rb not exist, please manual makeup one. Copy content from project Podfile")	
+				Logger.error("Podfile_orz.rb not exist,auto generate one which content is copy from origin Podfile")
+				IO.popen("cd #{directoryPath};touch Podfile_orz.rb")
+				copy_content_from_podfile(directoryPath)
 			end
 			
 			result
 		end
 
+		def copy_content_from_podfile(directoryPath)
+			podfile_path = File.expand_path("Podfile", directoryPath)
+			total_sentences = []
+			File.open(podfile_path, "r") { |io|  
+				total_sentences = io.readlines
+			}
+
+			dest_path = File.expand_path("Podfile_orz.rb", directoryPath)
+			File.open(dest_path, "w+") {|io|
+				total_sentences.each do |sentence|
+					io.write(sentence)
+				end
+			}
+			
+		end
+
 		def detect_PodsOrzConfig(directoryPath)
 			orzconfig_path = File.expand_path("PodsOrzConfig.rb", directoryPath)
 			orzconfig_result = File.exist?(orzconfig_path)

data/lib/podsorz/core/Config/pod_orzconfig_parse.rb

@@ -3,7 +3,7 @@ require "podsorz/util/logger"
 
 module PodsOrz
 	class PodOrzconfigParse
-		attr_accessor :app_release_version, :branch_author_suffix, :fix_pod_list, :is_all_binary, :static_lib_list, :will_package_list
+		attr_accessor :app_release_version, :branch_author_suffix, :fix_pod_list, :is_all_binary, :static_lib_list, :will_package_list,:remote_url_sourcecode,:remote_url_codespec,:file_devpods_name, :file_package_filter_mark, :file_coderepo_name,:file_binaryrepo_name
 		
 		def initialize(main_path)
 			orzconfig_path = File.expand_path("PodsOrzConfig.rb", main_path)
@@ -22,6 +22,24 @@ module PodsOrz
 			@branch_author_suffix = GitConfig::BRANCH_AUTHOR_SUFFIX
 			@branch_author_suffix = "" if @branch_author_suffix.nil?
 
+			@remote_url_sourcecode = GitConfig::REMOTE_URL_SOURCECODE
+			@remote_url_sourcecode = "" if @remote_url_sourcecode.nil?
+
+			@remote_url_codespec = GitConfig::REMOTE_URL_CODESPEC
+			@remote_url_codespec = "" if @remote_url_codespec.nil?
+
+			@file_devpods_name = FileConfig::FILE_DEVPODS_NAME
+			@file_devpods_name = "" if @file_devpods_name.nil?
+
+			@file_package_filter_mark = FileConfig::FILE_PACKAGE_FILTER_MARK
+			@file_package_filter_mark = "" if @file_package_filter_mark.nil?
+
+			@file_coderepo_name = FileConfig::FILE_CODEREPO_NAME
+			@file_coderepo_name = "" if @file_coderepo_name.nil?
+
+			@file_binaryrepo_name = FileConfig::FILE_BINARYREPO_NAME
+			@file_binaryrepo_name = "" if @file_binaryrepo_name.nil?
+
 			@fix_pod_list = $FIX_POD_LIST
 			@fix_pod_list = [] if @fix_pod_list.nil?
 

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

@@ -1,22 +1,25 @@
 require "podsorz/util/logger"
 require "podsorz/core/PodFile/podfile_model"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 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"
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
 			self.parse_podfile_orz
 		end
 
 		def filter_binary_pod_models()
 			filter_result_models = []
 
-			filter_strings = ["sourceVendorPods", "subspecPods", "kxPods"]
+			filter_strings = ["sourceVendorPods", "subspecPods", @orzconfig_parse.file_package_filter_mark]
 
 			result_lines = []
 
@@ -103,7 +106,7 @@ module PodsOrz
 			pod_name_list.each do |podname|
 				@total_pod_models.map { |model|
 					if model.name.start_with? podname.to_s
-						model.path = "../kx_pods/" + podname.to_s
+						model.path = "../#{@orzconfig_parse.file_devpods_name}/" + podname.to_s
 					end
 				}
 			end
@@ -114,7 +117,8 @@ module PodsOrz
 			pod_name_list.each do |podname|
 				@total_pod_models.map { |model|
 					if model.name.start_with? podname.to_s
-						model.git = "git@gitlab.91banban.com:ios_pods/Pods/" + podname.to_s + ".git"
+						# 替换为config参数
+						model.git = "#{@orzconfig_parse.remote_url_sourcecode}/" + podname.to_s + ".git"
 						model.branch = branch_name.to_s
 					end
 				}
@@ -314,7 +318,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_check_merge.rb

@@ -32,7 +32,6 @@ module PodsOrz
       #     puts("branch- #{line}")
       #   end
       # }
-    #   @kx_pods_directory = File.expand_path("../kx_pods", File.dirname(__FILE__))
     #   puts "里层 #{@kx_pods_directory}"
 
 #       kx_pods_path /Users/yuyutao/Desktop/rubyGem/kx_pods

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

@@ -6,10 +6,10 @@ module PodsOrz
 		attr_accessor :kx_pods_path, :orzconfig_parse
 
 		def initialize(main_path)
-			@kx_pods_path = File.expand_path("../kx_pods", main_path)
-
-			detect_kx_pods(main_path)
+						
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			@kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
+			detect_kx_pods(main_path)
 		end
 
 		def check_directory(main_path)
@@ -26,8 +26,8 @@ module PodsOrz
 			if result
 				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)
+					Logger.warning("#{@orzconfig_parse.file_devpods_name} directory not exist, generate default directory")	
+					FileUtils.mkdir_p(@kx_pods_path, :mode => 0777)
 				end
 			end
 		end
@@ -63,7 +63,7 @@ module PodsOrz
 				result = false if file_entries.empty?
 				result = false unless file_entries.include?(".git")
 
-				Logger.error("【#{pod}】 at #{pod_path} exist, but .git not work success, please manual check.")	 unless result
+				Logger.error("【#{pod}】 at #{pod_path} exist, but .git not work success, please manual check.") unless result
 			else
 				result = clone_orz_pod(pod)
 			end
@@ -77,7 +77,8 @@ module PodsOrz
 
 			Logger.default("Start clone 【#{pod}】 Project...")
 			git_clone_content = ""
-			IO.popen("git clone git@gitlab.91banban.com:ios_pods/Pods/#{pod}.git #{pod_directory}", :err=>[:child, :out]) {|io|
+			# 替换为config参数
+			IO.popen("git clone #{@orzconfig_parse.remote_url_sourcecode}/#{pod}.git #{pod_directory}", :err=>[:child, :out]) {|io|
 				git_clone_content = io.read
 				puts(git_clone_content)
 				is_clone_success = false if git_clone_content.to_s.include? "fatal"

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

@@ -13,7 +13,7 @@ module PodsOrz
 		def initialize(main_path)
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
 
-			kx_pods_path = File.expand_path("../kx_pods", main_path)
+			kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
 			@pods_git_operator = PodsOrz::PodsGitOperator.new(kx_pods_path, @orzconfig_parse.app_release_version, @orzconfig_parse.branch_author_suffix)
 
 			@podfile_io = PodsOrz::PodfileIO.new(main_path)
@@ -21,7 +21,7 @@ module PodsOrz
 
 			@pods_version = PodsOrz::PodsVersion.new(main_path)
 
-			@pods_repo = PodsOrz::PodsRepo.new()
+			@pods_repo = PodsOrz::PodsRepo.new(main_path)
 		end
 
 #Switch Command --
@@ -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|
@@ -478,7 +477,7 @@ module PodsOrz
 			command.join
 
 			command = Thread.new do 
-				Open3.popen3("cd #{main_path};pod update --no-repo-update --verbose") do |stdin , stdout , stderr, wait_thr|
+				Open3.popen3("cd #{main_path};pod update") do |stdin , stdout , stderr, wait_thr|
 			        while line = stdout.gets
 				          puts line
 				    end

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

@@ -40,7 +40,7 @@ module PodsOrz
 
 		def switch_feature_pod(pod)
 			previous_branch = self.current_pod_branch(pod)
-			next_branch = "feature/" + "#{@author_suffix}" + "_#{@app_release_version}"
+			next_branch = "feature/" + "#{@author_suffix}"
 
 			is_ready = true
 			is_same = previous_branch.include? next_branch
@@ -116,7 +116,7 @@ module PodsOrz
 
 		def switch_bugfix_pod(pod)
 			previous_branch = self.current_pod_branch(pod)
-			next_branch = "bugfix/" + "#{@author_suffix}" + "_#{@app_release_version}"
+			next_branch = "bugfix/" + "#{@author_suffix}"
 
 			is_ready = true
 			is_same = previous_branch.include? next_branch

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

@@ -1,13 +1,18 @@
 require "podsorz/util/logger"
 require 'open3'
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 module PodsOrz
 	class PodsRepo
 		attr_accessor :repo_name, :repo_url
 
-		def initialize()
-			@repo_name = "kuxiu_specs"
-			@repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+		def initialize(main_path)
+			# @repo_name = "kuxiu_specs"
+			# 替换成config配置参数
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			@repo_url = @orzconfig_parse.remote_url_codespec
+			@repo_name = @orzconfig_parse.file_coderepo_name
 		end
 
 		def check_repo_exist

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

@@ -1,4 +1,5 @@
 require "podsorz/util/logger"
+require "podsorz/core/Config/pod_orzconfig_parse"
 
 
 module PodsOrz
@@ -6,7 +7,8 @@ module PodsOrz
 		attr_accessor :kx_pods_path
 
 		def initialize(main_path)
-			@kx_pods_path = File.expand_path("../kx_pods", main_path)
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			@kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
 		end
 
 		def increase_pod_version(pod)

data/lib/podsorz/util/git_operator.rb

@@ -24,7 +24,7 @@ module PodsOrz
       has_branch = false
       IO.popen("cd '#{path}';git branch") do |io|
         io.each do |line|
-          has_branch = true if line.include? branch_name
+          has_branch = true if line.strip.eql? branch_name
         end
 
         io.close
@@ -36,7 +36,8 @@ module PodsOrz
       has_branch = false
       IO.popen("cd '#{path}';git fetch --all;git branch -a") do |io|
         io.each do |line|
-          has_branch = true if line.include? branch_name
+          # has_branch = true if line.strip.eql? branch_name
+          has_branch = true if line.to_s.chomp.strip.end_with? branch_name
         end
 
         io.close

data/lib/podsorz/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.16
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -76,12 +76,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
 - ".rspec"
+- ".vscode/launch.json"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- Podfile
 - README.md
 - Rakefile
 - bin/podsorz
@@ -116,6 +117,12 @@ files:
 - lib/podsorz/util/logger.rb
 - lib/podsorz/util/process_operator.rb
 - lib/podsorz/version.rb
+- pkg/podsorz-0.0.10.gem
+- pkg/podsorz-0.0.11.gem
+- pkg/podsorz-0.0.12.gem
+- pkg/podsorz-0.0.7.gem
+- pkg/podsorz-0.0.8.gem
+- pkg/podsorz-0.0.9.gem
 - podsorz.gemspec
 homepage: https://github.com/XiangqiTu
 licenses: