podsorz 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c817bbde2a999fb5a286e8e15b2a25427b07865e11e62297b296d4539770ad40
-  data.tar.gz: 8586b8f32cfb1d2ba847d30cacf806f044483e2fb6e57e2fdb6ee41d9f5ae98c
+  metadata.gz: c960d70973147909a6a1898da3101b1655a2a08426a90ae9c39cfbb7a838ffcd
+  data.tar.gz: fa464fe262693347b34eef283f83200571376124b60039c69ded9f688daf6575
 SHA512:
-  metadata.gz: bfc2ab6a02268c30887d20242676df8ea8c82cb294239e44cd4dfed9507969c8da74b6cd697806df127c31eda35637ec316c25e11c205ae98cad166f1c96d824
-  data.tar.gz: 6b90b63373e2e80461611e0c6a5f20d716bf0bcb2e685e2dfbdb38117a0e040b233f804ba9917a7c3891eb6810f9ae871587f29dc1d0466d9744a968517ae051
+  metadata.gz: 979c4ee2d0dbf7d788aa5a9cab14633850c0c7d36ce7297356f2919aa5fc620ce578b995d25cce96d28453b828f381271fadc0f6b1d993624a088d7520316ef9
+  data.tar.gz: 649d4d2148002e5cdcb7140ee9553946f50f9747adf7d8e5da9ac79845ed8ea973785c679b2afe5a9b93b6e97b78fecc7320c26d4d5b208d6a8ff28d17a597a8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    podsorz (0.0.1)
+    podsorz (0.0.2)
       cocoapods
       colorize
       gli (~> 2.16)
@@ -80,7 +80,6 @@ GEM
     nap (1.1.0)
     netrc (0.11.0)
     public_suffix (4.0.6)
-    rake (10.5.0)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
     typhoeus (1.4.0)
@@ -98,12 +97,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
-  cocoapods
-  colorize
-  gli (~> 2.16)
   podsorz!
-  rake (~> 10.0)
 
 BUNDLED WITH
    1.17.2

data/Note

@@ -0,0 +1,3 @@
+
+gem build
+gem push

data/lib/podsorz.rb

@@ -6,6 +6,7 @@ require "podsorz/command/switch"
 require "podsorz/command/commit"
 require "podsorz/command/publish"
 require "podsorz/command/install"
+require "podsorz/command/sync"
 
 require 'gli'
 
@@ -28,6 +29,7 @@ module PodsOrz
   commit_command()
   publish_command()
   install_command()
+  sync_command()
 
   desc "Show podsorz version"
   command :version do |version|

data/lib/podsorz/command/sync.rb

@@ -0,0 +1,32 @@
+require "podsorz/core/pods_detector"
+require "podsorz/core/pods_git_manager"
+
+module PodsOrz
+	def self.sync_command
+		desc "Sync current_branch latest code from origin/current_branch or --rebase=‘other_branch’ "
+		command :sync do |sync|
+			sync.flag [:r, :rebase], :desc => "set rebase command on 'other_branch' "
+
+			sync.example "podsorz sync", desc:"current_branch 'git pull --rebase' "
+			sync.example "podsorz sync -r release", desc:"1.current_branch 'git pull --rebase', 2.sync commit from release"
+			sync.example "podsorz sync --rebase=feature/xq_2.0.0", desc:"1.current_branch 'git pull --rebase', 2.sync commit from feature/xq_2.0.0"
+
+			sync.action do |global_options, options, args|
+				other_branch = options[:rebase]
+				other_branch = other_branch.to_s.strip.chomp
+
+				dir_path = global_options[:path]
+
+				detector = PodsOrz::PodsDetector.new(dir_path)
+				detector.start_detector()
+
+				git_manager = PodsOrz::PodsGitManager.new(dir_path)
+				is_same = git_manager.ensure_pods_branch()
+				exit() unless is_same
+
+				git_manager.cmd_sync_pod(other_branch)
+			end
+		end
+	end
+
+end

data/lib/podsorz/core/podfile_io.rb

@@ -1,6 +1,5 @@
 require "podsorz/util/logger"
 require "podsorz/core/podfile_model"
-require File.expand_path("../core/podfile_model.rb", File.dirname(__FILE__))
 
 module PodsOrz
 

data/lib/podsorz/core/pods_git_manager.rb

@@ -98,7 +98,7 @@ module PodsOrz
 #Commit Command --
 
 		def pod_commit(is_push, is_notify)
-			is_push_success = true
+			is_commit_success = true
 
 			pods_list = @orzconfig_parse.fix_pod_list
 			pods_list.each {|pod|
@@ -108,11 +108,13 @@ module PodsOrz
 					@pods_git_operator.commit_local(pod)
 
 					if is_push
-						is_push_success = @pods_git_operator.commit_push(pod)	
+						is_push_success = @pods_git_operator.commit_push(pod)
+						is_commit_success = false unless is_push_success	
 					end
 					
 					if is_notify && is_push_success
-						is_push_success = @pods_git_operator.commit_notify(pod)
+						is_notify_success = @pods_git_operator.commit_notify(pod)
+						is_commit_success = false unless is_notify_success
 					end
 				end
 
@@ -120,7 +122,7 @@ module PodsOrz
 				Logger.separator
 			}
 
-			exit() unless is_push_success
+			exit() unless is_commit_success
 
 			if is_push && is_notify
 				update_push_podfile_io
@@ -202,8 +204,8 @@ module PodsOrz
 				#2.Podspec versoin
 				increase_pods_version(newContent_pod_list)
 
-				#3.Merge into master / develop
-				publish_master_develop_branch(newContent_pod_list)
+				#3.Merge into master
+				publish_master_branch(newContent_pod_list)
 
 				#4.Tag
 				add_publish_tag(newContent_pod_list)
@@ -216,6 +218,9 @@ module PodsOrz
 			
 			#6.Update Podfile_orz
 			update_publish_podfile_orz
+
+			#7.Merge into develop
+			publish_develop_branch(newContent_pod_list)
 		end
 
 		def filter_newContent_pods()
@@ -264,13 +269,30 @@ module PodsOrz
 			exit() unless is_increase_success
 		end
 
-		def publish_master_develop_branch(pods_list)
+		def publish_master_branch(pods_list)
 			is_publish_success = true
 			pods_list.each {|pod|
-				Logger.default("【#{pod}】start merge into master & develop ...\n")
+				Logger.default("【#{pod}】start merge into master ...\n")
 
 				command = Thread.new do 
-					each_result = @pods_git_operator.publish_merge(pod)
+					each_result = @pods_git_operator.publish_merge(pod, "master")
+					is_publish_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_publish_success
+		end
+
+		def publish_develop_branch(pods_list)
+			is_publish_success = true
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】start merge into develop ...\n")
+
+				command = Thread.new do 
+					each_result = @pods_git_operator.publish_merge(pod, "develop")
 					is_publish_success = false unless each_result
 				end
 
@@ -425,5 +447,27 @@ module PodsOrz
 
 			command.join
 		end
+
+#Sync Command --
+		def cmd_sync_pod(rebase_branch)
+			is_sync_success = true
+
+			pods_list = @orzconfig_parse.fix_pod_list
+			pods_list.each {|pod|
+				Logger.default("【#{pod}】 begin sync ...\n")
+
+				command = Thread.new do
+					each_result = @pods_git_operator.sync_pod(pod, rebase_branch)
+					is_sync_success = false unless each_result
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			exit() unless is_sync_success
+				
+		end	
+
 	end
 end

data/lib/podsorz/core/pods_git_operator.rb

@@ -214,7 +214,7 @@ module PodsOrz
 					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")
+						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.")
@@ -296,35 +296,19 @@ module PodsOrz
 
 			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)
+				is_push_success = @git_operator.push_to_remote(pod_file_path, current_branch)
 				return is_push_success
 			end
 
+			is_pull_success = @git_operator.pull(pod_file_path, current_branch, false)
 
-			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
+			if is_pull_success
+				is_push_success = @git_operator.push_to_remote(pod_file_path, current_branch)
 			else
-				@git_operator.push_to_remote(pod_file_path, current_branch)
+				is_push_success = false
 			end
 
-			return is_push_success
+			is_push_success
 		end
 
 		def commit_notify(pod)
@@ -365,25 +349,10 @@ module PodsOrz
 
 			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
+			is_rebase_success = @git_operator.rebase(pod_file_path, base_on_branch)
 
-			if has_conflicts
+			unless is_rebase_success
 				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
@@ -530,14 +499,12 @@ module PodsOrz
 			is_ready
 		end
 
-		def publish_merge(pod)
+		def publish_merge(pod, merge_into_branch)
 			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)
 
@@ -546,33 +513,17 @@ module PodsOrz
 			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
+				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 = publish_merge_branch(pod, merge_into_branch, 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)
@@ -604,6 +555,7 @@ module PodsOrz
 			push_cmd_list = []
 			push_cmd_list << "cd #{pod_file_path}"
 			push_cmd_list << "git push -u origin #{into_branch}"
+			push_cmd_list << "git checkout #{from_branch}"
 			IO.popen(push_cmd_list.join(";")) do |io|
 				io.each do |line|
 					puts line
@@ -695,6 +647,175 @@ module PodsOrz
 
 			git_tag
 		end
+
+#sync cmd
+
+		def sync_pod(pod, rebase_branch)
+			is_sync_success = true
+
+			is_ready = check_prepare_work(pod)
+			unless is_ready
+				is_sync_success = false
+				return is_sync_success
+			end
+
+			#pull
+			is_pull_success = sync_current_branch_pull(pod)
+			unless is_pull_success
+				is_sync_success = false
+				return is_sync_success
+			end
+			
+			#rebase
+			rebase_branch = rebase_branch.strip.chomp
+			if rebase_branch.empty?
+				return is_check_success
+			end
+
+			is_prepare_rebase = sync_prepare_rebase(pod, rebase_branch)
+			unless is_prepare_rebase
+				is_sync_success = false
+				return is_sync_success
+			end
+
+			is_rebase_success = sync_rebase(pod, rebase_branch)
+			unless is_rebase_success
+				is_sync_success = false
+				return is_sync_success
+			end
+
+			is_sync_success
+		end
+
+		def sync_current_branch_pull(pod)
+			is_pull_success = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = @git_operator.current_branch(pod_file_path)
+
+			has_remote_branch = @git_operator.has_remote_branch(pod_file_path, current_branch)
+			if has_remote_branch
+				is_pull_success = @git_operator.pull(pod_file_path, current_branch, false)
+			end
+			
+			is_pull_success
+		end
+
+		def sync_prepare_rebase(pod, rebase_branch)
+			is_check_success = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			has_branch = @git_operator.has_branch(pod_file_path, rebase_branch)
+			unless has_branch
+				Logger.error("branch '#{rebase_branch}' is not exist")
+				is_check_success = false
+				return is_check_success
+			end
+
+			is_check_success
+		end
+
+		def sync_rebase(pod, rebase_branch)
+			is_rebase_success = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = @git_operator.current_branch(pod_file_path)
+
+			is_rebase_branch_check = sync_rebase_branch_check(pod, rebase_branch)
+			unless is_rebase_branch_check
+				is_rebase_success = false
+				return is_rebase_success
+			end
+
+			#personal
+			is_rebase_success = sync_personal_rebase(pod, rebase_branch)
+
+			is_rebase_success
+		end
+
+		def sync_rebase_branch_check(pod, rebase_branch)
+			is_check_success = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = @git_operator.current_branch(pod_file_path)
+
+			#1.except develop
+			cmp_result = current_branch.casecmp("develop")
+			if cmp_result == 0
+				Logger.error("CMD of sync which current_branch can't be 'develop','develop' not support --rebase")
+				is_check_success = false
+				return is_check_success
+			end
+
+			#2.except release rebase
+			is_current_release_branch = current_branch.include? "release"
+			if is_current_release_branch
+				Logger.error("CMD of sync which current_branch is '#{current_branch}','release' not support --rebase, switch 'bugfix' branch, 'podsorz sync --rebase=develop' instead")
+				is_check_success = false
+				return is_check_success
+			end
+
+			#3.except rebase myself
+			cmp_result = current_branch.casecmp(rebase_branch)
+			if cmp_result == 0
+				Logger.error("CMD of sync which current_branch :#{current_branch} can't --rebase itself ")
+				is_check_success = false
+				return is_check_success
+			end
+
+			is_check_success
+		end
+
+		def sync_personal_rebase(pod, rebase_branch)
+			is_rebase_success = true
+
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = @git_operator.current_branch(pod_file_path)
+
+			Logger.default("【#{pod}】 current_branch:#{current_branch} --rebase=#{rebase_branch} start...") 
+			p_rebase_success = @git_operator.rebase(pod_file_path, rebase_branch)
+
+			unless p_rebase_success
+				is_rebase_success = false
+				Logger.warning("【#{pod}】--rebase=#{rebase_branch} 冲突，请手动解决冲突，并且进行后续强推个人分支操作('git push -f -u orogin #{current_branch}')。切勿反复调用 podsorz sync --rebase=#{rebase_branch} 带来未知情况的错误")
+				return is_rebase_success
+			end
+
+			#Personal branch diverged
+			has_div = @git_operator.has_diverged(pod_file_path)
+			if has_div
+				is_rebase_success = double_check_personal_rebase_fore_push(pod)
+			else
+				Logger.highlight("【#{pod}】 current_branch:#{current_branch} --rebase=#{rebase_branch} completed, use 'podsorz commit --push --notify' to push & notify updated code, or 'git reset commit' role back to old version")
+			end
+
+			is_rebase_success
+		end
+
+		def double_check_personal_rebase_fore_push(pod)
+			is_check_success = true
+			pod_file_path = File.expand_path(pod, @kx_pods_path)
+			current_branch = @git_operator.current_branch(pod_file_path)
+
+			Logger.warning("【#{pod}】本地分支:#{current_branch} rebase后与远端分支origin/#{current_branch}存在分叉，是否以本地分支'强推'覆盖远端分支，请选择输入：[force / wait]")
+			force_input = gets
+			if force_input.downcase.include? "wait"
+				Logger.warning("取消强推后，需要自行手动'git push -f'提交代码 or 'git reset commit'回退版本，请个人处理分支情况")
+				return is_check_success
+			end
+
+			unless force_input.downcase.include? "force"
+				is_check_success = double_check_personal_rebase_fore_push(pod)
+				return is_check_success
+			end
+
+			#push -f
+			is_check_success = @git_operator.push_personal_force_to_remote(pod_file_path, current_branch)
+			
+			is_check_success
+		end
+
+#class end
 	end
 
 end

data/lib/podsorz/util/git_operator.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../util/logger.rb", File.dirname(__FILE__))
+require "podsorz/util/logger"
 
 module PodsOrz
   class GitOperator
@@ -14,6 +14,8 @@ module PodsOrz
         io.each do |line|
           has_branch = true if line.include? branch_name
         end
+
+        io.close
       end
       has_branch
     end
@@ -24,6 +26,8 @@ module PodsOrz
         io.each do |line|
           has_branch = true if line.include? branch_name
         end
+
+        io.close
       end
       has_branch
     end
@@ -34,36 +38,28 @@ module PodsOrz
         io.each do |line|
           has_branch = true if line.include? branch_name
         end
+
+        io.close
       end
       has_branch
     end
 
     def checkout(path, branch_name)
+      is_checkout_success = true
       Dir.chdir(path) do
         IO.popen("git checkout #{branch_name}") do |io|
           io.each do |line|
-            Logger.error("Checkout #{branch_name} failed.") if line.include? 'error'
+            if line.include? 'error'
+              Logger.error("Checkout #{branch_name} failed.") 
+              is_checkout_success = false
+            end
           end
-        end
-      end
-    end
-
-    def fetch(path)
-      Dir.chdir(path) do
-        `git fetch origin`
-      end
-    end
 
-    def rebase(path, branch_name)
-      Dir.chdir(path) do
-        `git rebase origin/#{branch_name}`
+          io.close
+        end
       end
-    end
 
-    def clone(path, git_base)
-      Dir.chdir(path) do
-        `git clone #{git_base}`
-      end
+      is_checkout_success
     end
 
     def commit(path, message)
@@ -74,15 +70,57 @@ module PodsOrz
     end
 
     def push_to_remote(path, branch_name)
-      Dir.chdir(path) do
-        `git push -u origin #{branch_name}`
+      is_push_success = true
+
+      push_lines = []
+      IO.popen("cd #{path};git push -u origin #{branch_name}") do |io|
+        push_lines = io.readlines
+        io.each do |line|
+          if line.include? "error"
+            is_push_success = false 
+          end
+
+          if line.include? "fatal"
+            is_push_success = false
+          end
+        end
+
+        io.close
+      end
+
+      unless is_push_success
+        Logger.error("#{branch_name} push to remote failed!") 
+        push_lines.each do |line|
+          puts(line)
+        end
       end
+
+      is_push_success
     end
 
-    def pull(path)
-      Dir.chdir(path) do
-        `git pull`
+    def push_personal_force_to_remote(path, branch_name)
+      is_push_success = true
+
+      push_lines = []
+      IO.popen("cd #{path};git push -u -f origin #{branch_name}") do |io|
+        push_lines = io.readlines
+        io.each do |line|
+          if line.include? "error"
+            is_push_success = false 
+          end
+        end
+
+        io.close
+      end
+
+      unless is_push_success
+        Logger.error("#{branch_name} push to remote failed!") 
+        push_lines.each do |line|
+          puts(line)
+        end
       end
+
+      is_push_success
     end
 
     def has_commits(path, branch_name)
@@ -91,7 +129,10 @@ module PodsOrz
         io.each do |line|
           has_commits = true if line.include? "commit"
         end
+
+        io.close
       end
+
       has_commits
     end
 
@@ -102,7 +143,10 @@ module PodsOrz
         io.each do |line|
           has_changes = false if line.include? clear_flag
         end
