pindo 5.2.4 → 5.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235be197b7b9f5717b54477a778d7b27387ce4b12d72f3d4cf4bccb7f8267df3
-  data.tar.gz: 619ee059cd180a87cd699417f7a0b3021ee88223ca82565dad183edcbb2df5e7
+  metadata.gz: 3dda2ad2ab5ff48d50a3ff942ac1407f1a641fe132698af831e86153695ab822
+  data.tar.gz: '08347a7f63339395c8572cfed87bc6ab3aac40289dece2ff52ba5486a180c879'
 SHA512:
-  metadata.gz: 317f3cc6730620555bfe942315f75261cb91c52706820d65aa81ce76d1abb2ab0fd4861fe0392ed085a3567d4c3307cfd64bd64f3ded724efd776c9011ee3bcd
-  data.tar.gz: fd961b915306b88886c1ae987774da7fc535e55c54f9599221ce5e342ab14182177ea555895de3a9d2277864f28de78935075ee31b99552c7fbb4ab7384a7d2b
+  metadata.gz: a9535a1eb328a8f8b38eebaccff014192b485d818c9fbe5a1b1053e720b8505f1b3a2568105fa4d4ee8206690e11bf6867222e3f74bbb89a45dde7d5d30ab7ba
+  data.tar.gz: ddc013f1c82a0b7e6705612eaf9e5c23006fab8ccb12c937facf9e6769b1de6d77529df0b0ff52fc4cd6b1beb3ebd0011591fc81af81b61757cc18c891719a2f

data/lib/pindo/base/aeshelper.rb

@@ -8,7 +8,7 @@ module Pindo
   module AESHelper
 
 
-    def self.fetch_password(keychain_name:nil)
+    def self.fetch_password(keychain_name:nil, test_file:nil)
       # password = ENV["MATCH_PASSWORD"]
 
       server_name = ["match", keychain_name].join("_")
@@ -18,9 +18,30 @@ module Pindo
       password = item.password if item
 
       unless password
+          puts "\e[33m[DEBUG] Keychain中未找到密码，需要用户输入: #{server_name}\e[0m" if ENV['PINDO_DEBUG']
           password = FastlaneCore::Helper.ask_password(message: "请输入证书仓库的加密密码: ", confirm: true)
-          Security::InternetPassword.add(server_name, "", password)
+          # 尝试添加密码到Keychain，如果已存在则先删除再添加
+          begin
+            # 先检查是否已存在，如果存在则删除
+            existing_item = Security::InternetPassword.find(server: server_name)
+            if existing_item
+              # 重定向stderr到/dev/null来隐藏Keychain的详细输出
+              system("security delete-internet-password -s '#{server_name}' 2>/dev/null")
+              puts "\e[33m[DEBUG] 删除Keychain中的旧密码项: #{server_name}\e[0m" if ENV['PINDO_DEBUG']
+            end
+            
+            # 添加新密码，重定向stderr到/dev/null来隐藏Keychain的详细输出
+            system("security add-internet-password -s '#{server_name}' -w '#{password}' 2>/dev/null")
+            puts "\e[32m[DEBUG] 密码已保存到Keychain: #{server_name}\e[0m" if ENV['PINDO_DEBUG']
+          rescue => e
+            # 忽略Keychain错误，继续使用密码
+            # 错误信息可能包含 "already exists" 等，但不影响功能
+            puts "\e[31m[DEBUG] Keychain操作错误: #{e.message}\e[0m" if ENV['PINDO_DEBUG']
+          end
+      else
+          puts "\e[32m[DEBUG] 从Keychain获取密码成功: #{server_name}\e[0m" if ENV['PINDO_DEBUG']
       end
+
       return password
     end
 

data/lib/pindo/base/pindocontext.rb

@@ -0,0 +1,259 @@
+require 'singleton'
+require 'digest'
+require 'json'
+require 'fileutils'
+
+module Pindo
+  class PindoContext
+    include Singleton
+
+    attr_reader :current_command, :current_directory
+
+    def initialize
+      @current_command = nil
+      @current_directory = nil
+      @is_nested_call = false
+      @memory_selections = {}  # 内存缓存
+      @file_cache_loaded = false  # 标记文件缓存是否已加载
+      ensure_cache_dir
+    end
+
+    # 设置当前上下文
+    def set_context(command, directory = nil)
+      # 判断是否是嵌套调用
+      if @current_command.nil?
+        # 第一次设置，是顶层命令
+        @is_nested_call = false
+        @current_command = normalize_command(command)
+        @current_directory = directory || Dir.pwd
+
+        # 顶层命令时加载文件缓存并确认
+        if !@file_cache_loaded
+          load_file_cache_with_confirmation
+          @file_cache_loaded = true
+        end
+
+        puts "[PindoContext] 顶层命令: #{command}" if ENV['PINDO_DEBUG']
+      else
+        # 已有命令在执行，是嵌套调用
+        @is_nested_call = true
+        # 保持原有的命令组不变，确保缓存共享
+        puts "[PindoContext] 嵌套调用: #{command} (使用 #{@current_command} 的缓存)" if ENV['PINDO_DEBUG']
+      end
+    end
+
+    # 重置上下文（顶层命令结束时调用）
+    def reset_context
+      # 保存文件缓存
+      save_file_cache if @current_command && !@is_nested_call
+
+      @current_command = nil
+      @current_directory = nil
+      @is_nested_call = false
+      @file_cache_loaded = false
+      # 暂不清理内存缓存，让同一进程内可以复用
+    end
+
+    # 设置用户选择
+    def set_selection(key, value)
+      context_key = get_context_key
+      return unless context_key
+
+      @memory_selections[context_key] ||= {}
+      @memory_selections[context_key][key] = value
+
+      # 立即保存到文件缓存
+      save_file_cache
+
+      if ENV['PINDO_DEBUG']
+        puts "[PindoContext] 记录选择: #{key} = #{value.inspect}"
+      end
+    end
+
+    # 获取用户选择
+    def get_selection(key)
+      context_key = get_context_key
+      return nil unless context_key
+
+      value = @memory_selections[context_key] && @memory_selections[context_key][key]
+
+      if value && ENV['PINDO_DEBUG']
+        puts "[PindoContext] 使用缓存: #{key} = #{value.inspect}"
+      end
+
+      value
+    end
+
+    # 检查是否有缓存的选择
+    def has_selection?(key)
+      !get_selection(key).nil?
+    end
+
+    # 是否是嵌套调用
+    def nested_call?
+      @is_nested_call
+    end
+
+    # 选择键定义
+    module SelectionKey
+      TAG_DECISION = :tag_decision      # 打Tag决定
+      APP_KEY = :app_key                # 项目名称/App代号
+      BUNDLE_ID = :bundle_id            # Bundle ID
+      CERT_TYPE = :cert_type            # 证书类型
+    end
+
+    private
+
+    # 确保缓存目录存在
+    def ensure_cache_dir
+      cache_dir = File.expand_path('~/.pindo/cache')
+      FileUtils.mkdir_p(cache_dir) unless File.exist?(cache_dir)
+    end
+
+    # 获取缓存文件路径
+    def cache_file_path
+      cache_dir = File.expand_path('~/.pindo/cache')
+      File.join(cache_dir, 'context_selections.json')
+    end
+
+    # 加载文件缓存并确认
+    def load_file_cache_with_confirmation
+      file_path = cache_file_path
+      return unless File.exist?(file_path)
+
+      begin
+        file_content = File.read(file_path)
+        file_cache = JSON.parse(file_content)
+
+        # 获取当前上下文的缓存
+        context_key = get_context_key
+        cached_selections = file_cache[context_key]
+
+        if cached_selections && !cached_selections.empty?
+          # 显示缓存的选择
+          puts "\n检测到之前的选择:"
+          puts "────────────────────────────────────────"
+
+          cached_selections.each do |key, value|
+            case key
+            when 'bundle_id', :bundle_id
+              puts "  Bundle ID: #{value}"
+            when 'app_key', :app_key
+              puts "  App代号: #{value}"
+            when 'tag_decision', :tag_decision
+              if value.is_a?(Hash)
+                action_desc = value['description'] || value['action']
+                puts "  Tag决定: #{action_desc}"
+              end
+            end
+          end
+          puts "────────────────────────────────────────"
+
+          # 询问用户是否使用缓存
+          require 'highline/import'
+          cli = HighLine.new
+          confirm = cli.agree("\n是否使用以上缓存的选择？ (y/n) ")
+
+          if confirm
+            puts "使用缓存的选择\n"
+            # 合并文件缓存到内存缓存
+            file_cache.each do |ctx_key, selections|
+              @memory_selections[ctx_key] ||= {}
+              selections.each do |key, value|
+                symbol_key = key.to_sym
+                @memory_selections[ctx_key][symbol_key] = value
+              end
+            end
+          else
+            puts "清除缓存，重新选择\n"
+            # 清除当前上下文的文件缓存
+            file_cache.delete(context_key)
+            File.write(file_path, JSON.pretty_generate(file_cache))
+            # 不加载任何缓存到内存
+          end
+        else
+          # 加载其他上下文的缓存（不需要确认）
+          file_cache.each do |ctx_key, selections|
+            next if ctx_key == context_key  # 跳过当前上下文（已经是空的）
+            @memory_selections[ctx_key] ||= {}
+            selections.each do |key, value|
+              symbol_key = key.to_sym
+              @memory_selections[ctx_key][symbol_key] = value
+            end
+          end
+        end
+
+        puts "[PindoContext] 处理文件缓存: #{file_path}" if ENV['PINDO_DEBUG']
+      rescue => e
+        puts "[PindoContext] 加载缓存失败: #{e.message}" if ENV['PINDO_DEBUG']
+      end
+    end
+
+    # 保存文件缓存
+    def save_file_cache
+      file_path = cache_file_path
+
+      begin
+        # 转换内存缓存为可序列化的格式
+        file_cache = {}
+        @memory_selections.each do |context_key, selections|
+          file_cache[context_key] = {}
+          selections.each do |key, value|
+            # 将符号键转换为字符串
+            string_key = key.to_s
+            file_cache[context_key][string_key] = value
+          end
+        end
+
+        # 写入文件
+        File.write(file_path, JSON.pretty_generate(file_cache))
+
+        puts "[PindoContext] 保存文件缓存: #{file_path}" if ENV['PINDO_DEBUG']
+      rescue => e
+        puts "[PindoContext] 保存缓存失败: #{e.message}" if ENV['PINDO_DEBUG']
+      end
+    end
+
+    # 命令归一化，将相关命令映射到同一组
+    def normalize_command(command)
+      case command
+      when 'ios:autobuild', 'unity:ipa'
+        'ios_build_group'
+      when 'android:autobuild', 'android:build', 'unity:apk'
+        'android_build_group'
+      when 'unity:webgl'
+        'webgl_build_group'
+      else
+        command
+      end
+    end
+
+    # 生成上下文键
+    def get_context_key
+      return nil unless @current_command
+
+      # 使用命令组和目录哈希作为键
+      dir_hash = Digest::MD5.hexdigest(@current_directory || Dir.pwd)[0..7]
+      "#{@current_command}:#{dir_hash}"
+    end
+
+    public
+
+    # 调试信息
+    def debug_info
+      puts "\n=== PindoContext Debug Info ==="
+      puts "当前命令: #{@current_command || '无'}"
+      puts "当前目录: #{@current_directory || Dir.pwd}"
+      puts "是否嵌套: #{@is_nested_call}"
+      puts "上下文键: #{get_context_key || '无'}"
+
+      if @memory_selections[get_context_key]
+        puts "当前缓存的选择:"
+        @memory_selections[get_context_key].each do |k, v|
+          puts "  #{k}: #{v.inspect}"
+        end
+      end
+      puts "================================\n"
+    end
+  end
+end