pindo 4.9.4 → 4.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0abd0eb9f20e688da8b9af08a82ea9d8dcb23e3933417ee9500a63542396d20c
-  data.tar.gz: a35604b42071177e27fa45ba3da6231b32d268ed2f1a3d381fbe3b3b8401a1bc
+  metadata.gz: ce1731c2ab77bdee7cfa10865db928c8b97344eee053ab5e636b6976875b7081
+  data.tar.gz: 5ec006fbfe270a055da4d716d823cd13820c96975758027773a233ca06d47b18
 SHA512:
-  metadata.gz: fade81f54a82cbbc4be6258703b706c19b13fabfb0fe23ff2436202d891e1796765c538482da925e96239ed24fde08a64d87c2f918db5a46393f69a9e2094898
-  data.tar.gz: 194d66f52e3894e8bd1749420ee549e2977b11536c4702581cfc295d5afa9f88cdce4fe73a7af9a50f52a4500e18eb2145ec4f143a084a4f26c2cb601c544f58
+  metadata.gz: 6f50bd7f5cbca0ab7ffc57e6b4ec6277b8c9a7ab6a10eb2f7fba50e79dacb392fcdba2c96fb2c5b46786a3a0058cb94d2c4c6dde7b2504ef59c8ad9742c209c4
+  data.tar.gz: f94c5d8264b77884aa15f6112cc8546fb2ba23de5eea03a5142bd312aadb46e60ec32de33ebfa6e00d65f6249a724c96fcc0c0be35105b08f2d83004ce210938

data/lib/pindo/command/dev/repoinit.rb

@@ -46,82 +46,14 @@ module Pindo
           @additional_args = argv.remainder!
         end
 