+
+        io.close
       end
+
       has_changes
     end
 
@@ -141,7 +185,10 @@ module PodsOrz
         io.each do |line|
           tags << line
         end
+
+        io.close
       end
+
       unless tags.include? "#{version}\n"
         Dir.chdir(path) do
           `git tag -a #{version} -m "release: V #{version}" master;`
@@ -149,6 +196,7 @@ module PodsOrz
         end
         return
       end
+
       Logger.highlight("tag already exists in the remote, skip this step")
     end
 
@@ -158,7 +206,10 @@ module PodsOrz
         io.each do |line|
           tag_list << line
         end
+
+        io.close
       end
+
       tag_list
     end
 
@@ -168,7 +219,10 @@ module PodsOrz
         io.each do |line|
           unmerged_branch.push(line) if line.include? "#{condition}"
         end
+
+        io.close
       end
+
       if (unmerged_branch.size > 0)
         unmerged_branch.map { |item|
             Logger.default(item)
@@ -177,12 +231,6 @@ module PodsOrz
       end
     end
 
-    def merge(path, branch_name)
-      IO.popen("cd '#{path}'; git merge #{branch_name}") do |line|
-        Logger.error("Merge conflict in #{branch_name}") if line.include? 'Merge conflict'
-      end
-    end
-
     def compare_branch(path, branch, compare_branch)
       diff_commit_list = []
 
@@ -195,14 +243,100 @@ module PodsOrz
           diff_commit_list << line unless line.strip.chomp.empty?
         end
 
+        io.close
       end
 
       diff_commit_list
     end
 
+    def pull(path, branch, is_merge)
+      is_pull_success = true
+      has_conflicts = false
+
+      pull_cmd_list = []
+      pull_cmd_list << "cd #{path}"
+      pull_cmd_list << "git fetch origin #{branch}"
+
+      if is_merge
+        pull_cmd_list << "git pull --no-ff --no-squash --no-edit"  
+      else
+        pull_cmd_list << "git pull --rebase"
+      end
+      
+      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
+        if is_merge
+          Logger.error("【#{path}】\n on branch: \"#{branch}\" (pull)Merge conflict, please manual fix conflicts.(fix conflicts and run \"git commit\")(use \"git merge --abort\" to abort the merge)")
+        else
+          Logger.error("【#{path}】\n on branch: \"#{branch}\" (pull)Rebase conflict, please manual fix conflicts.(fix conflicts and run \"git rebase --continue\")(use \"git rebase --abort\" to abort the merge)")
+        end
+        
+        is_pull_success = false
+      end
+
+      is_pull_success
+
+    end
+
+    def rebase(path, branch)
+      is_rebase_success = true
+
+      is_remote_branch = has_remote_branch(path, branch)
+
+      rebase_cmd_list = []
+      rebase_cmd_list << "cd #{path}"
+
+      if is_remote_branch
+        rebase_cmd_list << "git fetch origin #{branch}"
+        rebase_cmd_list << "git rebase origin/#{branch}"  
+      else
+        rebase_cmd_list << "git rebase #{branch}"  
+      end
+      
+      has_conflicts = false
+      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
+        c_branch = current_branch(path)
+        Logger.error("【#{path}】\n on branch: \"#{c_branch}\" Merge conflict, please manual fix conflicts.(fix conflicts and run \"git rebase --continue\")(use \"git rebase --abort\" to abort the merge)")
+        is_rebase_success = false
+      end
+
+      is_rebase_success
+    end
 
+    def has_diverged(path)
+      has_div = false
+      IO.popen("cd #{path};git status") do |io|
+        rebase_cmd_lines = io.readlines
+        rebase_cmd_lines.each do |line|
+          has_div = true if line.include? "diverged"
+        end
 
+        io.close
+      end
+      
+      has_div
+    end
 
+    #Class end
   end
 
 end

data/lib/podsorz/version.rb

@@ -1,3 +1,3 @@
 module PodsOrz
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -65,8 +65,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- Podfile
-- PodsOrzConfig.rb
+- Note
 - README.md
 - Rakefile
 - bin/podsorz
@@ -76,6 +75,7 @@ files:
 - lib/podsorz/command/publish.rb
 - lib/podsorz/command/setup.rb
 - lib/podsorz/command/switch.rb
+- lib/podsorz/command/sync.rb
 - lib/podsorz/core/orz_config_templet.rb
 - lib/podsorz/core/orz_env_detector.rb
 - lib/podsorz/core/pod_orzconfig_parse.rb

data/PodsOrzConfig.rb

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