pindo 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7508977271b8a9092068bffb6c429402f3f4f3ddf9d9c8fdd3e4c7b7580522
-  data.tar.gz: 912474cf184b1621c147f5c713f374e48f40deeff97306504fa5745fe3648cd2
+  metadata.gz: 3875a278d39ee97be6efefd2e2691f398cb0ec145c079e6ff261181e1f7c4cde
+  data.tar.gz: 463a3b8a6b68376a35017ed3fe9457c86d06ee60eeb3404d02e3aaaca2f152d5
 SHA512:
-  metadata.gz: efc6aeff8688764f201c3723e8b8e391ab02c9abef5d7b9bee68d30a821903549b7343b62e02a02aa8c66918b048c3cc4652523380ab4e08e6a34d96ce8eca6a
-  data.tar.gz: 92671cf31234549e38c59c2a673ff8bc181ef580b0ae5698c69b3179384346d03d3b8966f4b932348c23fd6cbfd1e7af3516e5431da9bdc841969f274327ad7b
+  metadata.gz: 693df9ad920466ab0f93c13e0f5774d970fa24fefb66ff7f0722ca56e25d687098cddb8808113cc4c02feb97d75d7e02ee4b78a6de9f9ec33c545bf8748c910d
+  data.tar.gz: ac047d01af53a8b1be66faf6e6aa667e64d67135d32c1d4c8fc4313a59f4df2bb5b18032d2f659eec81f21c3c43a4f8bccfbc6aa0fe94030b86f82e42cf6facd

data/lib/pindo/base/githelper.rb

