podsorz 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8deb47506256b4bef4309f5883e777e7062cceea144e70e506fb301fbb3b424
-  data.tar.gz: b198d8604d2ea51dae2d735d54a70753e040d1948a485dabc018bea4d7794806
+  metadata.gz: 2610efa45ee23db5405e085732c5a468da2a0645d23471b9aa8d078e48eec811
+  data.tar.gz: f725d32f596a65c8f21b6da354bb145cc0ada6ad825acdde3dcb36532458d0b5
 SHA512:
-  metadata.gz: 68e82ce404af05d8ffbf4368e7b662be5d7072df2b9c2c733685dc2427a6f622b57fa6e08a4c9f32f4313177ab595076297b959dbadea23361559347f0de99f7
-  data.tar.gz: 534226be5f8aebb0f2124045fe79ee926652548a8fbea633752759a5acef0ca53529f3e53ca6b8772e7d8303064cd820a55abbaf40b923612a508aed3c8437d8
+  metadata.gz: 3ff8a612cc714cdf0ebe48003181fbefbe78d0304a934fdf9eab3eb809570d360716e964007d20a467fe69309f1d759fc3c263625aaffb7862f47b3a913686d1
+  data.tar.gz: 538edb9292fc7c4ca131d2364f03491945551e6f289451aeed3172059eb965cbeffb53459a762cc384f1ba077c29c6b9ef434a677cbd013b7daefa9197cbe6e1

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

@@ -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,7 +8,8 @@ require "podsorz/command/publish"
 require "podsorz/command/sync"
 require "podsorz/command/binary"
 require "podsorz/command/install"
-require "podsorz/command/check.rb"
+require "podsorz/command/check"
+require "podsorz/command/sort"
 
 require 'gli'
 
@@ -42,6 +43,7 @@ module PodsOrz
   sync_command()
   binary_command()
   check_command()
+  sort_command()
 
   desc "Show podsorz version"
   command :version do |version|

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/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,17 @@ 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)
+				return	
+			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

@@ -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.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -82,7 +82,6 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - Podfile
-- PodsOrzConfig.rb
 - README.md
 - Rakefile
 - bin/podsorz
@@ -93,6 +92,7 @@ files:
 - 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
@@ -109,8 +109,8 @@ files:
 - 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/check_spec.rb
 - lib/podsorz/core/Specs/podspec_model.rb
 - lib/podsorz/util/git_operator.rb
 - lib/podsorz/util/logger.rb

data/PodsOrzConfig.rb

@@ -1,31 +0,0 @@
-module GitConfig
-	#App 当前版本
-	APP_RELEASE_VERSION = "2.0.12"
-	
-	#作者姓名xiangqi简写
-	BRANCH_AUTHOR_SUFFIX = "xq" 
-end
-
-#想要开发修改的的Pod
-    $FIX_POD_LIST = [
-#        "KXModuleOrz",
-#        "KXModuleQuestionRepo",
-    ]
-
-
-
-#------Binary Static library------#
-#是否全部Pod以二进制静态库加载，false代表以源码显示【打包机】请用源码
-    $is_all_binary = false
-#当is_all_binary = false 所有pod即将显示源码时，仍然希望部分Pod二进制静态库加载
-    $static_lib_list = [
-#         "AFNetworking",
-    ]
-
-#------Package Action------#
-#当is_all_binary = false 并不是针对所有pod 打binary包，仍然希望部分pod打包成二进制静态库的Pod
-    $will_package_list = [
-#        "AFNetworking",
-    ]
-
-#

data/lib/podsorz/core/Specs/check_spec.rb

@@ -1,46 +0,0 @@
-# require File.expand_path('../../lib/yygem/string_calculator', __FILE__)
-require "/Users/yuyutao/Desktop/rubyGem/PodsOrz/lib/podsorz/core/PodsOrz/pods_check_merge.rb"
-require 'rspec'
-
-describe PodsCheckMerge do
-
-    describe ".add" do
-    #   context "given an empty string" do
-    #     it "returns zero" do
-    #       expect(StringCalculator.add("")).to eq(0)
-    #     end
-    #   end
-
-        context "given '4'" do
-            it "returns 4" do
-                expect(StringCalculator.add("4")).to eql(4)
-            end
-        end
-
-        context "given '10'" do
-            it "returns 10" do
-                expect(StringCalculator.add("10")).to eql(10)
-            end
-        end
-
-        context "two numbers" do
-            context "given '2,4'" do
-                # 输出内容 条件成立则绿色输出 否则红色 FAILED - 1 输出
-              it "returns 6" do
-                expect(StringCalculator.add("2,4")).to eql(6)
-              end
-            end
-      
-            context "given '17,100'" do
-                StringCalculator.add("17,10")
-              it "returns 117" do
-                # StringCalculator.add("17,100")
-                # eql 与写入期望的值进行对比  RSpec 中 eq、eql、be 有不同差别
-                expect(StringCalculator.add("17,100")).to eql(17)
-              end
-            end
-        end
-
-
-    end
-  end