-        def write_gitignore(project_dir)
-          gitignore_path = File.join(project_dir, '.gitignore')
-          gitignore_content = <<~GITIGNORE
-            # Build logs
-            build_ios.log
-            CHANGELOG.md
-
-            # Platform specific directories
-            /GoodPlatform/iOS/*
-            /GoodPlatform/Android/*
-            /GoodPlatform/MacOS/*
-            /GoodPlatform/BaseiOS/Unity/*
-            /GoodPlatform/BaseiOS/Pods/
-            /GoodPlatform/BaseiOS/Podfile.lock
-            /GoodPlatform/BaseAndroid/Unity/*
-            /GoodPlatform/BaseMac/Unity/*
-          GITIGNORE
-        
-          # Append to existing .gitignore or create new one
-          File.open(gitignore_path, 'a') do |f|
-            f.puts("\n# Added by Pindo")
-            f.puts(gitignore_content)
-          end
-        end
-
         def run
-
-          clone_pindo_common_config_repo(force_delete:false)
-          pindo_common_dir = pindo_single_config.pindo_common_configdir
-
-          current_dir = Dir.pwd
-          puts
-          Funlog.instance.fancyinfo_start("添加仓库日志变更配置 git-cliff")
-          if is_git_directory?(local_repo_dir: current_dir)
-            current_git_root_path = git_root_directory(local_repo_dir: current_dir)
-            if File.exist?(File.join(pindo_common_dir, 'cliff.toml'))
-              FileUtils.cp_r(File.join(pindo_common_dir, 'cliff.toml'), File.join(current_git_root_path, 'cliff.toml'))
-            end
-            Funlog.instance.fancyinfo_update("仓库添加cliff配置")
-            write_gitignore(current_git_root_path)
-            Funlog.instance.fancyinfo_update("仓库添加.gitignore")
-            Dir.chdir(current_dir)
-            current_branch = git!(%W(-C #{current_dir} rev-parse --abbrev-ref HEAD)).strip
-            git!(%W(-C #{current_dir} add cliff.toml))
-            git!(%W(-C #{current_dir} add .gitignore))
-            git!(%W(-C #{current_dir} commit -m "更新cliff配置"))
-            git!(%W(-C #{current_dir} push origin #{current_branch}))
-
-          else
-            Funlog.instance.fancyinfo_error("当前目录不是git仓库，请在git仓库根目录下执行此命令")
-            raise Informative, "当前目录不是git仓库，请在git仓库根目录下执行此命令"
-          end
-          Funlog.instance.fancyinfo_success("仓库配置完成!")
           
-
-
-          puts "\n检查git-cliff命令是否安装"
-          # 请检查git-cliff命令是否安装
-          begin
-            if !system('git-cliff --version')
-              # /bin/bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"
-              #安装git-cliff
-              system('bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"')
-            else
-              puts "git-cliff已安装"
-            end
-          rescue
-            raise Informative, "安装git-cliff出现错误"
-          end
-
+          pindo_project_dir = Dir.pwd
+          build_helper = Pindo::BuildHelper.share_instance
+          build_helper.check_check_and_install_cliff(pindo_project_dir)
 
         end
 
-
-
-
       end
     end
   end

data/lib/pindo/command/dev/tag.rb

@@ -56,9 +56,10 @@ module Pindo
 
         def run
           current_project_dir = Dir.pwd
-
+          puts current_project_dir
           # 检查当前目录是否是git仓库
           unless is_git_directory?(local_repo_dir: current_project_dir)
+            
             Funlog.instance.fancyinfo_error("当前目录不是git仓库")
             raise Informative, "请在git仓库目录下执行此命令"
           end

data/lib/pindo/command/ios/autobuild.rb

@@ -78,15 +78,37 @@ module Pindo
                 end
 
                 def run
-                    
-                    pindo_unity_project_dir = Dir.pwd
+                    pindo_project_dir = Dir.pwd
+
                     build_helper = Pindo::BuildHelper.share_instance
-                    unless build_helper.ios_project?(pindo_unity_project_dir)
-                        raise Informative, "当前目录不是iOS工程，请在iOS工程根目录下执行此命令"
+                    project_type = build_helper.project_type(pindo_project_dir)
+
+                    args_temp = []
+                    args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
+                    args_temp << "--upload" if @args_upload_flag
+                    args_temp << "--send" if @args_send_flag
+                    case project_type
+                    when :ios
+                        ios_autobuild
+                    when :android
+                        puts "Android 工程， 请使用 pindo android build"
+
+                    when :unity
+                        Pindo::Command::Unity::Ipa::run(args_temp)
+                    else
+                        raise Informative, "当前目录不是工程目录，不能编译"
                     end
 
+                end
+
+                def ios_autobuild
+
+                    pindo_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
+                    
                     if @args_upload_flag
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        build_helper.check_check_and_install_cliff(pindo_project_dir)
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
                         if is_need_add_tag
                             Pindo::Command::Dev::Tag::run(tag_action_parms) 
                         end
@@ -114,23 +136,22 @@ module Pindo
                     args_temp << mainapp_bundleid
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
-                    project_dir = Dir.pwd
-                    Dir.chdir(project_dir)
-                    config_json_file = File.join(project_dir,"config.json")
-                    Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
+                    Dir.chdir(pindo_project_dir)
+                    config_json_file = File.join(pindo_project_dir,"config.json")
+                    Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:pindo_project_dir, config_file:config_json_file)
 
-                    if File.exist?(File.join(project_dir, "Podfile"))
+                    if File.exist?(File.join(pindo_project_dir, "Podfile"))
                         
                         args_temp = []
                         args_temp << config_json_file
                         Pindo::Command::Lib::Update::run([])
 
                         begin
-                            if File.exist?(File.join(project_dir, "Podfile.lock"))
-                                FileUtils.rm_rf(File.join(project_dir, "Podfile.lock"))    
+                            if File.exist?(File.join(pindo_project_dir, "Podfile.lock"))
+                                FileUtils.rm_rf(File.join(pindo_project_dir, "Podfile.lock"))    
                             end
-                            if File.exist?(File.join(project_dir,"Pods"))
-                                FileUtils.rm_rf(File.join(project_dir, "Pods"))    
+                            if File.exist?(File.join(pindo_project_dir,"Pods"))
+                                FileUtils.rm_rf(File.join(pindo_project_dir, "Pods"))    
                             end
                             puts "正在执行pod deintegrate..."
                             system 'pod deintegrate'
@@ -141,8 +162,8 @@ module Pindo
                             raise Informative, "pod install失败！！先pod install 完成后成编译 !"
                         end
 
-                        Dir.chdir(project_dir)
-                        pod_lock_file = File.join(project_dir, "Podfile.lock")
+                        Dir.chdir(pindo_project_dir)
+                        pod_lock_file = File.join(pindo_project_dir, "Podfile.lock")
                         if !File.exist?(pod_lock_file)
                             raise Informative, "pod install失败！！先pod install 完成后成编译 !"
                         end
@@ -157,7 +178,7 @@ module Pindo
                         args_temp << "--dev"
                     end
 
-                    project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
                     if !project_fullname.nil?
                         project_obj = Xcodeproj::Project.open(project_fullname)
                         project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
@@ -172,23 +193,14 @@ module Pindo
 
                     Pindo::Command::Deploy::Cert::run(args_temp)
 
-                    Dir.chdir(project_dir)
+                    Dir.chdir(pindo_project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 
-
-                    pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app}")
+                    build_path = File.join(pindo_project_dir, "build", "*.{ipa,app}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-
+                    
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 
                         description = nil
-                        if File.exist?(File.join(pindo_new_project_dir, ".release_info"))
-                            description = File.read(File.join(pindo_new_project_dir, ".release_info"))
-                        else
-                            if File.exist?(File.join(pindo_new_project_dir, ".git"))
-                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format=%h::%s)).strip
-                            end
-                        end
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
                             msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])

data/lib/pindo/command/ios/build.rb

@@ -64,21 +64,40 @@ module Pindo
                 end
 
                 def run
+                    pindo_project_dir = Dir.pwd
 
-                    pindo_unity_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
-                    unless build_helper.ios_project?(pindo_unity_project_dir)
-                        raise Informative, "当前目录不是iOS工程，请在iOS工程根目录下执行此命令"
+                    project_type = build_helper.project_type(pindo_project_dir)
+
+                    args_temp = []
+                    args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
+                    args_temp << "--upload" if @args_upload_flag
+                    args_temp << "--send" if @args_send_flag
+                    case project_type
+                    when :ios
+                        ios_build
+                    when :android
+                        raise Informative,  "Android 工程， 请使用 pindo android build"
+                    when :unity
+                        raise Informative,  "Unity 工程， 请使用 pindo unity ipa"
+                    else
+                        raise Informative, "当前目录不是工程目录，不能编译"
                     end
+            
+                end
 
+                def ios_build
+                    
+                    pindo_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
                     if @args_upload_flag
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        build_helper.check_check_and_install_cliff(pindo_project_dir)
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
                         if is_need_add_tag
                             Pindo::Command::Dev::Tag::run(tag_action_parms) 
                         end
                     end
 
-                    
                     app_info_obj = nil
                     if @args_upload_flag 
                         proj_name = @args_proj_name
@@ -90,24 +109,13 @@ module Pindo
                     Pindo::Command::Deploy::Build::run(args_temp)
 
 
-                    pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app,apk}")
+                    Dir.chdir(pindo_project_dir)
+                    build_path = File.join(pindo_project_dir, "build", "*.{ipa,app,apk}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
 
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 
 
                         description = nil
-                        if File.exist?(File.join(pindo_new_project_dir, ".release_info"))
-                            description = File.read(File.join(pindo_new_project_dir, ".release_info"))
-                        else
-                            if File.exist?(File.join(pindo_new_project_dir, ".git"))
-                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format=%h::%s)).strip
-                                unless !description.nil? && description.length > 10
-                                    description = nil
-                                end
-                            end
-                        end
-
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
                             msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
@@ -118,11 +126,8 @@ module Pindo
                             end
                         end
                     end
-
-
                 end
 
-
             end
         end
     end

data/lib/pindo/command/pgyer/upload.rb

@@ -105,11 +105,17 @@ module Pindo
                 def run
 
                     current_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
+                    build_helper.check_check_and_install_cliff(current_project_dir)
+                    is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(current_project_dir)
+
+                    Dir.chdir(current_project_dir)
+                    if is_need_add_tag
+                        Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                    end
 
                     if @args_ipa_file.nil? || !File.exist?(@args_ipa_file)
                         # 获取build目录下的ipa文件
-                        # 
-                        build_helper = Pindo::BuildHelper.share_instance
                         project_type = build_helper.project_type(current_project_dir)
                         case project_type
                         when :ios
@@ -167,7 +173,6 @@ module Pindo
                         msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
                         PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
 
-
                         if @args_send_flag
                            if @args_resign_flag
                                 args = []
@@ -185,9 +190,6 @@ module Pindo
                         end
                     end
 
-
-
-
                 end
 
             end

data/lib/pindo/command/unity/ipa.rb

@@ -77,23 +77,24 @@ module Pindo
 
                 def run
 
-                    pindo_unity_project_dir = Dir.pwd
+                    pindo_project_dir = Dir.pwd
 
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
-                    unless unity_helper.unity_project?(pindo_unity_project_dir)
+                    unless unity_helper.unity_project?(pindo_project_dir)
                         raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
                     end
 
                     if @args_upload_flag
                         build_helper = Pindo::BuildHelper.share_instance
-                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        build_helper.check_check_and_install_cliff(pindo_project_dir)
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
                         if is_need_add_tag
                             Pindo::Command::Dev::Tag::run(tag_action_parms) 
                         end
                     end
 
-                    project_unity_version = unity_helper.get_unity_version(pindo_unity_project_dir)
+                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
                     project_unity_major_version = project_unity_version.split('.')[0..1].join('.')
                     puts
                     puts "工程的Unity版本: #{project_unity_version}"
@@ -116,16 +117,16 @@ module Pindo
 
                     isLibrary = @args_base_flag
 
-                    ios_export_lib_dir = File.join(pindo_unity_project_dir, "GoodPlatform/BaseiOS")
+                    ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
                     if File.directory?(ios_export_lib_dir)
                         isLibrary = true
                     end
 
-                    pindo_ios_project_dir = File.join(pindo_unity_project_dir, "GoodPlatform/iOS")
+                    pindo_ios_project_dir = File.join(pindo_project_dir, "GoodPlatform/iOS")
                     if isLibrary
                         pindo_ios_project_dir = ios_export_lib_dir
                     end
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_unity_project_dir, platform:'iOS', isLibrary:isLibrary)
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
                     
                     
                     args_temp = []

data/lib/pindo/module/build/buildhelper.rb

@@ -14,6 +14,95 @@ module Pindo
           end
         end
 
+        def check_check_and_install_cliff(project_path)
+          if is_git_directory?(local_repo_dir: project_path)
+            current_git_root_path = git_root_directory(local_repo_dir: project_path)
+            unless File.exist?(File.join(current_git_root_path, 'cliff.toml'))
+              add_git_cliffconfig(current_git_root_path)
+            end
+          end
+
+          begin
+            if !system('which git-cliff > /dev/null 2>&1')
+              puts "安装git-cliff..."
+              install_gitcliff()
+            end
+          rescue
+            raise Informative, "安装git-cliff出现错误"
+          end
+        end
+
+        def write_gitignore(git_root_dir)
+          gitignore_path = File.join(git_root_dir, '.gitignore')
+          gitignore_content = <<~GITIGNORE
+            # Build logs
+            build_ios.log
+            CHANGELOG.md
+
+            # Platform specific directories
+            /GoodPlatform/iOS/config.json
+            /GoodPlatform/iOS/*
+            /GoodPlatform/Android/*
+            /GoodPlatform/MacOS/*
+            /GoodPlatform/BaseiOS/Unity/*
+            /GoodPlatform/BaseiOS/Pods/
+            /GoodPlatform/BaseiOS/Podfile.lock
+            /GoodPlatform/BaseAndroid/Unity/*
+            /GoodPlatform/BaseMac/Unity/*
+          GITIGNORE
+          # Append to existing .gitignore or create new one
+          File.open(gitignore_path, 'a') do |f|
+            f.puts("\n# Added by Pindo")
+            f.puts(gitignore_content)
+          end
+        end
+
+        def add_git_cliffconfig(project_path)
+
+          temp_dir = Dir.pwd
+          Funlog.instance.fancyinfo_start("添加日志变更git-cliff配置...")
+          if is_git_directory?(local_repo_dir: project_path)
+            current_git_root_path = git_root_directory(local_repo_dir: project_path)
+            Dir.chdir(current_git_root_path)
+            pindo_common_dir = clone_pindo_common_config_repo(force_delete:false)
+            if File.exist?(File.join(pindo_common_dir, 'cliff.toml'))
+              FileUtils.cp_r(File.join(pindo_common_dir, 'cliff.toml'), File.join(current_git_root_path, 'cliff.toml'))
+            end
+            Funlog.instance.fancyinfo_update("仓库添加git-cliff配置")
+            write_gitignore(current_git_root_path)
+            Funlog.instance.fancyinfo_update("仓库添加.gitignore")
+            Dir.chdir(current_git_root_path)
+            current_branch = git!(%W(-C #{current_git_root_path} rev-parse --abbrev-ref HEAD)).strip
+            git!(%W(-C #{current_git_root_path} add cliff.toml))
+            git!(%W(-C #{current_git_root_path} add .gitignore))
+            commit_message = "docs: 添加日志变更配置".encode('UTF-8')
+            git!(%W(-C #{current_git_root_path} commit -m #{commit_message}))
+            git!(%W(-C #{current_git_root_path} push origin #{current_branch}))
+            
+          else
+            Funlog.instance.fancyinfo_error("当前目录不是git仓库，请在git仓库根目录下执行此命令")
+            raise Informative, "当前目录不是git仓库，请在git仓库根目录下执行此命令"
+            Dir.chdir(temp_dir)
+          end
+          Funlog.instance.fancyinfo_success("日志变更git-cliff配置完成!")
+          Dir.chdir(temp_dir)
+        end
+
+        def install_gitcliff()
+          puts "\n检查git-cliff命令是否安装"
+          # 请检查git-cliff命令是否安装
+          begin
+            if !system('which git-cliff > /dev/null 2>&1')
+              # /bin/bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"
+              #安装git-cliff
+              system('bash -c "$(curl -fsSL https://gitee.com/goodtools/env/raw/master/gitcliff_install.sh)"')
+            end
+          rescue
+            raise Informative, "安装git-cliff出现错误"
+          end
+        end
+
+
         def check_is_need_add_tag?(project_path)
           tag_action_parms = nil
           is_need_add_tag = false

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -175,7 +175,7 @@ module Pindo
                 ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
                 current_project_dir = Dir.pwd
                 description = get_description_from_git(current_project_dir:current_project_dir)
-                description = " " if description.empty?
+                description = " " if description.nil? || description.empty?
 
 
                 addtach_file = nil

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.9.4"
+  	VERSION = "4.9.6"
 
   	class VersionCheck
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.9.4
+  version: 4.9.6
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide