podsorz 0.0.1

data/lib/podsorz/core/pods_git_operator.rb

@@ -0,0 +1,700 @@
+require "podsorz/util/logger"
+require "podsorz/util/git_operator"
+
+module PodsOrz
+
+	class PodsGitOperator
+		attr_accessor :kx_pods_path, :app_release_version, :author_suffix, :git_operator
+
+		def initialize(kx_pods_path, app_release_version, author_suffix)
+			@kx_pods_path = kx_pods_path
+			@app_release_version = app_release_version
+			@author_suffix = author_suffix
+
+			@git_operator = PodsOrz::GitOperator.new()
+		end
+
+		def get_pod_file_path(pod)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			
+			pod_file_path
+		end
+
+		def switch_develop_pod(pod)
+			previous_branch = self.current_pod_branch(pod)
+			next_branch = "develop"
+
+			is_ready = true
+			is_same = previous_branch.include? next_branch
+			if !is_same
+				#diff branch
+				is_ready = check_prepare_work(pod)
+				if is_ready
+					#switch to develop, auto fetch latest
+					self.ensure_develop_branch(pod)
+				end
+			end
+
+			is_ready
+		end
+
+		def switch_feature_pod(pod)
+			previous_branch = self.current_pod_branch(pod)
+			next_branch = "feature/" + "#{@author_suffix}" + "_#{@app_release_version}"
+
+			is_ready = true
+			is_same = previous_branch.include? next_branch
+			if !is_same
+				#diff branch
+				is_ready = check_prepare_work(pod)
+				if is_ready
+					pod_file_path = File.expand_path(pod, @kx_pods_path)
+					has_branch = @git_operator.has_branch(pod_file_path, next_branch)
+					if has_branch
+						@git_operator.checkout(pod_file_path, next_branch)
+					else
+						#feature new
+						self.ensure_develop_branch(pod)
+
+						feature_cmd_list = []
+						feature_cmd_list << "cd #{pod_file_path}"
+						feature_cmd_list << "git checkout -b #{next_branch}"
+
+						io_lines = []
+						IO.popen(feature_cmd_list.join(";")) do |io|
+							io_lines = io.readlines
+							io_lines.each do |line|
+								puts line
+							end
+							io.close
+						end
+					end
+					
+				end
+			end
+
+			is_ready
+		end
+
+		def switch_release_pod(pod)
+			previous_branch = self.current_pod_branch(pod)
+			next_branch = "release/" + "#{@app_release_version}"
+
+			is_ready = true
+			is_same = previous_branch.include? next_branch
+			if !is_same
+				#diff branch
+				is_ready = check_prepare_work(pod)
+				if is_ready
+					pod_file_path = File.expand_path(pod, @kx_pods_path)
+					has_branch = @git_operator.has_branch(pod_file_path, next_branch)
+					if has_branch
+						@git_operator.checkout(pod_file_path, next_branch)
+					else
+						#release new
+						self.ensure_develop_branch(pod)
+
+						release_cmd_list = []
+						release_cmd_list << "cd #{pod_file_path}"
+						release_cmd_list << "git checkout -b #{next_branch}"
+						release_cmd_list << "git push -u origin #{next_branch}"
+
+						io_lines = []
+						IO.popen(release_cmd_list.join(";")) do |io|
+							io_lines = io.readlines
+							io_lines.each do |line|
+								puts line
+							end
+							io.close
+						end
+					end
+				end
+			end
+
+			is_ready
+		end
+
+		def switch_bugfix_pod(pod)
+			previous_branch = self.current_pod_branch(pod)
+			next_branch = "bugfix/" + "#{@author_suffix}" + "_#{@app_release_version}"
+
+			is_ready = true
+			is_same = previous_branch.include? next_branch
+			if !is_same
+				#diff branch
+				is_ready = check_prepare_work(pod)
+				if is_ready
+					pod_file_path = File.expand_path(pod, @kx_pods_path)
+					has_branch = @git_operator.has_branch(pod_file_path, next_branch)
+					if has_branch
+						@git_operator.checkout(pod_file_path, next_branch)
+					else
+						#bugfix new
+						release_branch = "release/" + "#{@app_release_version}"
+						has_release_branch = @git_operator.has_branch(pod_file_path, release_branch)
+						if has_release_branch
+							bugfix_cmd_list = []
+							bugfix_cmd_list << "cd #{pod_file_path}"
+							bugfix_cmd_list << "git checkout #{release_branch}" unless previous_branch.include? release_branch
+							bugfix_cmd_list << "git fetch origin #{release_branch}"
+							bugfix_cmd_list << "git reset --hard origin/#{release_branch}"
+							bugfix_cmd_list << "git checkout -b #{next_branch}"
+
+							io_lines = []
+							IO.popen(bugfix_cmd_list.join(";")) do |io|
+								io_lines = io.readlines
+								io_lines.each do |line|
+									puts line
+								end
+								io.close
+							end
+						else
+							Logger.error("【#{pod}】not exist release branch: #{release_branch}")
+							is_ready = false
+						end
+					end
+					
+				end
+			end
+
+			is_ready
+		end
+			
+		def current_pod_branch(pod)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			branch = @git_operator.current_branch(pod_file_path)
+
+			branch
+		end
+
+		def check_prepare_work(pod)
+			is_ready = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			has_changes = @git_operator.has_changes(pod_file_path)
+			if has_changes
+				Logger.error("【#{pod}】 on branch: \"#{current_branch}\" has unstaged/uncommit changes, please staged and commit local first")
+				is_ready = false
+
+				return is_ready
+			end
+
+
+			has_commits_unpush = false
+			has_remote_branch = @git_operator.has_remote_branch(pod_file_path, current_branch)
+			unless has_remote_branch
+				Logger.warning("【#{pod}】 on branch: \'#{current_branch}\' is local branch, please do not forget to push remote in future.") 	
+			else
+				check_cmd_list = []
+				check_cmd_list << "cd #{pod_file_path}"
+				check_cmd_list << "git log --left-right #{current_branch}...origin/#{current_branch} --pretty=oneline"
+				io_lines = []
+				local_commits = []
+			    IO.popen(check_cmd_list.join(";")) do |io|
+			    	io_lines = io.readlines
+			    	io_lines.each do |line|
+			        	if line.include? "<"
+			        		has_commits_unpush = true 
+			        		local_commits << line
+			        	end
+			        end
+
+			        io.close
+			    end
+
+				if has_commits_unpush
+					Logger.separator
+					local_commits.each do |line|
+						puts line
+					end
+					Logger.separator
+
+					is_develop = current_branch.include? "develop"
+					is_release = current_branch.include? "release/"
+					if is_develop || is_release
+						Logger.error("【#{pod}】on branch: \'#{current_branch}\' forbidden local commit which will be reset hard by other operation.Please manual 'git checkout #{current_branch};git push' first")
+						is_ready = false
+					else
+						Logger.warning("【#{pod}】on branch: \'#{current_branch}\' has local commits that not push remote, please do not forget to push remote in future.")
+					end
+					
+				end
+			end
+
+			is_ready
+		end
+
+		def ensure_develop_branch(pod)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			has_branch = @git_operator.has_branch(pod_file_path, "develop")
+			current_branch = self.current_pod_branch(pod)
+
+			if !has_branch
+				#develop new
+				Logger.warning("\"#{pod}\" do not have develop branch, current branch is: \"#{current_branch}\", generate develop...")
+
+				develop_cmd_list = []
+				develop_cmd_list << "cd #{pod_file_path}"
+				develop_cmd_list << "git checkout master" unless current_branch.include? "master"
+				develop_cmd_list << "git fetch origin master"
+				develop_cmd_list << "git reset --hard origin/master"
+				develop_cmd_list << "git checkout -b develop"
+				develop_cmd_list << "git push -u origin develop"
+
+				io_lines = []
+				IO.popen(develop_cmd_list.join(";")) do |io|
+					io_lines = io.readlines
+					io_lines.each do |line|
+						puts line
+					end
+					io.close
+				end
+
+			else 
+				#fetch develop force
+				Logger.warning("\"#{pod}\" needs to ensure develop latest, forced!")
+
+				develop_cmd_list = []
+				develop_cmd_list << "cd #{pod_file_path}"
+				develop_cmd_list << "git checkout develop" unless current_branch.include? "develop"
+				develop_cmd_list << "git fetch origin develop"
+				develop_cmd_list << "git reset --hard origin/develop"
+
+				io_lines = []
+				IO.popen(develop_cmd_list.join(";")) do |io|
+					io_lines = io.readlines
+					io_lines.each do |line|
+						puts line
+					end
+					io.close
+				end
+			end
+		end
+
+		def commit_local(pod)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			has_changes = @git_operator.has_changes(pod_file_path)
+			if has_changes
+				Logger.default("请输入【#{pod}】提交的message备注:")
+				message = gets
+				message = "#{@author_suffix} 默认提交信息" if message.strip.empty?
+
+				@git_operator.commit(pod_file_path, message)
+			else
+				current_branch = self.current_pod_branch(pod)
+				Logger.default("【#{pod}】 on branch: \"#{current_branch}\" nothing to commit.")
+			end
+		end
+
+		def commit_push(pod)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			is_push_success = true
+
+			has_remote_branch = @git_operator.has_remote_branch(pod_file_path, current_branch)
+			unless has_remote_branch
+				@git_operator.push_to_remote(pod_file_path, current_branch)
+				return is_push_success
+			end
+
+
+			has_conflicts = false
+
+			pull_cmd_list = []
+			pull_cmd_list << "cd #{pod_file_path}"
+			pull_cmd_list << "git fetch origin #{current_branch}"
+			pull_cmd_list << "git pull --no-ff --no-squash --no-edit"
+			pull_io_lines = []
+			IO.popen(pull_cmd_list.join(";")) do |io|
+				pull_io_lines = io.readlines
+				pull_io_lines.each do |line|
+					has_conflicts = true if line.include? "Merge conflict"
+				end
+
+				io.close
+			end
+
+			if has_conflicts
+				Logger.error("【#{pod}】 on branch: \"#{current_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git commit\")(use \"git merge --abort\" to abort the merge)")
+				is_push_success = false
+			else
+				@git_operator.push_to_remote(pod_file_path, current_branch)
+			end
+
+			return is_push_success
+		end
+
+		def commit_notify(pod)
+			is_push_success = true
+
+			current_branch = self.current_pod_branch(pod)
+
+			#develop & release push remote
+			is_develop = current_branch.include? "develop"
+			is_release = current_branch.include? "release"
+
+			if is_develop || is_release
+				
+			end
+
+			#feature
+			is_feature = current_branch.include? "feature"
+			if is_feature
+				is_push_success = self.commit_notify_persional_branch(pod, "develop")
+			end
+
+			#bugfix
+			is_bugfix = current_branch.include? "bugfix"
+			if is_bugfix
+				is_push_success = self.commit_notify_persional_branch(pod, "release")
+			end
+			
+			is_push_success
+		end
+
+		def commit_notify_persional_branch(pod, parent_branch)
+			base_on_branch = ""
+			if parent_branch.include? "develop"
+				base_on_branch = "develop"
+			else
+				base_on_branch = "release/" + "#{@app_release_version}"
+			end
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			is_push_success = true
+			has_conflicts = false
+
+			rebase_cmd_list = []
+			rebase_cmd_list << "cd #{pod_file_path}"
+			rebase_cmd_list << "git fetch origin #{base_on_branch}"
+			rebase_cmd_list << "git rebase origin/#{base_on_branch}"
+			rebase_cmd_lines = []
+			IO.popen(rebase_cmd_list.join(";")) do |io|
+				rebase_cmd_lines = io.readlines
+				rebase_cmd_lines.each do |line|
+					has_conflicts = true if line.include? "Merge conflict"
+				end
+
+				io.close
+			end
+
+			if has_conflicts
+				Logger.error("【#{pod}】 on branch: \"#{current_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git rebase --continue\")(use \"git rebase --abort\" to abort the merge)")
+				is_push_success = false
+			else
+				force_push_cmd_list = []
+				force_push_cmd_list << "cd #{pod_file_path}"
+				force_push_cmd_list << "git push -f -u origin #{current_branch}"
+				IO.popen(force_push_cmd_list.join(";")) do |io|
+					io.each do |line|
+						puts line
+					end
+
+					Logger.highlight("【#{pod}】 on branch: \"#{current_branch}\" push remote success")
+					io.close
+				end
+
+				merge_cmd_list = []
+				merge_cmd_list << "cd #{pod_file_path}"
+				merge_cmd_list << "git checkout #{base_on_branch}"
+				merge_cmd_list << "git merge #{current_branch} --no-ff --no-squash --no-edit"
+				merge_cmd_list << "git push -u origin #{base_on_branch}"
+				IO.popen(merge_cmd_list.join(";")) do |io|
+					io.each do |line|
+						puts line
+					end
+
+					Logger.highlight("【#{pod}】 on branch: \"#{current_branch}\" Merge into #{base_on_branch} success")
+					io.close
+				end
+
+				local_branch_cmd_list = []
+				local_branch_cmd_list << "cd #{pod_file_path}"
+				local_branch_cmd_list << "git checkout #{current_branch}"
+				local_branch_cmd_list << "git push origin --delete #{current_branch}"
+
+				IO.popen(local_branch_cmd_list.join(";")) do |io|
+					io.each do |line|
+						puts line
+					end
+
+					Logger.highlight("【#{pod}】 on branch: \"#{current_branch}\" has deleted remote branch")
+					io.close
+				end
+			end
+
+			return is_push_success
+		end
+
+		def commit_version_increase(pod, version)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			message = "#{pod} version increase to \'#{version}\'"
+			@git_operator.commit(pod_file_path, message)
+
+			is_commit_success = self.commit_push(pod)
+
+			is_commit_success
+		end
+
+		def clear_modify_pod(pod)
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			clear_cmd_list = []
+			clear_cmd_list << "cd #{pod_file_path}"
+			clear_cmd_list << "git checkout ."
+			IO.popen(clear_cmd_list.join(";")) do |io|
+				Logger.default("#{pod} on branch is clear")
+				io.close
+			end
+		end
+
+		#Publish
+
+		def has_new_publish(pod)
+			is_new_content = true
+
+			is_new_content = is_publish_ready(pod)
+			return is_new_content unless is_new_content
+
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			fetch_cmd_list = []
+			fetch_cmd_list << "cd #{pod_file_path}"
+			fetch_cmd_list << "git fetch origin master"
+			IO.popen(fetch_cmd_list.join(";")) do |io|
+					io.each do |line|
+						puts line
+					end
+					io.close
+			end
+
+			diff_lines_list = []
+			diff_lines_list = @git_operator.compare_branch(pod_file_path, current_branch, "origin/master")
+
+			if diff_lines_list.empty?
+				is_new_content = false 
+				return is_new_content
+			end
+
+			is_new_content = false
+
+			Logger.warning("#{pod} on branch:\'#{current_branch}\' -- compare branch:\'origin/master\'")
+
+			should_show_detail = true
+			limit_count = 10
+
+			if diff_lines_list.size > limit_count
+				Logger.default("不同 commit 较多，是否显示全部 commit ？选择输入：[yes / no]") 
+				input_choose = gets
+				unless input_choose.downcase.include? "yes"
+					should_show_detail = false
+				end
+			end
+			
+			diff_lines_list.each do |line|
+				limit_count = limit_count -1 unless should_show_detail
+
+				puts line if limit_count >= 0
+
+				is_new_content = true if line.strip.chomp.include? "<"
+			end
+
+			is_new_content
+		end
+
+		def is_publish_ready(pod)
+			is_ready = true
+
+			#has un-staged un-cached
+			is_ready = check_prepare_work(pod)
+			return is_ready unless is_ready
+			
+			#fetch latest
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			unless current_branch.include? "release"
+				Logger.error("【#{pod}】current branch: #{current_branch}, is not release branch!")
+				is_ready = false
+				return is_ready
+			end
+
+			is_ready
+		end
+
+		def publish_merge(pod)
+			is_merge_success = true
+			
+			is_merge_success = is_publish_ready(pod)
+			return is_merge_success unless is_merge_success
+
+			double_check_alert(pod)
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = self.current_pod_branch(pod)
+
+			fetch_cmd_list = []
+			fetch_cmd_list << "cd #{pod_file_path}"
+			fetch_cmd_list << "git fetch origin #{current_branch}"
+			fetch_cmd_list << "git reset --hard origin/#{current_branch}"
+			IO.popen(fetch_cmd_list.join(";")) do |io|
+					io.each do |line|
+						puts line
+					end
+					io.close
+			end
+
+			is_merge_success = publish_merge_branch(pod, "master", current_branch)
+			return is_merge_success unless is_merge_success
+
+			is_merge_success = publish_merge_branch(pod, "develop", current_branch)
+
+			is_merge_success
+		end
+
+		def double_check_alert(pod)
+			Logger.warning("【#{pod}】 即将提交合并到主干分支，请再次确认无异常，选择输入：[continue / stop]")
+			force_fetch_input = gets
+			if force_fetch_input.downcase.include? "stop"
+				Logger.error("【#{pod}】中止，程序已停止")
+				exit()
+			end
+
+			unless force_fetch_input.downcase.include? "continue"
+				double_check_alert(pod)
+			end
+		end
+
+		def publish_merge_branch(pod, into_branch, from_branch)
+			is_merge_success = true
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+
+			merge_cmd_list = []
+			merge_cmd_list << "cd #{pod_file_path}"
+			merge_cmd_list << "git checkout #{into_branch}"
+			merge_cmd_list << "git fetch origin #{into_branch}"
+			merge_cmd_list << "git reset --hard origin/#{into_branch}"
+			merge_cmd_list << "git merge #{from_branch} --no-ff --no-squash --no-edit"
+
+			merge_cmd_lines = []
+			has_conflicts = false
+			IO.popen(merge_cmd_list.join(";")) do |io|
+				merge_cmd_lines = io.readlines
+				merge_cmd_lines.each do |line|
+					has_conflicts = true if line.include? "Merge conflict"
+				end
+
+				io.close
+			end
+
+			if has_conflicts
+				Logger.error("【#{pod}】 on branch: \"#{into_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git commit\")(use \"git merge --abort\" to abort the merge)")
+				is_merge_success = false
+				return is_merge_success
+			end
+
+			push_cmd_list = []
+			push_cmd_list << "cd #{pod_file_path}"
+			push_cmd_list << "git push -u origin #{into_branch}"
+			IO.popen(push_cmd_list.join(";")) do |io|
+				io.each do |line|
+					puts line
+				end
+
+				Logger.highlight("【#{pod}】from:#{from_branch} merge into branch: #{into_branch} success")
+				io.close
+			end
+
+			is_merge_success
+		end
+
+		def add_pod_tag(pod, version_num)
+			is_add_success = true
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+
+			tag_list = @git_operator.tag_list(pod_file_path)
+
+			has_tag = false
+			tag_list.each do |tag|
+				has_tag = true if tag.to_s.include? version_num
+			end
+
+			if has_tag
+				Logger.error("\'#{pod}\' -> #{version_num} git tag is exist, please increase #{pod}.podspec version number")
+				is_add_success = false
+				return is_add_success
+			end
+
+			tag_cmd_list = []
+			tag_cmd_list << "cd #{pod_file_path}"
+			tag_cmd_list << "git tag #{version_num}"
+			tag_cmd_list << "git push origin #{version_num}"
+			IO.popen(tag_cmd_list.join(";")) do |io|
+				io.each do |line|
+					puts line
+				end
+
+				Logger.highlight("\'#{pod}\' -> :#{version_num} tag add success")
+				io.close
+			end
+
+			is_add_success
+
+		end
+
+		def delete_pod_tag(pod, version_num)
+			is_delete_success = true
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+
+			tag_list = @git_operator.tag_list(pod_file_path)
+			has_tag = false
+			tag_list.each do |tag|
+				has_tag = true if tag.to_s.include? version_num
+			end
+
+			unless has_tag
+				Logger.warning("#{tag_list}, #{version_num}    delete			1")
+				Logger.warning("\'#{pod}\' -> #{version_num} git tag is not exist, nothing needs to delete")
+				return is_delete_success
+			end
+
+			tag_cmd_list = []
+			tag_cmd_list << "cd #{pod_file_path}"
+			tag_cmd_list << "git tag -d #{version_num}"
+			tag_cmd_list << "git push origin -d #{version_num}"
+			IO.popen(tag_cmd_list.join(";")) do |io|
+				io.each do |line|
+					puts line
+				end
+
+				Logger.highlight("\'#{pod}\' -> :#{version_num} tag delete success")
+				io.close
+			end
+
+			is_delete_success
+		end
+
+		def get_pod_git_tag(pod)
+			git_tag = "0.0.0"
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+
+			tag_list = @git_operator.tag_list(pod_file_path)
+			
+			return git_tag if tag_list.empty?
+
+			git_tag = tag_list.first.to_s
+
+			git_tag
+		end
+	end
+
+end