podsorz 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd62dd4556e53831b2b078c24ea852a7c756288385a316ac86e38b3f4ae3a2be
-  data.tar.gz: 4d12c63701b3ea89a5096a7f440061940424b8e2ddc33fe1b7ef65200078b8cb
+  metadata.gz: 022ce6fd33aecf81ad9d8ba51d9d8f11b89474f7006d878c52282915f0d1a72e
+  data.tar.gz: a0e815198dcd4c8f84b9c4f8f092686fa06fcede62e0cf1659cd330a4b6205fc
 SHA512:
-  metadata.gz: 216b722dbe1466edbc93c9051ea2e0f4a57324774d201c90f11b44c9adaed803fc49e9f381fb336dc60c817824290075ff673369098ad04e4e42a1a94a3ee386
-  data.tar.gz: da69be9b603987f84ff1a951f1582afefc8a0e647472d3dc89ae6924886823ac15088b3f0fe736e643b8a9ddbe6e65f8d217ebbda9a1facec677478ab09dc451
+  metadata.gz: 7a8e91ceb713fbd15f05e0050b38a2dc253ff74597506ea979ff2ee326ee6c65e4d328ae5a3d60ce54fac7a896cb9991663b5d9ab21ea02c3aa3f47859d08a85
+  data.tar.gz: 9f69b4f781d23ade25e4abf3448b413691c398d7b95a74393bd5fd0e76abd0033bd73f9003e27c5c6c23c3951e9b7a262f752d8414af0d72a7a6d1595e54fc25

data/lib/podsorz/core/Config/orz_config_templet.rb

@@ -32,6 +32,9 @@ end
 module FileConfig
     #开发pods组件时仓库名称（需要与主工程同一级文件夹）
     FILE_DEVPODS_NAME = 'zt_pods'
+
+    #ztPods/kxPods下的Pod源码库打包成二进制库相关 需要用到该行标识注释
+    FILE_PACKAGE_FILTER_MARK = 'ztPods'
     
     #与cocoapods同一级的私有repo仓库文件夹名称
     FILE_CODEREPO_NAME = "ZhuiTaRepo"

data/lib/podsorz/core/Config/pod_orzconfig_parse.rb

@@ -3,7 +3,7 @@ require "podsorz/util/logger"
 
 module PodsOrz
 	class PodOrzconfigParse
-		attr_accessor :app_release_version, :branch_author_suffix, :fix_pod_list, :is_all_binary, :static_lib_list, :will_package_list,:remote_url_sourcecode,:remote_url_codespec,:file_devpods_name,:file_coderepo_name,:file_binaryrepo_name
+		attr_accessor :app_release_version, :branch_author_suffix, :fix_pod_list, :is_all_binary, :static_lib_list, :will_package_list,:remote_url_sourcecode,:remote_url_codespec,:file_devpods_name, :file_package_filter_mark, :file_coderepo_name,:file_binaryrepo_name
 		
 		def initialize(main_path)
 			orzconfig_path = File.expand_path("PodsOrzConfig.rb", main_path)
@@ -31,6 +31,9 @@ module PodsOrz
 			@file_devpods_name = FileConfig::FILE_DEVPODS_NAME
 			@file_devpods_name = "" if @file_devpods_name.nil?
 
+			@file_package_filter_mark = FileConfig::FILE_PACKAGE_FILTER_MARK
+			@file_package_filter_mark = "" if @file_package_filter_mark.nil?
+
 			@file_coderepo_name = FileConfig::FILE_CODEREPO_NAME
 			@file_coderepo_name = "" if @file_coderepo_name.nil?
 

data/lib/podsorz/core/PodFile/podfile_io.rb

@@ -19,7 +19,7 @@ module PodsOrz
 		def filter_binary_pod_models()
 			filter_result_models = []
 
-			filter_strings = ["sourceVendorPods", "subspecPods", "ztPods"]
+			filter_strings = ["sourceVendorPods", "subspecPods", @orzconfig_parse.file_package_filter_mark]
 
 			result_lines = []
 

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

@@ -40,7 +40,7 @@ module PodsOrz
 
 		def switch_feature_pod(pod)
 			previous_branch = self.current_pod_branch(pod)
-			next_branch = "feature/" + "#{@author_suffix}" + "_#{@app_release_version}"
+			next_branch = "feature/" + "#{@author_suffix}"
 
 			is_ready = true
 			is_same = previous_branch.include? next_branch
@@ -116,7 +116,7 @@ module PodsOrz
 
 		def switch_bugfix_pod(pod)
 			previous_branch = self.current_pod_branch(pod)
-			next_branch = "bugfix/" + "#{@author_suffix}" + "_#{@app_release_version}"
+			next_branch = "bugfix/" + "#{@author_suffix}"
 
 			is_ready = true
 			is_same = previous_branch.include? next_branch

data/lib/podsorz/util/git_operator.rb

@@ -24,7 +24,7 @@ module PodsOrz
       has_branch = false
       IO.popen("cd '#{path}';git branch") do |io|
         io.each do |line|
-          has_branch = true if line.include? branch_name
+          has_branch = true if line.strip.eql? branch_name
         end
 
         io.close
@@ -36,7 +36,7 @@ module PodsOrz
       has_branch = false
       IO.popen("cd '#{path}';git fetch --all;git branch -a") do |io|
         io.each do |line|
-          has_branch = true if line.include? branch_name
+          has_branch = true if line.strip.eql? branch_name
         end
 
         io.close

data/lib/podsorz/version.rb

@@ -1,3 +1,3 @@
 module PodsOrz
-  VERSION = "0.0.13"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podsorz
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Xiangqi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli