podsorz 0.0.6 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9fe4e4abe9b87b0674798c053b4b5108abab803bad286b4f2d700eb4fd36d7
-  data.tar.gz: a58df9bf3b426f4f90515139c66d405e76750db805a4daa81a90479cd3ff370e
+  metadata.gz: a4917923f5a634c8bf8f212ac3d6621ab13eab6c9442f189bf45143a88a25036
+  data.tar.gz: 4a3caaa94b2a16a5a05c2da94901fd18dd4c300a6f8e7239636516f9310a1e61
 SHA512:
-  metadata.gz: c7642c8580351e44b87fd896c599ee13bec73921729a11201f3f701cb68f8ff163ff2f7a568f92b26dce4dbf7d74a3dc08f325338509d2a02b1f28e516345a7b
-  data.tar.gz: 302416db39162b707b3ba21ab5ccf4bcf62184b4d274b8c3536dad4d1e2311080bc31ab9c700f4edaaf9bc9787f17118068ce1dc0ac350ae689ee0a42b2a2f3c
+  metadata.gz: bac63452c1fae9ad3d222f33f7b9e302b453431ae86d3578f8ec958364826a6c9a21aabc523925ab0d8160050726cb78549eca3a35905ae5f5b8b24b763f7991
+  data.tar.gz: 445fb40a279eb2a916d255b52fde91f6c343abf460673eeae81242c10aaa8b1b894d53100e91c92ede85669adc9a17d9a0bfccc9df90fb89e462e6582a290ca2

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -4,3 +4,13 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in podsorz.gemspec
 gemspec
+gem "rspec"
+
+group :development do
+  gem 'bacon'
+  gem 'mocha-on-bacon'
+  gem 'mocha'
+  gem 'prettybacon'
+  gem 'coveralls', :require => false
+  gem 'rubocop'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    podsorz (0.0.5)
+    podsorz (0.0.8)
       cocoapods
       cocoapods-packager
       colorize
@@ -21,7 +21,9 @@ GEM
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
+    ast (2.4.2)
     atomos (0.1.3)
+    bacon (1.2.0)
     claide (1.0.3)
     cocoapods (1.10.1)
       addressable (~> 2.6)
@@ -65,6 +67,14 @@ GEM
     colored2 (3.1.2)
     colorize (0.8.1)
     concurrent-ruby (1.1.8)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
@@ -78,17 +88,65 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     minitest (5.14.4)
+    mocha (1.12.0)
+    mocha-on-bacon (0.2.3)
+      mocha (>= 0.13.0)
     molinillo (0.6.6)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
     public_suffix (4.0.6)
+    rainbow (3.0.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
     ruby-macho (1.4.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.1.0)
     thread_safe (0.3.6)
+    tins (1.28.0)
+      sync
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    unicode-display_width (2.0.0)
     xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -100,7 +158,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bacon
+  coveralls
+  mocha
+  mocha-on-bacon
   podsorz!
+  prettybacon
+  rspec
+  rubocop
 
 BUNDLED WITH
    1.17.2

data/lib/podsorz.rb

@@ -8,6 +8,8 @@ require "podsorz/command/publish"
 require "podsorz/command/sync"
 require "podsorz/command/binary"
 require "podsorz/command/install"
+require "podsorz/command/check"
+require "podsorz/command/sort"
 
 require 'gli'
 
@@ -40,6 +42,8 @@ module PodsOrz
   install_command()
   sync_command()
   binary_command()
+  check_command()
+  sort_command()
 
   desc "Show podsorz version"
   command :version do |version|

data/lib/podsorz/command/binary.rb

@@ -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

@@ -0,0 +1,28 @@
+# require "podsorz/core/PodsOrz/pods_check_merge"
+# require "../../PodsOrz/lib/podsorz/core/PodsOrz/pods_check_merge.rb"
+require "podsorz/core/PodsOrz/pods_check_merge"
+
+module PodsOrz
+	def self.check_command
+		desc "Check Pods not merge"
+		command :check do |check|
+			check.action do |global_options, options, args|
+				dir_path = global_options[:path]
+
+				is_directory = File.directory?(dir_path)
+
+				unless is_directory
+					Logger.error("Check failure, it is not a directory path: #{dir_path}")
+					exit()
+				end
+
+                kx_pods_path = File.expand_path("../kx_pods", dir_path)
+                # puts "kx_pods_path #{kx_pods_path}"
+				checkManger = PodsOrz::PodsCheckMerge.new()
+                checkManger.branchList(kx_pods_path)
+			
+			end
+		end
+	end
+
+end

data/lib/podsorz/command/sort.rb

@@ -0,0 +1,33 @@
+require "podsorz/core/PodsOrz/pods_sort"
+require "podsorz/core/Config/pod_orzconfig_parse"
+
+module PodsOrz
+	def self.sort_command
+		desc "Prioritize the pods to be released and check for loops. Output the number of dependency"
+		command :sort do |sort|
+			sort.action do |global_options, options, args|
+				dir_path = global_options[:path]
+
+				is_directory = File.directory?(dir_path)
+
+				unless is_directory
+					Logger.error("Check failure, it is not a directory path: #{dir_path}")
+					exit()
+				end
+
+                kx_pods_path = File.expand_path("../kx_pods", dir_path)
+                @orzconfig_parse = PodsOrz::PodOrzconfigParse.new(dir_path)
+                pods_list = @orzconfig_parse.fix_pod_list
+                if pods_list.empty?
+                    Logger.warning("fix_pods is empty nothing to do")
+                else
+                    pods_sort = PodsOrz::PodsSort.new()
+				    pods_list =  pods_sort.sort(pods_list,kx_pods_path)
+                    
+                end
+			
+			end
+		end
+	end
+
+end

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

@@ -6,7 +6,7 @@ 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
@@ -15,7 +15,8 @@ module PodsOrz
 			@podfile_io = podfile_io
 			@pod_repo = PodsOrz::PodsRepo.new()
 
-			@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_pods_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

@@ -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,16 @@
 require "podsorz/util/logger"
 require 'open3'
+require "podsorz/core/Binary/binary_server"
 
 module PodsOrz
 	class BinaryRepo
-		attr_accessor :repo_name, :repo_url
+		attr_accessor :repo_name, :repo_url, :binary_server
 
 		def initialize()
 			@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"
+			@binary_server = PodsOrz::BinaryServer.new()
 		end
 
 		def check_binary_repo_exist()
@@ -132,6 +134,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 +183,6 @@ module PodsOrz
           	is_push_success
 		end
 
-
-
-
 #Class End
 
 	end

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

@@ -1,21 +1,120 @@
 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}")
+
+					IO.popen(upload_cmd) do |io|
+						io_lines = io.readlines
+						io_lines.each do |line|
+							puts line
+							if line.include? "\"success\":"
+								is_upload_success = true if line.include? "true"
+								condition_var.signal
+							end
+						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/PodFile/podfile_io.rb

@@ -4,11 +4,12 @@ require "podsorz/core/PodFile/podfile_model"
 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"
 
 			self.parse_podfile_orz
 		end
@@ -314,7 +315,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

@@ -0,0 +1,160 @@
+require 'open3'
+require 'pathname'
+require "podsorz/util/git_operator"
+
+module PodsOrz
+
+  class PodsCheckMerge
+
+    # def check_Podfile(filePath)
+    #   # 返回 path 的绝对路径，扩展 ~ 为进程所有者的主目录，~user 为用户的主目录。相对路径是相对于 dir 指定的目录，如果 dir 被省略则相对于当前工作目录
+    #   tempPath = File.expand_path("Podfile",filePath)
+    #   result = File::exist?tempPath
+    #   if result
+    #     puts("存在-- #{tempPath}")
+    #   else
+    #     puts("不存在-- #{tempPath}")
+    #   end
+    #   tempPath
+    # end
+
+    def branchList(path)
+      list = []
+      # IO.popen("cd '#{path}';git branch -r") do |io|
+      #   io.each do |line|
+      #     puts("branch -- #{line}")
+      #     # has_branch = true if line.include? branch_name
+      #   end
+      # end
+
+      # Open3.popen3("cd '#{File.dirname(__FILE__ )}';git branch -r"){|stdin, stdout, stderr, wait_thr|
+      #   while line = stdout.gets
+      #     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
+# 里层 /Library/Ruby/Gems/2.6.0/gems/podsorz-0.0.5/lib/podsorz/core/kx_pods
+
+      # dir = Dir.open("#{@kx_pods_directory}")
+      # while name = dir.read
+      #   p name
+      # end
+      # dir.close
+
+    #   @kx_pods_directory = "/Users/yuyutao/Desktop/rubyGem/kx_pods"
+
+      Dir.open("#{path}") do |dir|
+        tempAry = ['.','..']
+        dirAry = dir.to_a 
+        ary = dirAry-tempAry
+        ary.each do |name|
+            dir_path = "#{path}/#{name}"
+            is_directory = File.directory?(dir_path)
+  
+            if is_directory
+              localBranch("#{dir_path}",name)
+            else
+            #   puts "#{name} 空文件"
+            end
+        end
+        
+      end
+      
+
+    end
+
+    # git log -n1 --format=format:"%H"
+    def localBranch(filePath,fileName)
+
+        @git_operator = PodsOrz::GitOperator.new()
+	    has_changes = @git_operator.has_changes(filePath)
+        if has_changes
+            branch = @git_operator.current_branch(filePath)
+            Logger.error("【#{filePath}】 on branch: \"#{branch}\" has unstaged/uncommit changes, please staged and commit local first")
+            return      
+        end
+
+        is_merge_all = true
+        branch = ""
+        Open3.popen3("cd '#{filePath}';git branch -l"){|stdin, stdout, stderr, wait_thr|
+            if stdout.gets
+                while line = stdout.gets
+
+                if line.include? "master"
+                #   puts("master分支-#{fileName}")
+                elsif line.include? "develop"
+                #   puts("develop分支-#{fileName}")
+                elsif line.include? "release"
+                #   puts("release分支-#{fileName}")
+                else
+                # puts("#{fileName} branch- #{line}")
+                    branch = line.strip
+                    if branch.include? "*"
+                        branch.delete!("*",)
+                    end
+                    is_merge_all = git_isMerged("#{branch}",filePath)
+                end
+
+          end
+          
+        else
+        #   puts("未发现本地分支-#{fileName}")
+        end
+     }
+
+    #   puts("all commit success!") if is_merge_all
+        if is_merge_all
+
+            puts("check result: all commit success! #{filePath}")
+        else
+            Logger.warning("#{filePath} - #{branch} commit not merge")
+        end
+
+    end
+
+    def git_isMerged(branch,path)
+      merge_destination_branch = "origin/develop"
+      merge_source_branch = "#{branch}"
+      merge_base = ""
+      merge_current_commit = ""
+      is_merge_all = true
+      cmd = "cd '#{path}';git merge-base #{merge_destination_branch} #{branch}"
+      IO.popen(cmd) do |io|
+        io.each do |line|
+          if line
+            merge_base = line
+          else
+            puts("git merge-base 无hash值 #{path}")
+          end
+          
+        end
+      
+      end
+      cmd = "git rev-parse #{branch}"
+      IO.popen("cd '#{path}';#{cmd}") do |io|
+        io.each do |line|
+          if line
+            merge_current_commit = line
+          else
+            puts("git rev-parse 无hash值 #{path}")
+          end
+          
+        end
+      
+      end
+
+      if merge_base == merge_current_commit
+
+      else
+        is_merge_all = false
+      end
+
+      is_merge_all
+    end
+
+  end
+
+end

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

@@ -27,7 +27,7 @@ module PodsOrz
 				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)
+					FileUtils.mkdir_p(@kx_pods_path, :mode => 0777)
 				end
 			end
 		end

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

@@ -3,6 +3,7 @@ require "podsorz/core/PodsOrz/pods_git_operator"
 require "podsorz/core/PodFile/podfile_io"
 require "podsorz/core/PodsOrz/pods_version"
 require "podsorz/core/PodsOrz/pods_repo"
+require "podsorz/core/PodsOrz/pods_sort"
 require 'open3'
 
 module PodsOrz
@@ -199,8 +200,8 @@ module PodsOrz
 			end
 			
 
-			#1.判断 release 是否存在新的commit内容
-			newContent_pod_list = filter_newContent_pods()
+			#1.判断 release 和master 比较是否存在新的commit内容
+			newContent_pod_list = filter_master_newContent()
 
 			if newContent_pod_list.empty?
 				Logger.warning("All pods do not have new content to publish")
@@ -228,17 +229,37 @@ module PodsOrz
 			#6.Update Podfile_orz
 			update_publish_podfile_orz
 
-			#7.Merge into develop
+			#7.diff content from develop branch
+			newContent_pod_list = filter_develop_newContent()
+
+			#8.Merge into develop
 			publish_develop_branch(newContent_pod_list)
 		end
 
-		def filter_newContent_pods()
+		def filter_master_newContent()
+			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, "master")	
+					newContent_pod_list << pod if is_new_publish
+				end
+
+				command.join
+				Logger.separator
+			}
+
+			newContent_pod_list
+		end
+
+		def filter_develop_newContent()
 			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)	
+					is_new_publish = @pods_git_operator.has_new_publish(pod, "develop")	
 					newContent_pod_list << pod if is_new_publish
 				end
 
@@ -355,8 +376,16 @@ module PodsOrz
 
 		def pods_repo_push(is_swift)
 			is_push_success = true
-
 			pods_list = @orzconfig_parse.fix_pod_list
+
+			if pods_list.empty?
+				Logger.warning("fix_pods is empty nothing to do")
+			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)	
+			end
+		
 			pods_list.each {|pod|
 				Logger.default("【#{pod}】check pod_version, git_tag, remote_version...")
 

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

@@ -425,7 +425,7 @@ module PodsOrz
 
 		#Publish
 
-		def has_new_publish(pod)
+		def has_new_publish(pod, branch_name)
 			is_new_content = true
 
 			is_new_content = is_publish_ready(pod)
@@ -437,7 +437,7 @@ module PodsOrz
 
 			fetch_cmd_list = []
 			fetch_cmd_list << "cd #{pod_file_path}"
-			fetch_cmd_list << "git fetch origin master"
+			fetch_cmd_list << "git fetch origin #{branch_name}"
 			IO.popen(fetch_cmd_list.join(";")) do |io|
 					io.each do |line|
 						puts line
@@ -446,16 +446,21 @@ module PodsOrz
 			end
 
 			diff_lines_list = []
-			diff_lines_list = @git_operator.compare_branch(pod_file_path, current_branch, "origin/master")
+			diff_lines_list = @git_operator.compare_branch(pod_file_path, current_branch, "origin/#{branch_name}")
 
 			if diff_lines_list.empty?
 				is_new_content = false 
 				return is_new_content
 			end
 
+			#filter Merge branch
+			diff_lines_list.delete_if {|item|
+				item.to_s.include? "Merge branch"
+			}
+			
 			is_new_content = false
 
-			Logger.warning("#{pod} on branch:\'#{current_branch}\' -- compare branch:\'origin/master\'")
+			Logger.warning("#{pod} on branch:\'#{current_branch}\' -- compare branch:\'origin/#{branch_name}\'")
 
 			should_show_detail = true
 			limit_count = 10

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

@@ -190,9 +190,9 @@ module PodsOrz
 				repo_push_cmd = []
 				repo_push_cmd << "cd #{file_path}"
 				if is_swift
-					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --use-modular-headers --swift-version=5.0 --skip-tests --platforms=ios"
+					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --use-modular-headers --swift-version=5.0 --skip-tests"
 				else
-					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --skip-tests --platforms=ios"	
+					repo_push_cmd << "pod repo push #{@repo_name} #{pod}.podspec --sources=#{@repo_url} --allow-warnings --use-libraries --skip-import-validation --skip-tests"	
 				end
 				
 
@@ -212,10 +212,9 @@ module PodsOrz
 		        unless is_push_success
 		            puts error_info
 		            Logger.error("Fail: \'#{pod}\':#{pod_version} push repo remote fail")
-		            return is_push_success
+				else
+					Logger.highlight(%Q(#{pod}:#{pod_version} push repo success))
 	          	end
-
-	          	Logger.highlight(%Q(#{pod}:#{pod_version} push repo success))
 			end
 
 			command.join

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

@@ -0,0 +1,155 @@
+require 'open3'
+require 'pathname'
+
+module PodsOrz
+
+  class PodsSort
+
+    def sort(pods_list,kx_pods_subPath)
+        # file priority 1 hash
+        @@fileHash = {}
+        # podspec hash
+        @@podspecHash = {}
+
+        @@filterHash = {}
+        pods_list.each { |fileName|
+            @@fileHash[fileName] = 1
+        }
+
+        pods_list.each { |fileName|
+        filePath = "#{kx_pods_subPath}/#{fileName}"
+        is_directory = File.directory?(filePath)
+        if is_directory
+            spec_with_path("#{filePath}/#{fileName}.podspec",fileName)
+        else
+            Logger.warning("#{filePath} is an empty file")
+        end
+        }
+        sort_with_hash()
+        @resultHash = {}
+
+        @@filterHash.each { |fileName,array| 
+            # puts ("#{fileName},#{array}") 
+            recursive_puts(fileName,array,[fileName])
+            
+        }
+
+        @@fileHash.each {|file,priority|
+            # puts ("#{file} #{priority}")
+            if  @resultHash.key?(priority)
+                array = @resultHash[priority]
+                array << file
+                @resultHash[priority] = array
+            else
+                @resultHash[priority] = [file]
+            end
+        }
+        sortList = []
+        checkHash = {}
+        # puts @resultHash
+        @resultHash.sort.sort!.each { |priority,array| 
+            # puts ("#{priority},#{array}") 
+            array.each { |line| 
+               puts ("#{priority} -- #{line}") 
+               checkHash[line] = priority
+               sortList << line
+            }
+        }
+
+        sortList.reverse!
+    
+    end
+
+
+    def recursive_puts(key,array,pathArray)
+        # pathArray << key
+        totalArray = []
+        if array.empty?
+            # puts ("kong - #{key}")
+            
+        else
+            array.each {|line|
+                pathArray << line
+                priority = @@fileHash[line] + 1
+                @@fileHash[line] = priority
+                tempArray = @@filterHash[line]
+                if tempArray.empty?
+                    pathArray.pop
+                else
+                    
+                    cycle = false
+                    tempArray.each {|podsName|
+                        if pathArray.include?(podsName)
+                           cycle = true 
+                           Logger.error("path:#{pathArray} pod:#{podsName} has dependence cycle, please fix cycle")
+                           exit()
+                        end
+                        # priorityN = @@fileHash[podsName] + 1
+                        # puts("次数 podsName #{podsName} #{priorityN}")
+                        # @@fileHash[podsName] = priorityN
+                    }
+
+                    if cycle
+                       #包含
+                        # puts pathArray
+                        
+                    else
+                        # puts ("#{key} #{line} #{pathArray}")
+                        recursive_puts(line,tempArray,pathArray)
+                        pathArray.pop
+                    end
+                    
+                end
+    
+            }
+            
+        end
+
+        
+    end
+
+    def sort_with_hash()
+
+        @@podspecHash.each { |fileName,specArray| 
+            # puts "#{fileName} #{specArray}"
+            tempArray = []
+            @@fileHash.each {|file,priority|
+                
+                specArray.each { |line| 
+                    if line.include? "dependency"
+                        
+                        if line.include? file and file != fileName
+
+                            priority += 1
+
+                            # @@fileHash[file] = priority
+                            tempArray << file
+                            # puts "#{fileName},#{file},#{line}"
+                            
+                        end
+                    end 
+                }
+
+            }
+            @@filterHash[fileName] = tempArray
+
+        }
+        
+    end
+
+    def spec_with_path(path,fileName)
+        return if path.nil?
+        path = Pathname.new(path)
+        path = Pathname.new(Dir.pwd).join(path) unless path.absolute?
+        return unless path.exist?
+
+        @path = path.expand_path
+
+        arr = IO.readlines("#{@path}")
+        @@podspecHash[fileName] = arr
+
+    end
+
+  end
+
+end

data/lib/podsorz/util/logger.rb

@@ -1,7 +1,7 @@
 require 'colorize'
 
 module Logger
-	def self.default(sentence)
+	  def self.default(sentence)
       puts format_output(sentence).colorize(:default)
     end
 

data/lib/podsorz/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.12
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -77,18 +77,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- Podfile
 - README.md
 - Rakefile
 - bin/podsorz
 - lib/podsorz.rb
 - lib/podsorz/command/binary.rb
+- lib/podsorz/command/check.rb
 - lib/podsorz/command/commit.rb
 - lib/podsorz/command/install.rb
 - lib/podsorz/command/publish.rb
 - lib/podsorz/command/setup.rb
+- lib/podsorz/command/sort.rb
 - lib/podsorz/command/switch.rb
 - lib/podsorz/command/sync.rb
 - lib/podsorz/core/Binary/binary_builder.rb
@@ -100,10 +104,12 @@ files:
 - lib/podsorz/core/Config/pod_orzconfig_parse.rb
 - lib/podsorz/core/PodFile/podfile_io.rb
 - lib/podsorz/core/PodFile/podfile_model.rb
+- lib/podsorz/core/PodsOrz/pods_check_merge.rb
 - lib/podsorz/core/PodsOrz/pods_detector.rb
 - lib/podsorz/core/PodsOrz/pods_git_manager.rb
 - lib/podsorz/core/PodsOrz/pods_git_operator.rb
 - lib/podsorz/core/PodsOrz/pods_repo.rb
+- lib/podsorz/core/PodsOrz/pods_sort.rb
 - lib/podsorz/core/PodsOrz/pods_version.rb
 - lib/podsorz/core/Specs/podspec_model.rb
 - lib/podsorz/util/git_operator.rb