podsorz 0.0.7 → 0.0.13

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

@@ -6,10 +6,10 @@ module PodsOrz
 		attr_accessor :kx_pods_path, :orzconfig_parse
 
 		def initialize(main_path)
-			@kx_pods_path = File.expand_path("../kx_pods", main_path)
-
-			detect_kx_pods(main_path)
+						
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			@kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
+			detect_kx_pods(main_path)
 		end
 
 		def check_directory(main_path)
@@ -26,8 +26,8 @@ module PodsOrz
 			if result
 				pods_result = File.directory?(@kx_pods_path)
 				unless pods_result
-					Logger.warning("kx_pods directory not exist, generate default 'kx_pods' directory")	
-					Dir.mkdir(@kx_pods_path)
+					Logger.warning("#{@orzconfig_parse.file_devpods_name} directory not exist, generate default directory")	
+					FileUtils.mkdir_p(@kx_pods_path, :mode => 0777)
 				end
 			end
 		end
@@ -63,7 +63,7 @@ module PodsOrz
 				result = false if file_entries.empty?
 				result = false unless file_entries.include?(".git")
 
-				Logger.error("【#{pod}】 at #{pod_path} exist, but .git not work success, please manual check.")	 unless result
+				Logger.error("【#{pod}】 at #{pod_path} exist, but .git not work success, please manual check.") unless result
 			else
 				result = clone_orz_pod(pod)
 			end
@@ -77,7 +77,8 @@ module PodsOrz
 
 			Logger.default("Start clone 【#{pod}】 Project...")
 			git_clone_content = ""
-			IO.popen("git clone git@gitlab.91banban.com:ios_pods/Pods/#{pod}.git #{pod_directory}", :err=>[:child, :out]) {|io|
+			# 替换为config参数
+			IO.popen("git clone #{@orzconfig_parse.remote_url_sourcecode}/#{pod}.git #{pod_directory}", :err=>[:child, :out]) {|io|
 				git_clone_content = io.read
 				puts(git_clone_content)
 				is_clone_success = false if git_clone_content.to_s.include? "fatal"

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

@@ -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
@@ -12,7 +13,7 @@ module PodsOrz
 		def initialize(main_path)
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
 
-			kx_pods_path = File.expand_path("../kx_pods", main_path)
+			kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
 			@pods_git_operator = PodsOrz::PodsGitOperator.new(kx_pods_path, @orzconfig_parse.app_release_version, @orzconfig_parse.branch_author_suffix)
 
 			@podfile_io = PodsOrz::PodfileIO.new(main_path)
@@ -20,7 +21,7 @@ module PodsOrz
 
 			@pods_version = PodsOrz::PodsVersion.new(main_path)
 
-			@pods_repo = PodsOrz::PodsRepo.new()
+			@pods_repo = PodsOrz::PodsRepo.new(main_path)
 		end
 
 #Switch Command --
@@ -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...")
 
@@ -448,7 +477,7 @@ module PodsOrz
 			command.join
 
 			command = Thread.new do 
-				Open3.popen3("cd #{main_path};pod update --no-repo-update --verbose") do |stdin , stdout , stderr, wait_thr|
+				Open3.popen3("cd #{main_path};pod update") do |stdin , stdout , stderr, wait_thr|
 			        while line = stdout.gets
 				          puts line
 				    end

data/lib/podsorz/core/PodsOrz/pods_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

@@ -1,13 +1,18 @@
 require "podsorz/util/logger"
 require 'open3'
+require "podsorz/core/Config/pod_orzconfig_parse"
+
 
 module PodsOrz
 	class PodsRepo
 		attr_accessor :repo_name, :repo_url
 
-		def initialize()
-			@repo_name = "kuxiu_specs"
-			@repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
+		def initialize(main_path)
+			# @repo_name = "kuxiu_specs"
+			# 替换成config配置参数
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			@repo_url = @orzconfig_parse.remote_url_codespec
+			@repo_name = @orzconfig_parse.file_coderepo_name
 		end
 
 		def check_repo_exist
@@ -190,9 +195,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 +217,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/core/PodsOrz/pods_version.rb

@@ -1,4 +1,5 @@
 require "podsorz/util/logger"
+require "podsorz/core/Config/pod_orzconfig_parse"
 
 
 module PodsOrz
@@ -6,7 +7,8 @@ module PodsOrz
 		attr_accessor :kx_pods_path
 
 		def initialize(main_path)
-			@kx_pods_path = File.expand_path("../kx_pods", main_path)
+			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			@kx_pods_path = File.expand_path("../#{@orzconfig_parse.file_devpods_name}", main_path)
 		end
 
 		def increase_pod_version(pod)

data/lib/podsorz/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.7"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.13
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -76,7 +76,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
+- ".rspec"
+- ".vscode/launch.json"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -85,10 +88,12 @@ files:
 - 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,16 +105,24 @@ 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
 - lib/podsorz/util/logger.rb
 - lib/podsorz/util/process_operator.rb
 - lib/podsorz/version.rb
+- pkg/podsorz-0.0.10.gem
+- pkg/podsorz-0.0.11.gem
+- pkg/podsorz-0.0.12.gem
+- pkg/podsorz-0.0.7.gem
+- pkg/podsorz-0.0.8.gem
+- pkg/podsorz-0.0.9.gem
 - podsorz.gemspec
 homepage: https://github.com/XiangqiTu
 licenses: