podsorz 0.0.1

data/lib/podsorz/core/orz_config_templet.rb

@@ -0,0 +1,13 @@
+module GitConfig
+	#App 当前版本
+	APP_RELEASE_VERSION = "2.0.8" 
+	
+	#作者姓名xiangqi简写
+	BRANCH_AUTHOR_SUFFIX = "xq" 
+end
+
+#想要开发修改的的Pod
+	$FIX_POD_LIST = [
+#        "KXModuleOrz",
+#        "KXModuleQuestionRepo",
+	]

data/lib/podsorz/core/orz_env_detector.rb

@@ -0,0 +1,56 @@
+require "podsorz/util/logger"
+
+module PodsOrz
+	class OrzEnvDetector
+
+		def check_directory(directoryPath)
+			is_directory = File.directory?(directoryPath)
+			Logger.error("Detect failure, directory path error: #{directoryPath}") unless is_directory
+
+			is_directory
+		end
+
+		def detect_podfile(directoryPath)
+			podfile_path = File.expand_path("Podfile", directoryPath)
+			result = File.exist?(podfile_path)
+			unless result
+				Logger.warning("Podfile not exist, create empty Podfile")
+				IO.popen("cd #{directoryPath};touch Podfile")
+			end
+		end
+
+		def detect_podfile_orz(directoryPath)
+			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")	
+			end
+			
+			result
+		end
+
+		def detect_PodsOrzConfig(directoryPath)
+			orzconfig_path = File.expand_path("PodsOrzConfig.rb", directoryPath)
+			orzconfig_result = File.exist?(orzconfig_path)
+
+			generate_default_config(orzconfig_path) unless orzconfig_result
+		end
+
+		def generate_default_config(file_path)
+			Logger.warning("PodsOrzConfig not exist, generate default config")
+			file_name = File.basename(file_path)
+			directory = File.dirname(file_path)
+			IO.popen("cd #{directory};touch #{file_name}") { |io|
+				templet_config_path = File.expand_path("../core/orz_config_templet.rb", File.dirname(__FILE__))
+				File.open(templet_config_path, "r") { |templet_file|
+					File.open(file_path, "w+") { |file|  
+						templet_file.readlines.each {|line|
+							puts line
+							file.write(line)
+						} 
+					}
+				}
+			}
+		end
+	end
+end

data/lib/podsorz/core/pod_orzconfig_parse.rb

@@ -0,0 +1,24 @@
+require "podsorz/util/logger"
+
+
+module PodsOrz
+	class PodOrzconfigParse
+		attr_accessor :app_release_version, :branch_author_suffix, :fix_pod_list
+		
+		def initialize(main_path)
+			orzconfig_path = File.expand_path("PodsOrzConfig.rb", main_path)
+			orzconfig_result = File.exist?(orzconfig_path)
+
+			unless orzconfig_result
+				Logger.error("PodsOrzConfig.rb is not found. Please 'podsorz setup' first")	
+				exit()
+			end
+			
+			require orzconfig_path
+
+			@app_release_version = GitConfig::APP_RELEASE_VERSION
+			@branch_author_suffix = GitConfig::BRANCH_AUTHOR_SUFFIX
+			@fix_pod_list = $FIX_POD_LIST
+		end
+	end
+end

data/lib/podsorz/core/podfile_io.rb

@@ -0,0 +1,188 @@
+require "podsorz/util/logger"
+require "podsorz/core/podfile_model"
+require File.expand_path("../core/podfile_model.rb", File.dirname(__FILE__))
+
+module PodsOrz
+
+	class PodfileIO
+		attr_accessor :main_path, :total_sentences, :usable_sentences, :total_pod_models 
+
+		def initialize(main_path)
+			@main_path = main_path
+
+			self.parse_podfile_orz
+		end
+
+
+		def parse_podfile_orz
+			orz_file_path = File.expand_path("Podfile_orz.rb", @main_path)
+
+			@total_sentences = []
+			@usable_sentences = []
+			@total_pod_models = []
+
+			File.open(orz_file_path, "r") { |io|  
+				@total_sentences = io.readlines
+
+				@total_sentences.each { |orz_line|
+					orz_line_content = orz_line.strip.chomp
+					unless orz_line_content.empty? || orz_line_content.size.zero?
+						unless orz_line_content.start_with?("#")
+							@usable_sentences << orz_line
+
+							if orz_line_content.start_with?("pod ")
+								podfile_model = PodsOrz::PodfileModel.new(orz_line_content)
+								@total_pod_models << podfile_model
+							end
+						end 
+					end
+				}
+			}
+			
+		end
+
+
+		def output_local_pod(pod_name_list)
+			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
+					end
+				}
+			end
+		end
+
+
+		def output_orz_total_sentence(pod_name_list, branch_name)
+			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"
+						model.branch = branch_name.to_s
+					end
+				}
+			end
+
+			cocoas_podfile_path = File.expand_path("Podfile_orz.rb", @main_path)
+
+			output_pod_list = @total_pod_models.reject { |model|
+				pod_name = model.name
+				!pod_name_list.include? pod_name
+			}
+
+			File.open(cocoas_podfile_path, "w+") {|io|
+				Logger.highlight("Remote Podfile_orz.rb edite completed!")
+
+				@total_sentences.each do |sentence|
+					sentence_content = sentence.strip.chomp.to_s
+
+					is_sentence_comtent_empty = sentence_content.empty?
+					is_sentence_comtent_size_zero = sentence_content.size.zero?
+
+					unless is_sentence_comtent_empty || is_sentence_comtent_size_zero
+						unless sentence_content.start_with?("#")
+
+							output_pod_list.each do |model|
+								filter_str = "\'#{model.name}\'"
+								if sentence.include? filter_str
+									splite_list = sentence.split(filter_str)
+									sentence = splite_list[0].to_s + filter_str + ", :git => " + "\'#{model.git}\'" + ", :branch => " + "\'#{model.branch}\'"
+									if model.configurations
+										sentence = sentence + ", :configurations => " + model.configurations.to_s
+									end
+
+									puts(sentence.chomp + "\n")
+								end
+
+							end
+						end
+					end
+					io.write(sentence.chomp + "\n")
+				end
+			}
+
+		end
+
+
+		def output_local_total_sentence
+			cocoas_podfile_path = File.expand_path("Podfile", @main_path)
+
+			output_pod_list = @total_pod_models.reject { |model| 
+				path = model.path
+				path.to_s.empty?
+			}
+
+			File.open(cocoas_podfile_path, "w+") {|io|
+				Logger.highlight("Local Podfile edite completed!")
+
+				@usable_sentences.each do |sentence|
+					output_pod_list.each do |model|
+						filter_str = "\'#{model.name}\'"
+						if sentence.include? filter_str
+							splite_list = sentence.split(filter_str)
+							sentence = splite_list[0].to_s + filter_str + ", :path => " + "\'#{model.path.to_s}\'"
+							if model.configurations
+								sentence = sentence + ", :configurations => " + model.configurations.to_s
+							end
+
+							sentence = sentence + "\n"
+							puts(sentence)
+						end
+					end
+
+					io.write(sentence + "\n")
+				end
+			}
+		end
+
+		def output_publish_total_sentence(pod_hash)
+			pod_hash.each { |pod_name, version|
+				@total_pod_models.map { |model|
+					if model.name.start_with? pod_name.to_s
+						model.version = version
+					end
+				}
+			}
+
+			cocoas_podfile_path = File.expand_path("Podfile_orz.rb", @main_path)
+
+			output_pod_list = @total_pod_models.reject { |model|
+				pod_name = model.name
+				!pod_hash.include? pod_name
+			}
+
+			File.open(cocoas_podfile_path, "w+") {|io|
+				Logger.highlight("Remote Podfile_orz.rb edite completed!")
+
+				@total_sentences.each do |sentence|
+					sentence_content = sentence.strip.chomp.to_s
+					
+					is_sentence_comtent_empty = sentence_content.empty?
+					is_sentence_comtent_size_zero = sentence_content.size.zero?
+
+					unless is_sentence_comtent_empty || is_sentence_comtent_size_zero
+						unless sentence_content.start_with?("#")
+
+							output_pod_list.each do |model|
+								filter_str = "\'#{model.name}\'"
+								if sentence.include? filter_str
+									splite_list = sentence.split(filter_str)
+									sentence = splite_list[0].to_s + filter_str + ", \'#{model.version}\'"
+									if model.configurations
+										sentence = sentence + ", :configurations => " + model.configurations.to_s
+									end
+
+									puts(sentence.chomp + "\n")
+								end
+
+							end
+						end
+					end
+
+					io.write(sentence.chomp + "\n")
+				end
+			}
+		end
+
+	end
+end

data/lib/podsorz/core/podfile_model.rb

@@ -0,0 +1,34 @@
+
+module PodsOrz
+
+  class PodfileModel
+
+    attr_accessor :name, :git, :path, :configurations, :branch,:tag, :version
+
+    def initialize(sentence)
+      sentence_slip_list = sentence.split(',')
+      return if sentence_slip_list.size.zero?
+
+      for piece in sentence_slip_list do
+          if /:git =>/ =~ piece
+            @git = $~.post_match.strip
+          elsif /:path =>/ =~ piece
+            @path = $~.post_match.strip
+          elsif /:configurations =>/ =~ piece
+            @configurations = $~.post_match.strip
+          elsif /:branch =>/ =~ piece
+            @branch = $~.post_match.strip
+          elsif /:tag =>/ =~ piece
+            @tag = $~.post_match.strip
+          elsif /pod /=~ piece
+            @name = $~.post_match.delete("'\n ")
+          end
+      end 
+
+      # puts %Q{model name:#{@name},git:#{@git},path:#{@path},config:#{@configurations},branch:#{@branch},tag:#{@tag}}
+       
+    end
+
+  end
+
+end

data/lib/podsorz/core/pods_detector.rb

@@ -0,0 +1,96 @@
+require "podsorz/core/pod_orzconfig_parse"
+require "podsorz/util/logger"
+
+module PodsOrz
+	class PodsDetector
+		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)
+		end
+
+		def check_directory(main_path)
+			is_directory = File.directory?(main_path)
+			Logger.error("Detect failure, it is not a directory path: #{main_path}") unless is_directory
+
+			is_directory
+		end
+
+		def detect_kx_pods(main_path)
+
+			result = check_directory(main_path)
+
+			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)
+				end
+			end
+		end
+
+		def start_detector()
+			if @orzconfig_parse.fix_pod_list.empty?
+				Logger.warning("Fix pod list is empty, there is nothings to do, please setup 'FIX_POD_LIST' in \"PodsOrzConfig.rb\"")
+			else
+				ensure_kxpods_exist()
+			end
+		end
+
+		def ensure_kxpods_exist()
+			pods_list = @orzconfig_parse.fix_pod_list
+			is_clone_success = true
+			pods_list.each {|pod|
+				command = Thread.new do 
+					each_result = detect_pod(pod)
+					is_clone_success = false unless each_result
+				end
+
+				command.join
+			}
+
+			exit() unless is_clone_success
+		end
+
+		def detect_pod(pod)
+			pod_path = File.expand_path(pod, @kx_pods_path)
+			result = File.directory?(pod_path)
+			if result
+				file_entries = Dir.entries(pod_path)
+				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
+			else
+				result = clone_orz_pod(pod)
+			end
+
+			result
+		end
+
+		def clone_orz_pod(pod)
+			is_clone_success = true
+			pod_directory = File.expand_path(pod, @kx_pods_path)
+
+			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|
+				git_clone_content = io.read
+				puts(git_clone_content)
+				is_clone_success = false if git_clone_content.to_s.include? "fatal"
+			}
+
+			if is_clone_success
+				Logger.highlight("Clone 【#{pod}】 success!")
+			else
+				Logger.error("Clone 【#{pod}】 failure!")
+			end
+
+			is_clone_success
+		end		
+
+	end
+end

data/lib/podsorz/core/pods_git_manager.rb

@@ -0,0 +1,429 @@
+require "podsorz/core/pod_orzconfig_parse"
+require "podsorz/core/pods_git_operator"
+require "podsorz/core/podfile_io"
+require "podsorz/core/pods_version"
+require "podsorz/core/pods_repo"
+require 'open3'
+
+module PodsOrz
+	class PodsGitManager
+		attr_accessor :main_path, :orzconfig_parse, :pods_git_operator, :podfile_io, :pods_version, :pods_repo
+
+		def initialize(main_path)
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+
+			kx_pods_path = File.expand_path("../kx_pods", 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)
+			@podfile_io.output_local_pod(@orzconfig_parse.fix_pod_list)
+
+			@pods_version = PodsOrz::PodsVersion.new(main_path)
+
+			@pods_repo = PodsOrz::PodsRepo.new()
+		end
+
+#Switch Command --
+
+		def switch_develop_state()
+			is_switch_success = true
+			pods_list = @orzconfig_parse.fix_pod_list
+
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】 begin switch develop...")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.switch_develop_pod(pod)
+					is_switch_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+			exit() unless is_switch_success
+		end
+
+		def switch_feature_state()
+			is_switch_success = true
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】 begin switch feature...")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.switch_feature_pod(pod)
+					is_switch_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+			exit() unless is_switch_success
+		end
+
+		def switch_release_state()
+			is_switch_success = true
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】 begin switch release...")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.switch_release_pod(pod)
+					is_switch_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+			exit() unless is_switch_success
+			
+		end
+
+		def switch_bugfix_state()
+			is_switch_success = true
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】 begin switch bugfix...")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.switch_bugfix_pod(pod)
+					is_switch_success = false unless each_result	
+				end
+				
+				command.join
+				Logger.separator
+			}
+			exit() unless is_switch_success
+		end
+
+#Commit Command --
+
+		def pod_commit(is_push, is_notify)
+			is_push_success = true
+
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】 begin commit ...\n")
+
+				command = Thread.new do
+					@pods_git_operator.commit_local(pod)
+
+					if is_push
+						is_push_success = @pods_git_operator.commit_push(pod)	
+					end
+					
+					if is_notify && is_push_success
+						is_push_success = @pods_git_operator.commit_notify(pod)
+					end
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_push_success
+
+			if is_push && is_notify
+				update_push_podfile_io
+			end
+		end
+
+		def update_push_podfile_io
+			branch_name = fetch_pods_branch_name()
+
+			is_develp = branch_name.include? 'develop'
+			is_feature = branch_name.include? 'feature'
+			result = "develop" if is_develp || is_feature
+
+			is_release = branch_name.include? "release" 
+			is_bugfix = branch_name.include? "bugfix"
+			result = "release/" + "#{@orzconfig_parse.app_release_version}" if is_release || is_bugfix
+
+			@podfile_io.output_orz_total_sentence(@orzconfig_parse.fix_pod_list, result)
+		end
+
+		def fetch_pods_branch_name
+			return "" if @orzconfig_parse.fix_pod_list.empty?
+
+			first_pod = @orzconfig_parse.fix_pod_list.first
+
+			branch_name = @pods_git_operator.current_pod_branch(first_pod)
+
+			branch_name
+		end
+
+		def ensure_pods_branch()
+			pods_list = @orzconfig_parse.fix_pod_list
+
+			is_same = true
+			branch_name = ""
+			output_lines = []
+
+			pods_list.each do |pod|
+				command = Thread.new do 
+					b_name = @pods_git_operator.current_pod_branch(pod)
+					if branch_name.empty?
+						branch_name = b_name
+					end
+
+					unless b_name.eql?(branch_name)
+						is_same = false 
+					end
+
+					output_lines << "'#{pod}' current_branch: #{b_name}"
+				end
+				
+				command.join
+			end
+
+			unless is_same
+				Logger.error("Fix pod list branch error.Not all pods branch is the same state")
+				output_lines.each do |line|
+					puts line
+				end
+			end
+
+			is_same
+		end
+
+#Publish Command --
+
+		def start_repo_publish
+			#1.判断 release 是否存在新的commit内容
+			newContent_pod_list = filter_newContent_pods()
+
+			if newContent_pod_list.empty?
+				Logger.warning("All pods do not have new content to publish")
+			else
+				Logger.highlight("Pods have new content to publish ")
+				newContent_pod_list.each do |pod|
+					puts " - #{pod}"
+				end
+
+				#2.Podspec versoin
+				increase_pods_version(newContent_pod_list)
+
+				#3.Merge into master / develop
+				publish_master_develop_branch(newContent_pod_list)
+
+				#4.Tag
+				add_publish_tag(newContent_pod_list)
+			end
+
+			#5.Repo push
+			@pods_repo.check_repo_exist
+
+			pods_repo_push
+			
+			#6.Update Podfile_orz
+			update_publish_podfile_orz
+		end
+
+		def filter_newContent_pods()
+			newContent_pod_list = []
+			#filter action
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				command = Thread.new do 
+					is_new_publish = @pods_git_operator.has_new_publish(pod)	
+					newContent_pod_list << pod if is_new_publish
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			newContent_pod_list
+		end
+
+		def increase_pods_version(pods_list)
+			is_increase_success = true
+
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】start increase podspec version ...\n")
+
+				command = Thread.new do 
+					version_number = @pods_version.increase_pod_version(pod)	
+
+					if version_number.empty?
+						is_increase_success = false
+						@pods_git_operator.clear_modify_pod(pod)
+					else
+						#3.version update 提交commit 
+						commit_success = @pods_git_operator.commit_version_increase(pod, version_number)
+						unless commit_success
+							is_increase_success = false
+							@pods_git_operator.clear_modify_pod(pod)
+						end
+					end
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_increase_success
+		end
+
+		def publish_master_develop_branch(pods_list)
+			is_publish_success = true
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】start merge into master & develop ...\n")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.publish_merge(pod)
+					is_publish_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_publish_success
+		end
+
+		def add_publish_tag(pods_list)
+			is_add_success = true
+			pods_list.each {|pod|
+				tag = @pods_version.get_podspec_version(pod)
+				if tag.empty?
+					is_add_success = false
+					exit()
+				end
+
+				Logger.default("【#{pod}】will add tag: #{tag} \n")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.add_pod_tag(pod, tag)
+					is_add_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_add_success
+		end
+
+		def delete_publish_tag(pods_list)
+			pods_list.each {|pod|
+				tag = @pods_version.get_podspec_version(pod)
+				if tag.empty?
+					exit()
+				end
+
+				Logger.default("【#{pod}】will delete tag: #{tag} \n")
+
+				command = Thread.new do 
+					@pods_git_operator.delete_pod_tag(pod, tag)
+				end
+
+				command.join
+				Logger.separator
+			}
+		end
+
+		def pods_repo_push
+			is_push_success = true
+
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】check pod_version, git_tag, remote_version...")
+
+				command = Thread.new do 
+					p_version = @pods_version.get_podspec_version(pod)
+					if p_version.empty? 
+						is_push_success = false
+						exit()
+					end
+
+					git_tag = @pods_git_operator.get_pod_git_tag(pod)
+					local_result = @pods_repo.ensure_local_pod_version_tag(pod, p_version, git_tag)
+					case local_result
+					when -1
+						#error
+						is_push_success = false
+						exit()
+					when 0
+						#the same version, push ready
+					when 1
+						#need add new git tag
+						is_add_success = @pods_git_operator.add_pod_tag(pod, p_version)
+					end
+
+					remote_result = @pods_repo.ensure_remote_pod_version(pod, p_version)
+					case remote_result
+					when -1
+						#error
+						is_push_success = false
+						exit()
+					when 0
+						#the same version, nothing to update
+					when 1
+						#update remote
+						file_path = @pods_git_operator.get_pod_file_path(pod)
+						is_update_success = @pods_repo.push_pod_remote(pod, file_path, p_version)
+						unless is_update_success
+							delete_tag_list = []
+							delete_tag_list << pod
+							delete_publish_tag(delete_tag_list)
+
+							is_push_success = false
+							exit()
+						end
+					end
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_push_success
+
+		end
+
+		def update_publish_podfile_orz
+			is_update_success = true
+			pod_hash = Hash.new()
+
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				command = Thread.new do 
+					pod_version = @pods_version.get_podspec_version(pod)
+					if pod_version.empty?
+						is_update_success = false
+						exit()
+					end
+
+					pod_hash[pod] = pod_version
+				end
+
+				command.join
+			}
+			
+			exit() unless is_update_success
+
+			@podfile_io.output_publish_total_sentence(pod_hash)
+		end
+
+#Install Command --
+
+		def install_pod(main_path)
+			command = Thread.new do 
+				@pods_repo.check_repo_exist
+				@podfile_io.output_local_total_sentence
+			end
+
+			command.join
+
+			command = Thread.new do 
+				Open3.popen3("cd #{main_path};pod update --no-repo-update --verbose") do |stdin , stdout , stderr, wait_thr|
+			        while line = stdout.gets
+				          puts line
+				    end
+			    end
+			end
+
+			command.join
+		end
+	end
+end