pindo 5.10.4 → 5.10.8

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

@@ -1,128 +0,0 @@
-require 'singleton'
-require_relative 'base_helper'
-require_relative 'gradle_helper'
-require_relative 'so_helper'
-require_relative 'apk_helper'
-require 'fileutils'
-
-module Pindo
-  class AndroidBuildHelper
-    include BaseAndroidHelper
-    include GradleHelper
-    include SoHelper
-    include ApkHelper
-    include Singleton
-
-
-
-    class << self
-      def share_instance
-        instance
-      end
-    end
-
-    # 该方法已迁移到 Pindo::AndroidBuildConfigHelper.add_test_scheme
-    # 保留代理方法以兼容旧调用
-    def add_test_scheme(project_dir:nil, scheme_name:nil)
-      puts "Warning: add_test_scheme已迁移，请使用Pindo::AndroidBuildConfigHelper.add_test_scheme"
-      require_relative 'android_build_config_helper'
-      Pindo::AndroidBuildConfigHelper.add_test_scheme(project_dir: project_dir, scheme_name: scheme_name)
-    end
-
-    def auto_build_apk(project_dir, debug = false, ignore_sub = false)
-      # 检查 gradle.properties 中是否设置了 Java Home
-      gradle_properties_path = File.join(project_dir, "gradle.properties")
-      if File.exist?(gradle_properties_path)
-        puts "检查 gradle.properties 中的 Java Home 设置..."
-        content = File.read(gradle_properties_path)
-        java_home_match = content.match(/org\.gradle\.java\.home\s*=\s*(.+)/)
-        if java_home_match && !java_home_match[1].empty?
-          java_home_path = java_home_match[1].strip
-          puts "找到 Java Home 路径: #{java_home_path}"
-          # 设置环境变量
-          ENV['JAVA_HOME'] = java_home_path
-          ENV['PATH'] = "#{java_home_path}/bin:#{ENV['PATH']}"
-          puts "已设置 JAVA_HOME 环境变量为: #{java_home_path}"
-          puts "Java 版本信息："
-          system("java -version")
-        end
-      end
-
-      # 检查
-      if !ignore_sub
-        sub_android_dir = find_android_subproject(project_dir)
-        if sub_android_dir
-          prepare_proj(sub_android_dir)
-          # 构建 AAB 文件
-          unless build_so_library(sub_android_dir)
-            raise RuntimeError, "编译SO库失败:"
-          end
-          copy_so_files(sub_android_dir, project_dir)
-        end
-      end
-
-      prepare_proj(project_dir)
-      build_apk(project_dir, debug)
-    end
-
-    def get_application_id(project_path)
-      main_module = get_main_module(project_path)
-      return nil unless main_module
-
-      # 尝试从 build.gradle 获取
-      gradle_path = File.join(main_module, "build.gradle")
-      if File.exist?(gradle_path)
-        content = File.read(gradle_path)
-        if content =~ /applicationId\s+['"]([^'"]+)['"]/
-          return $1
-        end
-      end
-
-      # 如果 build.gradle 中没有，尝试从 AndroidManifest.xml 获取
-      manifest_path = File.join(main_module, "src", "main", "AndroidManifest.xml")
-      if File.exist?(manifest_path)
-        require 'nokogiri'
-        doc = Nokogiri::XML(File.read(manifest_path))
-        package = doc.at_xpath('//manifest/@package')&.value
-        return package if package
-      end
-
-      nil
-    end
-
-    def dsign(project_path, debug)
-      keystore_config = get_keystore_config(project_path, debug)
-
-      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}"
-    end
-
-    private
-
-    def prepare_proj(project_dir)
-      raise ArgumentError, "项目目录不能为空" if project_dir.nil?
-      raise ArgumentError, "项目目录不存在" unless File.directory?(project_dir)
-
-      check_gradle_files(project_dir)
-      if unity_android_project?(project_dir)
-        update_build_gradle(project_dir)
-        update_gradle_version(project_dir)
-        modify_il2cpp_config(project_dir)
-        remove_desktop_google_service(project_dir)
-      end
-    rescue StandardError => e
-      raise Informative, "准备项目失败: #{e.message}"
-    end
-
-    # 相关辅助方法已迁移到 Pindo::AndroidBuildConfigHelper
-    # find_manifests, find_best_activity, check_scheme_exists等方法已被移除
-    # 请使用 AndroidBuildConfigHelper 中的相应方法
-  end
-end
-

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

@@ -1,18 +0,0 @@
-module Pindo
-  module SoHelper
-
-    def build_so_library(project_path)
-      # 编译so库
-      Dir.chdir(project_path) do
-        system("./gradlew unityLibrary:BuildIl2CppTask")
-      end
-    end
-
-    def copy_so_files(source_path, target_path)
-      # 复制so文件到正确的目录
-      src_dir = File.join(source_path, "unityLibrary/src/main/assets")
-      dst_dir = File.join(target_path, "unityLibrary/src/main/assets")
-      FileUtils.cp_r(src_dir, dst_dir) if File.directory?(src_dir)
-    end
-  end
-end

data/lib/pindo/module/cert/certhelper.rb

@@ -1,246 +0,0 @@
-
-
-require 'match'
-require 'openssl'
-require 'pindo/base/aeshelper'
-require 'pindo/module/cert/keychainhelper'
-require 'pindo/module/cert/provisioninghelper'
-
-
-module Pindo
-
-  module CertHelper
-    # 密码缓存，避免重复获取相同URL的密码
-    @@password_cache = {}
-    
-    # 获取密码的辅助方法，使用缓存避免重复获取
-    def self.get_cached_password(cert_url)
-      unless @@password_cache[cert_url]
-        puts "\e[33m[DEBUG] 密码缓存中未找到，从Keychain获取: #{cert_url}\e[0m" if ENV['PINDO_DEBUG']
-        @@password_cache[cert_url] = AESHelper.fetch_password(keychain_name: cert_url)
-        puts "\e[32m[DEBUG] 密码已缓存: #{cert_url}\e[0m" if ENV['PINDO_DEBUG']
-      else
-        puts "\e[32m[DEBUG] 从密码缓存获取: #{cert_url}\e[0m" if ENV['PINDO_DEBUG']
-      end
-      @@password_cache[cert_url]
-    end
-    
-    # 清除密码缓存
-    def self.clear_password_cache
-      @@password_cache.clear
-    end
-    
-    # 清除特定URL的密码缓存
-    def self.clear_password_cache_for_url(cert_url)
-      @@password_cache.delete(cert_url)
-    end
-   
-    def get_cert_info(cer_certificate)
-      # can receive a certificate path or the file data
-      begin
-        if File.exist?(cer_certificate)
-          cer_certificate = File.binread(cer_certificate)
-        end
-      rescue ArgumentError
-        # cert strings have null bytes; suppressing output
-      end
-
-      cert = OpenSSL::X509::Certificate.new(cer_certificate)
-
-      # openssl output:
-      # subject= /UID={User ID}/CN={Certificate Name}/OU={Certificate User}/O={Organisation}/C={Country}
-      cert_info = cert.subject.to_s.gsub(/\s*subject=\s*/, "").tr("/", "\n")
-      out_array = cert_info.split("\n")
-      openssl_keys_to_readable_keys = {
-           'UID' => 'User ID',
-           'CN' => 'Common Name',
-           'OU' => 'Organisation Unit',
-           'O' => 'Organisation',
-           'C' => 'Country',
-           'notBefore' => 'Start Datetime',
-           'notAfter' => 'End Datetime'
-       }
-
-      return out_array.map { |x| x.split(/=+/) if x.include?("=") }
-                      .compact
-                      .map { |k, v| [openssl_keys_to_readable_keys.fetch(k, k), v] }
-                      .push([openssl_keys_to_readable_keys.fetch("notBefore"), cert.not_before])
-                      .push([openssl_keys_to_readable_keys.fetch("notAfter"), cert.not_after])
-    rescue => ex
-      raise Informative, "get_cert_info: #{ex}"
-      return {}
-    end
-
-    def select_cert_or_key(paths:)
-      cert_id_path = ENV['MATCH_CERTIFICATE_ID'] ? paths.find { |path| path.include?(ENV['MATCH_CERTIFICATE_ID']) } : nil
-      cert_id_path || paths.last
-    end
-
-    def is_cert_valid?(cer_certificate_path)
-      cert = OpenSSL::X509::Certificate.new(File.binread(cer_certificate_path))
-      now = Time.now.utc
-      return (now <=> cert.not_after) == -1
-    end
-
-    def isMac?
-      (/darwin/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def install_certs(cert_url:nil, certs_dir:nil, cert_type:nil, platform_type:nil)
-
-      cert_git_dir = cert_type.downcase
-      if platform_type.downcase.eql?("macos")
-        if cert_type.downcase.include?("development")
-          cert_git_dir = "development"
-        elsif cert_type.downcase.eql?("appstore")
-          cert_git_dir = "distribution"
-        else
-          cert_git_dir = "developer_id_application"
-        end
-      else
-        if !cert_type.downcase.include?("development")
-          cert_git_dir = "distribution"
-        end
-      end
-
-      certs = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.cer")]
-      keys = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.p12")]      
-
-      if certs.count == 0 || keys.count == 0
-        raise Informative, "No certificates found in #{certs_dir}"
-      else
-          output_dir = Dir.mktmpdir
-          
-          decrypt_password = CertHelper.get_cached_password(cert_url)
-          Funlog.instance.fancyinfo_start("正在安装证书...")
-
-          cert_path = AESHelper.decrypt_specific_file(src_file: certs.first, password:decrypt_password, output_dir: output_dir)
-          if cert_path.nil? || cert_path.empty? || !File.exist?(cert_path)
-            AESHelper.delete_password(keychain_name:cert_url)
-            # 清除内存中的密码缓存，避免重复使用错误密码
-            @@password_cache.delete(cert_url)
-            raise Informative, "证书解析失败，密码错误！"
-          end
-
-          key_path = AESHelper.decrypt_specific_file(src_file: keys.first, password:decrypt_password, output_dir: output_dir)
-          if key_path.nil? || key_path.empty? || !File.exist?(key_path)
-            AESHelper.delete_password(keychain_name:cert_url)
-            # 清除内存中的密码缓存，避免重复使用错误密码
-            @@password_cache.delete(cert_url)
-            raise Informative, "证书解析失败，密码错误！"
-          end
-
-          unless is_cert_valid?(cert_path)
-             raise Informative, "证书已经过期，请重新生产新证书!"
-          end
-
-
-          if isMac?
-
-            keychain_name = "login.keychain"
-            if FastlaneCore::CertChecker.installed?(cert_path, in_keychain: nil)
-              Funlog.instance.fancyinfo_success("证书#{File.basename(cert_path)}已安装，无需重复安装!")
-            else
-
-              cert_password = Pindoconfig.instance.cert_key_password
-              keychain = 'login.keychain'
-              keychain_path = FastlaneCore::Helper.keychain_path(keychain)
-
-              KeychainHelper.import_file(cert_path, keychain_path, keychain_password: cert_password, certificate_password:'' )
-              KeychainHelper.import_file(key_path, keychain_path, keychain_password: cert_password, certificate_password: '')
-
-              Funlog.instance.fancyinfo_success("证书'#{File.basename(cert_path)}'安装完成！")
-
-            end
-          else
-            Funlog.instance.fancyinfo_error("非Mac电脑不支持安装证书!")
-          end
-
-      end
-
-      def install_provisionfiles(cert_url:nil, certs_dir:nil, bundle_id_map:nil, cert_type:nil, platform_type:nil)
-
-            cert_sub_dir = cert_type.downcase
-            provision_start_name = "Development"
-            provision_extension_name = ".mobileprovision"
-
-            if platform_type.downcase.include?("macos")
-              provision_extension_name = ".provisionprofile"
-
-              if cert_type.downcase.include?("development")
-                provision_start_name = "Development"
-                cert_sub_dir = cert_type.downcase
-              elsif cert_type.downcase.eql?("appstore")
-                provision_start_name = "AppStore"
-                cert_sub_dir = "appstore" 
-              else
-                provision_start_name = "Direct"
-                cert_sub_dir = "developer_id"
-              end
-            else
-              provision_extension_name = ".mobileprovision"
-              if cert_type.downcase.include?("development")
-                provision_start_name = "Development"
-                cert_sub_dir = cert_type.downcase
-              elsif cert_type.downcase.include?("adhoc")
-                provision_start_name = "Adhoc"
-                cert_sub_dir = "adhoc"
-              else
-                provision_start_name = "AppStore"
-                cert_sub_dir = "appstore"
-              end
-            end
-
-
-            Funlog.instance.fancyinfo_start("正在安装#{provision_start_name}  #{platform_type} Provisioning Profiles...")
-
-            un_exist_files = []
-            provisioning_info_array = []
-            
-            # 在循环外获取密码，避免重复添加到Keychain
-            decrypt_password = CertHelper.get_cached_password(cert_url)
-            
-            bundle_id_map.each do |type, bundle_id_temp|
-                profile_filename = File.join(certs_dir, "profiles", cert_sub_dir, [provision_start_name.to_s, bundle_id_temp].join('_') + provision_extension_name) 
-                  unless File.exist?(profile_filename)
-                    un_exist_files << profile_filename 
-                    next
-                  end
-                  # puts "正在安装 #{bundle_id_temp}..."
-                  output_dir = Dir.mktmpdir
-                  file_decrypt = AESHelper.decrypt_specific_file(src_file: profile_filename, password:decrypt_password, output_dir: output_dir)
-                  destpath = Provisioninghelper.install(file_decrypt)
-                  parsed_data = Provisioninghelper.parse(destpath)
-
-                  provisioning_info = {}
-                  provisioning_info['type'] = type
-                  provisioning_info['bundle_id'] = bundle_id_temp
-                  provisioning_info['profile_name'] = parsed_data['Name']
-                  provisioning_info['profile_path'] = destpath
-
-
-                  cert_info = get_cert_info(parsed_data["DeveloperCertificates"].first.string).to_h
-                  provisioning_info['signing_identity'] = cert_info["Common Name"]
-                  provisioning_info['team_id'] = parsed_data["TeamIdentifier"].first
-
-                  # puts JSON.pretty_generate(provisioning_info)
-                  provisioning_info_array << provisioning_info
-            end
-
-            Funlog.instance.fancyinfo_success("#{provision_start_name} #{platform_type} Provisioning Profiles文件安装完成！")
-
-            if un_exist_files.size > 0
-              Funlog.instance.fancyinfo_error("证书 #{provision_start_name}  #{platform_type} Provisioning Profiles文件不存在！")
-              raise Informative, "The following profiles do not exist: #{un_exist_files.join(', ')}"
-            end
-
-            return provisioning_info_array
-            
-      end
-
-
-    end
-
-
-  end
-end

data/lib/pindo/module/cert/keychainhelper.rb

@@ -1,150 +0,0 @@
-
-require 'open3'
-require 'security'
-
-module Pindo
-
-  module KeychainHelper
-
-    def self.import_file(path, keychain_path, keychain_password: nil, certificate_password: "", skip_set_partition_list: false, output: false)
-      # puts path
-
-      # puts "Could not find file '#{path}'" unless File.exist?(path)
-
-      password_part = " -P #{certificate_password.shellescape}"
-
-      command = "security import #{path.shellescape} -k '#{keychain_path.shellescape}'"
-      command << password_part
-      command << " -T /usr/bin/codesign" # to not be asked for permission when running a tool like `gym` (before Sierra)
-      command << " -T /usr/bin/security"
-      command << " -T /usr/bin/productbuild" # to not be asked for permission when using an installer cert for macOS
-      command << " -T /usr/bin/productsign"  # to not be asked for permission when using an installer cert for macOS
-      command << " 1> /dev/null" unless output
-
-      # puts command
-      # sensitive_command = command.gsub(password_part, " -P ********")
-
-      # UI.command(sensitive_command) if output
-      Open3.popen3(command) do |stdin, stdout, stderr, thrd|
-        # UI.command_output(stdout.read.to_s) if output
-        # puts "123"
-        # Set partition list only if success since it can be a time consuming process if a lot of keys are installed
-        if thrd.value.success? && !skip_set_partition_list
-          # puts "安装成功!"
-          keychain_password ||= resolve_keychain_password(keychain_path)
-          set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output)
-        else
-          # Output verbose if file is already installed since not an error otherwise we will show the whole error
-          err = stderr.read.to_s.strip
-
-          if err.include?("SecKeychainItemImport") && err.include?("The specified item already exists in the keychain")
-            # UI.verbose("'}' is already installed on this machine")
-            # puts "证书key已经存在，安装完成!"
-          else
-            # puts err
-            # raise Informative, err
-          end
-        end
-      end
-    end
-
-    def self.help_backticks(command, print: true)
-      # UI.command(command) if print
-      result = `#{command}`
-      # UI.command_output(result) if print
-      return result
-    end
-
-    def self.set_partition_list(path, keychain_path, keychain_password: nil, output: false)
-      # When security supports partition lists, also add the partition IDs
-      # See https://openradar.appspot.com/28524119
-      if help_backticks('security -h | grep set-key-partition-list', print: false).length > 0
-        password_part = " -k #{keychain_password.to_s.shellescape}"
-
-        command = "security set-key-partition-list"
-        command << " -S apple-tool:,apple:,codesign:"
-        command << " -s" # This is a needed in Catalina to prevent "security: SecKeychainItemCopyAccess: A missing value was detected."
-        command << password_part
-        command << " #{keychain_path.shellescape}"
-        command << " 1> /dev/null" # always disable stdout. This can be very verbose, and leak potentially sensitive info
-
-        # Showing loading indicator as this can take some time if a lot of keys installed
-        # Helper.show_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)")
-
-        # Strip keychain password from command output
-        # sensitive_command = command.gsub(password_part, " -k ********")
-        # puts command
-        # UI.command(sensitive_command) if output
-        Open3.popen3(command) do |stdin, stdout, stderr, thrd|
-          unless thrd.value.success?
-            err = stderr.read.to_s.strip
-
-            # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
-            if err.include?("SecKeychainItemSetAccessWithPassword")
-              keychain_name = File.basename(keychain_path, ".*")
-              # puts "password #{keychain_password}"
-              # puts "keychain #{keychain_name}"
-              # puts "security #{server_name(keychain_name)}"
-              Security::InternetPassword.delete(server: server_name(keychain_name))
-
-              # UI.important("")
-              # UI.important("Could not configure imported keychain item (certificate) to prevent UI permission popup when code signing\n" \
-              #          "Check if you supplied the correct `keychain_password` for keychain: `#{keychain_path}`\n" \
-              #          "#{err}")
-              # UI.important("")
-              # UI.important("Please look at the following docs to see how to set a keychain password:")
-              # UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
-              # UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
-              # puts "证书密码错误!"
-            else
-              puts err
-            end
-          end
-        end
-
-        # Hiding after Open3 finishes
-        # Helper.hide_loading_indicator
-
-      end
-    end
-
-    # https://github.com/fastlane/fastlane/issues/14196
-    # Keychain password is needed to set the partition list to
-    # prevent Xcode from prompting dialog for keychain password when signing
-    # 1. Uses keychain password from login keychain if found
-    # 2. Prompts user for keychain password and stores it in login keychain for user later
-    def self.resolve_keychain_password(keychain_path)
-      keychain_name = File.basename(keychain_path, ".*")
-      server = server_name(keychain_name)
-
-      # Attempt to find password in keychain for keychain
-      item = Security::InternetPassword.find(server: server)
-      if item
-        keychain_password = item.password
-        # UI.important("Using keychain password from keychain item #{server} in #{keychain_path}")
-      end
-
-      if keychain_password.nil?
-        # if UI.interactive?
-          # UI.important("Enter the password for #{keychain_path}")
-          # UI.important("This passphrase will be stored in your local keychain with the name #{server} and used in future runs")
-          # UI.important("This prompt can be avoided by specifying the 'keychain_password' option or 'MATCH_KEYCHAIN_PASSWORD' environment variable")
-          keychain_password = FastlaneCore::Helper.ask_password(message: "Password for #{keychain_name} keychain: ", confirm: true, confirmation_message: "Type password for #{keychain_name} keychain again: ")
-          Security::InternetPassword.add(server, "", keychain_password)
-        # else
-          # UI.important("Keychain password for #{keychain_path} was not specified and not found in your keychain. Specify the 'keychain_password' option to prevent the UI permission popup when code signing")
-          # keychain_password = ""
-        # end
-      end
-
-      return keychain_password
-    end
-
-    # server name used for accessing the macOS keychain
-    def self.server_name(keychain_name)
-      ["pindo", "keychain", keychain_name].join("_")
-    end
-
-    private_class_method :server_name
-  end
-end

data/lib/pindo/module/cert/pemhelper.rb

@@ -1,65 +0,0 @@
-
-module Pindo
-
-  module PemHelper
-
-    def create_certificate(bundle_id:nil, type:"prod", output_path:"")
-
-      if bundle_id.empty? || output_path.empty?
-        UI.user_error!("bundle id is nil or output_path is nil.")
-      end
-
-      puts "Creating a new push certificate for app '#{bundle_id}'. "
-
-      csr, pkey = Spaceship::Portal.certificate.create_certificate_signing_request
-
-      cert = nil
-      begin
-        if type == "dev"
-          cert = Spaceship::Portal.certificate.development_push.create!(csr: csr, bundle_id: bundle_id)
-        else
-          cert = Spaceship::Portal.certificate.production_push.create!(csr: csr, bundle_id: bundle_id)
-        end
-      rescue => ex
-        if ex.to_s.include?("You already have a current")
-          # That's the most common failure probably
-          raise Informative, "You already have 2 active push profiles for this application/environment. You'll need to revoke an old certificate to make room for a new one"
-        else
-          raise ex
-        end
-      end
-
-
-      x509_certificate = cert.download
-      certificate_type = (type == "dev" ? 'development' : 'production')
-
-      base_base = bundle_id.gsub('.', '_')
-      puts base_base
-      filename_base = base_base + '_' + type
-      
-      
-      private_key_path = File.join(output_path, "#{filename_base}.pkey")
-      File.write(private_key_path, pkey.to_pem)
-      puts "key: #{private_key_path}"
-
-
-      p12_cert_path = File.join(output_path, "#{filename_base}.p12")
-      p12 = OpenSSL::PKCS12.create('goodcert1', certificate_type, pkey, x509_certificate)
-      File.write(p12_cert_path, p12.to_der)
-      puts "p12 : #{p12_cert_path}"
-
-
-      x509_cert_path = File.join(output_path, "#{filename_base}.pem")
-      File.write(x509_cert_path, x509_certificate.to_pem + pkey.to_pem)
-      puts "pem : #{x509_cert_path}"
-
-      return x509_cert_path
-    end
-
-    def login(apple_id:nil)
-      puts apple_id
-      Spaceship::Portal.login(apple_id.to_s)
-      Spaceship::Portal.select_team
-    end
-  end
-end