@@ -545,7 +545,7 @@ module Pindo
             end 
             
             git!(%W(-C #{project_dir} reset --hard))
-            git!(%W(-C #{project_dir} clean -dfx))
+            git!(%W(-C #{project_dir} clean -df))
             git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch})) 
             git!(%W(-C #{project_dir} pull))
         end

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

@@ -0,0 +1,121 @@
+require 'highline/import'
+require 'fileutils'
+require 'pindo/base/executable'
+require 'pindo/module/build/buildhelper'
+require 'pindo/module/android/build_helper'
+
+module Pindo
+  class Command
+    class Android < Command
+      class Autobuild < Android
+        include Appselect
+
+        self.summary = '打包Android工程并发布到蒲公英'
+        self.description = <<-DESC
+          编译Android包并支持上传到测试平台。
+
+          支持功能:
+              * 编译Debug/Release包
+              * 上传到测试平台
+              * 发送测试通知
+
+          使用示例:
+              $ pindo android autobuild                    # 编译Debug包
+              $ pindo android autobuild --release          # 编译Release包
+              $ pindo android autobuild --upload           # 编译并上传
+              $ pindo android autobuild --send             # 编译上传并发送通知
+              $ pindo android autobuild --proj=myapp       # 指定项目名称
+
+        DESC
+
+        def self.options
+          [
+            ['--release', '使用release模式构建'],
+            ['--proj',   '指定上传到测试平台的项目名称'],
+            ['--upload', '上传编译后的apk到测试平台'],
+            ['--send',   '上传成功后发送测试通知']
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @args_release_flag = argv.flag?('release', false)
+          @args_upload_flag = argv.flag?('upload', false)
+          @args_send_flag = argv.flag?('send', false)
+          @args_proj_name = argv.option('proj')
+
+
+          if @args_send_flag
+            @args_upload_flag = true
+          end
+
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def run
+          pindo_project_dir = Dir.pwd
+          build_helper = Pindo::BuildHelper.share_instance
+          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
+            puts "iOS 工程， 请使用 pindo ios build"
+          when :android
+            android_autobuild
+          when :unity
+            Pindo::Command::Unity::Apk::run(args_temp)
+          else
+            raise Informative, "当前目录不是工程目录，不能编译"
+          end
+        end
+
+        private
+
+        def android_autobuild
+
+          pindo_project_dir = Dir.pwd
+          build_helper = Pindo::BuildHelper.share_instance
+
+          if @args_upload_flag
+            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
+              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+          end
+
+          android_build_helper = Pindo::AndroidBuildHelper.share_instance
+          apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
+          ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
+
+          if !ipa_file_upload.nil? && !app_info_obj.nil?
+              description = nil
+              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"])
+                  PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                  if @args_send_flag
+                      PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)
+                  end
+              end
+          end
+
+          system "open #{pindo_project_dir}"
+
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'pindo/module/build/buildhelper'
+require 'pindo/module/android/build_helper'
+
+module Pindo
+  class Command
+    class Android < Command
+      class Build < Android
+
+        self.summary = '编译Android工程并支持上传apk'
+        self.description = <<-DESC
+          编译Android工程并生成apk文件。
+
+          支持功能:
+              * 编译工程
+              * 生成APK文件
+              * 支持上传分发
+
+          使用示例:
+              $ pindo android build                    # 仅编译
+              $ pindo android build --upload           # 编译并上传
+              $ pindo android build --send             # 编译并发送通知
+              $ pindo android build --proj=myapp       # 指定项目名称
+        DESC
+
+        def self.options
+          [
+            ['--proj', '指定上传到测试平台的项目名称'],
+            ['--upload', '上传编译后的apk到测试平台'],
+            ['--send', '上传成功后发送测试通知'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @args_upload_flag = argv.flag?('upload', false)
+          @args_send_flag = argv.flag?('send', false)
+          @args_proj_name = argv.option('proj')
+
+          if @args_send_flag
+            @args_upload_flag = true
+          end
+
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def run
+
+          pindo_project_dir = Dir.pwd
+
+          build_helper = Pindo::BuildHelper.share_instance
+          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
+            raise Informative,  "iOS 工程， 请使用 pindo ios build"
+          when :android
+            android_build
+          when :unity
+              raise Informative,  "Unity 工程， 请使用 pindo unity apk"
+          else
+              raise Informative, "当前目录不是工程目录，不能编译"
+          end
+        end
+
+        def android_build
+          pindo_project_dir = Dir.pwd
+          build_helper = Pindo::BuildHelper.share_instance
+          if @args_upload_flag
+              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
+              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+          end
+
+
+          android_build_helper = Pindo::AndroidBuildHelper.share_instance
+          apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
+          ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
+
+          if !ipa_file_upload.nil? && !app_info_obj.nil?
+
+              description = nil
+              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"])
+
+                  PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                  if @args_send_flag
+                      PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)
+                  end
+              end
+          end
+
+          system "open #{pindo_project_dir}"
+        end
+      end
+    end
+  end
+end

data/lib/pindo/command/android/debug.rb

@@ -11,12 +11,12 @@ module Pindo
         # 详细说明
         self.description = <<-DESC
             编译Android Debug包并支持上传到测试平台。
-            
+
             支持功能:
 
                 * 编译Debug包
 
-                * 上传到测试平台  
+                * 上传到测试平台
 
                 * 发送测试通知
 
@@ -30,6 +30,12 @@ module Pindo
 
                 $ pindo android debug --proj=myapp       # 指定项目名称
 
+                $ pindo android debug --release          # 编译Release包
+
+                $ pindo android debug --dsign            # 测试获取签名文件
+
+                $ pindo android debug --direct           # 直接打包而不编译 unity 子 Lib
+
         DESC
 
         # 命令参数
@@ -40,34 +46,74 @@ module Pindo
         # 命令选项
         def self.options
           [
-            ['--proj',   '指定上传到测试平台的项目名称'],
-            ['--upload', '上传编译后的apk到测试平台'],
-            ['--send',   '上传成功后发送测试通知']
+            ['--proj',    '指定上传到测试平台的项目名称'],
+            ['--upload',  '上传编译后的apk到测试平台'],
+            ['--send',    '上传成功后发送测试通知'],
+            ['--release', '使用release模式构建'],
+            ['--dsign',   '获取签名文件'],
+            ['--direct',  '直接打包而不编译 unity 子 Lib']
           ].concat(super)
         end
 
         def initialize(argv)
-          @args_adhoc_flag = argv.flag?('adhoc', false)
-          @args_deploy_flag = argv.flag?('deploy', false)
-          @args_macos_flag = argv.flag?('macos', false)
+          @args_release_flag = argv.flag?('release', false)
           @upload_flag = argv.flag?('upload', false)
           @send_flag = argv.flag?('send', false)
           @proj_name = argv.option('proj')
-          
+          @args_dsign_flag = argv.flag?('dsign', false)
           if @send_flag
             @upload_flag = true
           end
-          
+          @args_direct_flag = argv.flag?('direct', false)
+
           super
         end
 
         def run
-          # TODO: 实现编译和上传逻辑
-          puts "Android Debug包编译和上传命令"
-          
+          pindo_project_dir = Dir.pwd
+
+          # 如果设置了 dsign 标志，则执行签名文件获取并直接返回
+          if @args_dsign_flag
+            Pindo::AndroidBuildHelper.share_instance.dsign(pindo_project_dir, !@args_release_flag)
+            return
+          end
+
+          build_helper = Pindo::BuildHelper.share_instance
+
+          if @args_upload_flag
+            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
+              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+          end
+
+          apk_path = Pindo::AndroidBuildHelper.share_instance.auto_build_apk(pindo_project_dir, !@args_release_flag, @args_direct_flag)
+          ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
+
+          if !ipa_file_upload.nil? && !app_info_obj.nil?
+              description = nil
+              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"])
+                  PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                  if @args_send_flag
+                      PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)
+                  end
+              end
+          end
+
+          system "open #{pindo_project_dir}"
+
         end
 
       end
     end
   end
-end
+end

data/lib/pindo/command/android.rb

@@ -1,14 +1,17 @@
 
 
 require 'pindo/command/android/debug'
+require 'pindo/command/android/autobuild'
+require 'pindo/command/android/build'
 
 module Pindo
   class Command
-    
     class Android < Command
       self.abstract_command = true
       self.summary = 'Android相关命令'
-    end
+      self.command = 'and'
+      # self.command_name = 'and'
 
+    end
   end
 end

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

@@ -114,6 +114,12 @@ module Pindo
                         end
                     end
 
+                    new_project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    if !new_project_fullname.nil? && File.exist?(new_project_fullname)
+                        build_helper.delete_libtarget_firebase_shell(pindo_project_dir)
+                    end
+                    
+
 
                     mainapp_bundleid= nil
                     if @args_bundle_id

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

@@ -98,6 +98,12 @@ module Pindo
                         end
                     end
 
+                    new_project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    puts "new_project_fullname: #{new_project_fullname}"
+                    if !new_project_fullname.nil? && File.exist?(new_project_fullname)
+                        build_helper.delete_libtarget_firebase_shell(pindo_project_dir)
+                    end
+
                     app_info_obj = nil
                     if @args_upload_flag 
                         proj_name = @args_proj_name
@@ -110,7 +116,7 @@ module Pindo
 
 
                     Dir.chdir(pindo_project_dir)
-                    build_path = File.join(pindo_project_dir, "build", "*.{ipa,app,apk}")
+                    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? 

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

@@ -3,7 +3,8 @@ require 'xcodeproj'
 require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
-
+require 'pindo/module/build/unityhelper'
+require 'pindo/module/build/buildhelper'
 
 module Pindo
     class Command
@@ -12,11 +13,11 @@ module Pindo
 
                 # 命令的简要说明 - 编译Unity工程生成Android APK
                 self.summary = '编译Unity工程生成Android APK'
-    
+
                 # 命令的详细说明,包含用法示例
                 self.description = <<-DESC
                     编译Unity工程生成Android APK。
-                    
+
                     支持功能:
 
                         * 编译生成APK
@@ -41,7 +42,6 @@ module Pindo
 
                 ]
 
-
                 # 命令的选项列表
                 def self.options
                     [
@@ -51,7 +51,7 @@ module Pindo
                         ['--upload', '上传编译后的APK到测试平台'],
                         # 发送通知
                         ['--send',   '上传成功后发送测试通知']
-                        
+
                     ].concat(super)
                 end
 
@@ -69,7 +69,70 @@ module Pindo
                 end
 
                 def run
-                    puts "apk"
+                    pindo_project_dir = Dir.pwd
+
+                    # 检查是否是Unity工程
+                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    unless unity_helper.unity_project?(pindo_project_dir)
+                        raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
+                    end
+
+                    if @args_upload_flag
+                        build_helper = Pindo::BuildHelper.share_instance
+                        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_project_dir)
+                    puts
+                    puts "工程的Unity版本: #{project_unity_version}"
+                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
+                    puts "选择的Unity路径: #{unity_exe_path}"
+                    puts
+
+                    app_info_obj = nil
+                    if @args_upload_flag
+                        proj_name = @args_proj_name
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
+
+                    isLibrary = @args_base_flag
+
+                    android_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseAndroid")
+                    if File.directory?(android_export_lib_dir)
+                        isLibrary = true
+                    end
+
+                    pindo_android_project_dir = File.join(pindo_project_dir, "GoodPlatform/Android")
+                    if isLibrary
+                        pindo_android_project_dir = android_export_lib_dir
+                    end
+                    puts "开始构建Unity项目..."
+
+                    unity_helper.build_project(
+                        unity_exe_full_path: unity_exe_path,
+                        project_path: pindo_project_dir,
+                        platform: 'Android',
+                        isLibrary: isLibrary
+                    )
+
+                    puts "Unity项目构建完成，准备处理Android项目..."
+                    args_temp = []
+
+                    if @args_upload_flag
+                        args_temp << "--proj=#{app_info_obj["appName"]}"
+                        args_temp << "--upload"
+                    end
+                    if @args_send_flag
+                        args_temp << "--send"
+                    end
+
+                    Dir.chdir(pindo_android_project_dir)
+
+                    Pindo::Command::Android::Autobuild::run(args_temp)
                 end
 
             end

data/lib/pindo/command/utils/renewcert.rb

@@ -55,8 +55,8 @@ module Pindo
 
                 fixed_bundleid_array.each do |bundle_id|
                     # begin
-                        if bundle_id.eql?("com.heroneverdie101")
-                            bundle_id = "com.heroneverdie101.*"
+                        if bundle_id.eql?("com.heroneverdie101.*")
+                            bundle_id = "com.heroneverdie101"
                         end
                       fixed_cert(bundle_id:bundle_id, renew_flag:@renew_cert_flag, upload_flag:@upload_flag, fixed_bundleid_flag:@fixedid_flag)
                     # rescue => err

data/lib/pindo/module/android/apk_helper.rb

@@ -0,0 +1,91 @@
+require_relative 'base_helper'
+
+module Pindo
+  module ApkHelper
+    include BaseAndroidHelper
+
+    def build_apk(project_path, debug)
+      raise ArgumentError, "项目路径不能为空" if project_path.nil? || project_path.empty?
+
+      # 构建 AAB 文件
+      unless build_aab(project_path, debug)
+        raise RuntimeError, "AAB 构建失败"
+      end
+
+      # 获取必要的配置信息
+      main_module = get_main_module(project_path)
+      raise ArgumentError, "无法找到主模块" unless main_module
+
+      keystore_config = get_keystore_config(project_path, debug)
+      raise ArgumentError, "无法从 build.gradle 中获取 keystore 信息" unless keystore_config
+
+      bundle_tool = get_build_tools[:bundle_tool]
+      raise ArgumentError, "找不到 bundletool" unless File.exist?(bundle_tool)
+
+      # 准备输出路径
+      build_type = debug ? 'debug' : 'release'
+      main_module_name = File.basename(main_module)
+      output_dir = File.join(project_path, "build/apks")
+
+      # 清理已存在的文件
+      FileUtils.rm_rf(output_dir)
+      FileUtils.mkdir_p(output_dir)
+
+      # 构建路径配置
+      paths = {
+        output_apks: File.join(output_dir, "app.apks"),
+        bundle: File.join(main_module, "build/outputs/bundle/#{build_type}/#{main_module_name}-#{build_type}.aab"),
+        universal_apk: File.join(output_dir, "universal.apk")
+      }
+
+      # 检查 bundle 文件是否存在
+      unless File.exist?(paths[:bundle])
+        raise RuntimeError, "找不到 AAB 文件: #{paths[:bundle]}"
+      end
+
+      puts "解析 keystore 配置"
+      ks = keystore_config[:store_file]
+      puts "读取 keystore path = #{ks}"
+      ks_pass = keystore_config[:store_password]
+      puts "读取 keystore pass = #{ks_pass}"
+      key_alias = keystore_config[:key_alias]
+      puts "读取 key alias = #{key_alias}"
+      key_pass = keystore_config[:key_password]
+      puts "读取 key pass = #{key_pass}"
+
+      # 构建 APK
+      bundletool_cmd = [
+        "java -jar #{bundle_tool} build-apks",
+        "--bundle=#{paths[:bundle]}",
+        "--output=#{paths[:output_apks]}",
+        "--ks=#{ks}",
+        "--ks-pass=pass:#{ks_pass}",
+        "--ks-key-alias=#{key_alias}",
+        "--key-pass=pass:#{key_pass}",
+        "--mode=universal"
+      ].join(" ")
+
+      unless system(bundletool_cmd)
+        raise RuntimeError, "APKS 构建失败"
+      end
+
+      # 解压 APKs 文件
+      unless system("unzip", "-o", paths[:output_apks], "-d", output_dir)
+        raise RuntimeError, "APKS 解压失败"
+      end
+
+      # 返回生成的 APK 路径
+      unless File.exist?(paths[:universal_apk])
+        raise RuntimeError, "未找到生成的 APK 文件"
+      end
+
+      paths[:universal_apk]
+    end
+
+    def build_aab(project_path, debug)
+      Dir.chdir(project_path) do
+        system("./gradlew bundle#{debug ? 'Debug' : 'Release'}")
+      end
+    end
+  end
+end