podsorz 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4917923f5a634c8bf8f212ac3d6621ab13eab6c9442f189bf45143a88a25036
-  data.tar.gz: 4a3caaa94b2a16a5a05c2da94901fd18dd4c300a6f8e7239636516f9310a1e61
+  metadata.gz: bd62dd4556e53831b2b078c24ea852a7c756288385a316ac86e38b3f4ae3a2be
+  data.tar.gz: 4d12c63701b3ea89a5096a7f440061940424b8e2ddc33fe1b7ef65200078b8cb
 SHA512:
-  metadata.gz: bac63452c1fae9ad3d222f33f7b9e302b453431ae86d3578f8ec958364826a6c9a21aabc523925ab0d8160050726cb78549eca3a35905ae5f5b8b24b763f7991
-  data.tar.gz: 445fb40a279eb2a916d255b52fde91f6c343abf460673eeae81242c10aaa8b1b894d53100e91c92ede85669adc9a17d9a0bfccc9df90fb89e462e6582a290ca2
+  metadata.gz: 216b722dbe1466edbc93c9051ea2e0f4a57324774d201c90f11b44c9adaed803fc49e9f381fb336dc60c817824290075ff673369098ad04e4e42a1a94a3ee386
+  data.tar.gz: da69be9b603987f84ff1a951f1582afefc8a0e647472d3dc89ae6924886823ac15088b3f0fe736e643b8a9ddbe6e65f8d217ebbda9a1facec677478ab09dc451

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|

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

@@ -13,7 +13,7 @@ module PodsOrz
 			@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.127:8899"
 			@remote_binary_directory = "binary_pod"

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)

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

@@ -1,15 +1,20 @@
 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, :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
 

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

@@ -51,15 +51,22 @@ module PodsOrz
 					
 					Logger.warning("upload #{file_name}...\n #{upload_cmd}")
 
-					IO.popen(upload_cmd) do |io|
-						io_lines = io.readlines
-						io_lines.each do |line|
+					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
 				}

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

@@ -1,31 +1,64 @@
-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"
+
 
 
+    #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'
+    
+    #与cocoapods同一级的私有repo仓库文件夹名称
+    FILE_CODEREPO_NAME = "ZhuiTaRepo"
+    
+    #与cocoapods同一级的私有二进制 repo仓库文件夹名称
+    FILE_BINARYREPO_NAME = "ZhuiTaRepo"
+    
+end
+    
+    
+
 
-#------Binary Static library------#
+
+#############
+#打包人员专用
+#############
+
+#------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_coderepo_name,:file_binaryrepo_name
 		
 		def initialize(main_path)
 			orzconfig_path = File.expand_path("PodsOrzConfig.rb", main_path)
@@ -22,6 +22,21 @@ 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_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,5 +1,7 @@
 require "podsorz/util/logger"
 require "podsorz/core/PodFile/podfile_model"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 module PodsOrz
 
@@ -10,14 +12,14 @@ module PodsOrz
 			@main_path = main_path
 			@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", "ztPods"]
 
 			result_lines = []
 
@@ -104,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
@@ -115,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
 				}

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,7 +26,7 @@ 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")	
+					Logger.warning("#{@orzconfig_parse.file_devpods_name} directory not exist, generate default directory")	
 					FileUtils.mkdir_p(@kx_pods_path, :mode => 0777)
 				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 --
@@ -477,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_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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-07-05 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: