podsorz 0.0.15 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022ce6fd33aecf81ad9d8ba51d9d8f11b89474f7006d878c52282915f0d1a72e
-  data.tar.gz: a0e815198dcd4c8f84b9c4f8f092686fa06fcede62e0cf1659cd330a4b6205fc
+  metadata.gz: 2f9a1be896ca26ca6fa5d77c136e1c3b27a5add1f1e9b881865d3bb934ecb7b6
+  data.tar.gz: 0300d610bd8baf518e6a1f669ac6c181cdfcbb822f0d786b623df63a0e80dcc0
 SHA512:
-  metadata.gz: 7a8e91ceb713fbd15f05e0050b38a2dc253ff74597506ea979ff2ee326ee6c65e4d328ae5a3d60ce54fac7a896cb9991663b5d9ab21ea02c3aa3f47859d08a85
-  data.tar.gz: 9f69b4f781d23ade25e4abf3448b413691c398d7b95a74393bd5fd0e76abd0033bd73f9003e27c5c6c23c3951e9b7a262f752d8414af0d72a7a6d1595e54fc25
+  metadata.gz: 2793f97127fa2e654753a188543d9dee46f6c66e3ff9b081f4266e77b1a842f1a45025b2434261b65c5697807d0cd563a122d2ff84d0ea40d2456df5860a13e8
+  data.tar.gz: dcc5abc81395accba5aeae6654e369265a8916d84c7cb6e08c8a3d08578da2b369da4c755691adf39a636bb2eb87cb9b04e658e3800d7a5804941dc618970e09

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

@@ -9,9 +9,11 @@ module PodsOrz
 		attr_accessor :repo_name, :repo_url, :binary_server
 
 		def initialize(main_path)
-			@repo_name = "kuxiu_binary_specs"
-			@repo_url = "git@gitlab.91banban.com:ios_pods/binary-specs.git"
 			@orzconfig_parse = PodsOrz::PodOrzconfigParse.new(main_path)
+			
+			@repo_name = @orzconfig_parse.file_binaryrepo_name
+			@repo_url = @orzconfig_parse.remote_url_binaryspec
+			
 			# 替换成config配置参数
 			# @source_code_repo_url = "git@gitlab.91banban.com:ios_pods/Specs.git"
 			@source_code_repo_url = @orzconfig_parse.remote_url_codespec

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

@@ -4,64 +4,66 @@
 
 #想要开发修改的的Pod
 $FIX_POD_LIST = [
-#        "KXModuleOrz",
-#        "KXModuleQuestionRepo",
-]
-
-
-module GitConfig
-    #App 当前版本
-    APP_RELEASE_VERSION = "2.1.2"
-
-    #作者姓名xiangqi简写
-    BRANCH_AUTHOR_SUFFIX = "yyt"
-
-
-
-    #App pods的远端仓库地址 源码
-    REMOTE_URL_SOURCECODE = 'git@gitlab.91banban.com:zhuita-ios/pod_group/pods'
-    #App podspec的发布地址仓库
-    REMOTE_URL_CODESPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/specs.git'
-    #App 二进制存放地址 service
-    REMOTE_URL_SOURCEBINARY = 'http://192.168.6.127:8899'
-    #App 二进制 podspec的发布地址仓库
-    REMOTE_URL_BINARYSPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/specs.git'
+    #         "AFNetworking",
+    ]
     
-end
-
-module FileConfig
-    #开发pods组件时仓库名称（需要与主工程同一级文件夹）
-    FILE_DEVPODS_NAME = 'zt_pods'
-
-    #ztPods/kxPods下的Pod源码库打包成二进制库相关 需要用到该行标识注释
-    FILE_PACKAGE_FILTER_MARK = 'ztPods'
     
-    #与cocoapods同一级的私有repo仓库文件夹名称
-    FILE_CODEREPO_NAME = "ZhuiTaRepo"
+    module GitConfig
+        #App 当前版本
+        APP_RELEASE_VERSION = "1.1.4"
     
-    #与cocoapods同一级的私有二进制 repo仓库文件夹名称
-    FILE_BINARYREPO_NAME = "ZhuiTaRepo"
+        #作者姓名xiangqi简写
+        BRANCH_AUTHOR_SUFFIX = "xq"
     
-end
     
     
-
-
-
-#############
-#打包人员专用
-#############
-
-#------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",
-]
+        #App pods的远端仓库地址 源码
+        REMOTE_URL_SOURCECODE = 'git@gitlab.91banban.com:zhuita-ios/pod_group/pods'
+        #App podspec的发布地址仓库
+        REMOTE_URL_CODESPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/specs.git'
+        
+        
+        #App 二进制存放地址 service
+        REMOTE_URL_SOURCEBINARY = 'http://192.168.6.127:8899'
+        #App 二进制 podspec的发布地址仓库
+        REMOTE_URL_BINARYSPEC = 'git@gitlab.91banban.com:zhuita-ios/pod_group/binary_specs.git'
+        
+    end
+    
+    module FileConfig
+        #开发pods组件时仓库名称（需要与主工程同一级文件夹）
+        FILE_DEVPODS_NAME = 'zt_pods'
+    
+        #ztPods/kxPods下的Pod源码库打包成二进制库相关 需要用到该行标识注释
+        FILE_PACKAGE_FILTER_MARK = 'ztPods'
+        
+        #与cocoapods同一级的私有repo仓库文件夹名称
+        FILE_CODEREPO_NAME = "zhuita_specs"
+        
+        #与cocoapods同一级的私有二进制 repo仓库文件夹名称
+        FILE_BINARYREPO_NAME = "zhuita_binary_specs"
+        
+    end
+        
+        
+    
+    
+    
+    #############
+    #打包人员专用
+    #############
+    
+    #------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/Config/pod_orzconfig_parse.rb

@@ -3,7 +3,15 @@ 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_package_filter_mark, :file_coderepo_name,:file_binaryrepo_name
+		#Git Config
+		attr_accessor :fix_pod_list, :app_release_version, :branch_author_suffix
+		attr_accessor :remote_url_sourcecode,:remote_url_codespec, :remote_url_binary, :remote_url_binaryspec
+
+		#File Config
+		attr_accessor :file_devpods_name, :file_package_filter_mark, :file_coderepo_name,:file_binaryrepo_name
+
+		#Package
+		attr_accessor :is_all_binary, :static_lib_list, :will_package_list
 		
 		def initialize(main_path)
 			orzconfig_path = File.expand_path("PodsOrzConfig.rb", main_path)
@@ -16,41 +24,25 @@ module PodsOrz
 			
 			require orzconfig_path
 
+			#GitConfig
+			@fix_pod_list = $FIX_POD_LIST
 			@app_release_version = GitConfig::APP_RELEASE_VERSION
-			@app_release_version = "" if @app_release_version.nil?
-
 			@branch_author_suffix = GitConfig::BRANCH_AUTHOR_SUFFIX
-			@branch_author_suffix = "" if @branch_author_suffix.nil?
-
 			@remote_url_sourcecode = GitConfig::REMOTE_URL_SOURCECODE
-			@remote_url_sourcecode = "" if @remote_url_sourcecode.nil?
-
 			@remote_url_codespec = GitConfig::REMOTE_URL_CODESPEC
-			@remote_url_codespec = "" if @remote_url_codespec.nil?
+			@remote_url_binary = GitConfig::REMOTE_URL_SOURCEBINARY;
+			@remote_url_binaryspec = GitConfig::REMOTE_URL_BINARYSPEC;
 
+			#FileConfig
 			@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?
-
 			@file_binaryrepo_name = FileConfig::FILE_BINARYREPO_NAME
-			@file_binaryrepo_name = "" if @file_binaryrepo_name.nil?
-
-			@fix_pod_list = $FIX_POD_LIST
-			@fix_pod_list = [] if @fix_pod_list.nil?
 
+			#Package
 			@is_all_binary = $is_all_binary
-			@is_all_binary = false if @is_all_binary.nil?
-
 			@static_lib_list = $static_lib_list
-			@static_lib_list = [] if @static_lib_list.nil?
-
 			@will_package_list = $will_package_list
-			@will_package_list = [] if @will_package_list.nil?
 		end
 	end
 end

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

@@ -321,7 +321,7 @@ module PodsOrz
 			is_release = current_branch.include? "release"
 
 			if is_develop || is_release
-				
+				return is_push_success
 			end
 
 			#feature
@@ -371,6 +371,7 @@ module PodsOrz
 				merge_cmd_list = []
 				merge_cmd_list << "cd #{pod_file_path}"
 				merge_cmd_list << "git checkout #{base_on_branch}"
+				merge_cmd_list << "git pull --rebase"
 				merge_cmd_list << "git merge #{current_branch} --no-ff --no-squash --no-edit"
 				merge_cmd_list << "git push -u origin #{base_on_branch}"
 				IO.popen(merge_cmd_list.join(";")) do |io|

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

@@ -8,8 +8,6 @@ module PodsOrz
 		attr_accessor :repo_name, :repo_url
 
 		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

data/lib/podsorz/util/git_operator.rb

@@ -36,7 +36,8 @@ 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.strip.eql? branch_name
+          # has_branch = true if line.strip.eql? branch_name
+          has_branch = true if line.to_s.chomp.strip.end_with? branch_name
         end
 
         io.close

data/lib/podsorz/version.rb

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

metadata

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