podsorz 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a44111361a02ff1c1a71d7085d25bc8ac4ae3835085913ac796c09a86cda8f9
-  data.tar.gz: e130cd226bdb7072e8db2ee84ca2fad1a09d0d5cbb6b56a7b23e5ed2c206e190
+  metadata.gz: d8deb47506256b4bef4309f5883e777e7062cceea144e70e506fb301fbb3b424
+  data.tar.gz: b198d8604d2ea51dae2d735d54a70753e040d1948a485dabc018bea4d7794806
 SHA512:
-  metadata.gz: 021efcba84b814774fb105bb019d81053ffbaa727f469ca1c679a55f2ee65a1749ebc4aa15a9c684292899a2ab6930543812b0c825a9ee440b0cc5a2cf2381e3
-  data.tar.gz: b936d7f1b824146c954767ffd987127ebf09d474e127dae7b9f16e16cf494b959bd1003855c73997d5c5252b11665e25e7bfc2be32175a6b4d62505cc27a589d
+  metadata.gz: 68e82ce404af05d8ffbf4368e7b662be5d7072df2b9c2c733685dc2427a6f622b57fa6e08a4c9f32f4313177ab595076297b959dbadea23361559347f0de99f7
+  data.tar.gz: 534226be5f8aebb0f2124045fe79ee926652548a8fbea633752759a5acef0ca53529f3e53ca6b8772e7d8303064cd820a55abbaf40b923612a508aed3c8437d8

data/.rspec

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    podsorz (0.0.5)
+    podsorz (0.0.8)
       cocoapods
       cocoapods-packager
       colorize

data/PodsOrzConfig.rb

@@ -0,0 +1,31 @@
+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.rb

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

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/core/Binary/binary_builder.rb

@@ -82,7 +82,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)
+					Dir.mkdir(@kx_binary_path)
 				end
 			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_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
 				
 

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

@@ -0,0 +1,46 @@
+# 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

data/lib/podsorz/version.rb

@@ -1,3 +1,3 @@
 module PodsOrz
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -77,14 +77,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- Podfile
+- PodsOrzConfig.rb
 - 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
@@ -100,11 +104,13 @@ 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_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