pindo 5.2.4 → 5.3.7

data/lib/pindo/module/appselect.rb

@@ -107,14 +107,24 @@ module Pindo
         end
 
         def get_selected_dev_bundleid()
+          # 检查缓存
+          require_relative '../base/pindocontext'
+          context = Pindo::PindoContext.instance
+          cached_bundleid = context.get_selection(Pindo::PindoContext::SelectionKey::BUNDLE_ID)
+
+          if cached_bundleid
+            puts "\n使用之前选择的Bundle ID: #{cached_bundleid}"
+            puts
+            return cached_bundleid
+          end
 
           all_bundleid = []
-          all_bundleid = all_bundleid | all_dev_bundleid() 
+          all_bundleid = all_bundleid | all_dev_bundleid()
           all_bundleid = all_bundleid | all_tool_bundleid()
-                   
+
           cli = HighLine.new
           menu_choice="None"
-          puts 
+          puts
           cli.choose do |menu|                                  # you can also use constants like :blue
               menu.header = "可用的Bundle Id如下:"
               menu.prompt = "请选择使用的Bundle Id,请输入选项(1/2/3...):"
@@ -133,9 +143,12 @@ module Pindo
           if menu_choice.eql?("com.heroneverdie101.*")
             menu_choice = "com.heroneverdie101"
           end
-          
+
+          # 保存选择到缓存
+          context.set_selection(Pindo::PindoContext::SelectionKey::BUNDLE_ID, menu_choice)
+
           return menu_choice;
-          
+
         end
 
         def get_selected_deploy_bundleid()

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

@@ -2,6 +2,8 @@ require 'singleton'
 require 'fileutils'
 require 'xcodeproj' # 用于iOS项目检查
 require_relative '../android/base_helper'
+require_relative '../../base/githelper'
+require_relative '../../base/pindocontext'
 module Pindo
 
       class BuildHelper
@@ -9,6 +11,9 @@ module Pindo
         include BaseAndroidHelper
         include Pindo::Githelper
 
+        # 临时缓存，只在内存中，不保存到文件
+        attr_accessor :temp_tag_decision
+
         class << self
           def share_instance
             instance
@@ -139,36 +144,93 @@ module Pindo
                 tag_action_parms = []
                 is_need_add_tag = false
               else
-                cli = HighLine.new
-                menu_options = {
-                  "新增版本号,打新Tag" => -> {
-                    tag_action_parms = []
-                    :new_tag
-                  },
-                  "将上次的Tag删除重新打Tag" => -> {
-                    tag_action_parms = []
-                    tag_action_parms << "--retag"
-                    :recreate_tag
-                  },
-                  "不需要Tag继续编译且上传，手动修改上传备注" => -> {
-                    puts ""
-                    :continue_without_tag
-                  },
-                  "终止退出编译" => -> {
+                # 检查是否已有用户选择
+                context = PindoContext.instance
+                build_helper = BuildHelper.share_instance
+                # 优先从持久化缓存读取，如果没有则从内存临时缓存读取
+                cached_decision = context.get_selection(PindoContext::SelectionKey::TAG_DECISION) ||
+                                 build_helper.temp_tag_decision
+
+                if cached_decision
+                  # 使用之前的选择
+                  puts "\n使用之前的选择：#{cached_decision[:description]}"
+                  tag_action_parms = cached_decision[:tag_action_parms]
+                  is_need_add_tag = cached_decision[:is_need_add_tag]
+
+                  # 如果是退出选择，则抛出异常
+                  if cached_decision[:action] == :exit
                     raise Informative, "终止退出编译!"
-                    :exit
+                  end
+                else
+                  # 第一次询问
+                  cli = HighLine.new
+                  selected_action = nil
+                  selected_description = nil
+
+                  menu_options = {
+                    "新增版本号,打新Tag" => -> {
+                      tag_action_parms = []
+                      selected_action = :new_tag
+                      selected_description = "新增版本号,打新Tag"
+                      :new_tag
+                    },
+                    "将上次的Tag删除重新打Tag" => -> {
+                      tag_action_parms = []
+                      tag_action_parms << "--retag"
+                      selected_action = :recreate_tag
+                      selected_description = "将上次的Tag删除重新打Tag"
+                      :recreate_tag
+                    },
+                    "不需要Tag继续编译且上传，手动修改上传备注" => -> {
+                      puts ""
+                      selected_action = :continue_without_tag
+                      selected_description = "不需要Tag继续编译且上传"
+                      :continue_without_tag
+                    },
+                    "终止退出编译" => -> {
+                      selected_action = :exit
+                      selected_description = "终止退出编译"
+                      raise Informative, "终止退出编译!"
+                      :exit
+                    }
                   }
-                }
 
-                result = cli.choose do |menu|
-                  menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
-                  menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
-                  menu_options.each do |option, action|
-                    menu.choice(option) { action.call }
+                  result = cli.choose do |menu|
+                    menu.header = "当前代码并没有打Tag,上传的Changelog需要Tag"
+                    menu.prompt = "请选中打Tag的方式, 请输入选项(1/2/3...):"
+                    menu_options.each do |option, action|
+                      menu.choice(option) { action.call }
+                    end
                   end
-                end
 
-                is_need_add_tag = !tag_action_parms.nil?
+                  is_need_add_tag = !tag_action_parms.nil?
+
+                  # 保存用户选择
+                  build_helper = BuildHelper.share_instance
+                  # 只有选择"新增版本号,打新Tag"时才保存到持久化缓存
+                  # 其他选项只保存到临时缓存（内存中）
+                  if selected_action == :new_tag
+                    # 保存到持久化缓存（文件）
+                    context.set_selection(PindoContext::SelectionKey::TAG_DECISION, {
+                      action: selected_action,
+                      description: selected_description,
+                      tag_action_parms: tag_action_parms,
+                      is_need_add_tag: is_need_add_tag
+                    })
+                    # 清除临时缓存
+                    build_helper.temp_tag_decision = nil
+                  else
+                    # 清空持久化缓存
+                    context.set_selection(PindoContext::SelectionKey::TAG_DECISION, nil)
+                    # 保存到临时缓存（仅在内存中，不会写入文件）
+                    build_helper.temp_tag_decision = {
+                      action: selected_action,
+                      description: selected_description,
+                      tag_action_parms: tag_action_parms,
+                      is_need_add_tag: is_need_add_tag
+                    }
+                  end
+                end
               end
             end
           end
@@ -214,18 +276,40 @@ module Pindo
 
         def android_project?(project_path)
           # 检查Android工程的关键文件和目录
-          gradle_file = File.exist?(File.join(project_path, "build.gradle"))
-          settings_gradle = File.exist?(File.join(project_path, "settings.gradle"))
+          gradle_file = File.exist?(File.join(project_path, "build.gradle")) || File.exist?(File.join(project_path, "build.gradle.kts"))
+          settings_gradle = File.exist?(File.join(project_path, "settings.gradle")) || File.exist?(File.join(project_path, "settings.gradle.kts"))
 
-          main_module = get_main_module(project_path)
+          # 尝试获取主模块
+          main_module = nil
+          begin
+            main_module = get_main_module(project_path)
+          rescue => e
+            puts "获取主模块失败: #{e.message}" if ENV['DEBUG']
+          end
 
           # Android Studio项目结构
           if gradle_file && settings_gradle && main_module
-            app_gradle = File.exist?(File.join(main_module, "build.gradle"))
+            app_gradle = File.exist?(File.join(main_module, "build.gradle")) || File.exist?(File.join(main_module, "build.gradle.kts"))
             app_manifest = File.exist?(File.join(main_module, "src", "main", "AndroidManifest.xml"))
             return true if app_gradle && app_manifest
           end
 
+          # 如果无法通过标准方式检测，尝试更宽松的检测
+          # 检查是否有任何包含 build.gradle 的子目录
+          if gradle_file && settings_gradle
+            Dir.entries(project_path).each do |entry|
+              next if entry.start_with?('.')
+              entry_path = File.join(project_path, entry)
+              if File.directory?(entry_path)
+                app_gradle = File.exist?(File.join(entry_path, "build.gradle")) || File.exist?(File.join(entry_path, "build.gradle.kts"))
+                app_manifest = File.exist?(File.join(entry_path, "src", "main", "AndroidManifest.xml"))
+                if app_gradle && app_manifest
+                  return true
+                end
+              end
+            end
+          end
+
           false
         end
 
@@ -261,6 +345,13 @@ module Pindo
             File.basename(xcodeproj, ".xcodeproj") if xcodeproj
           when :android
             settings_gradle = File.join(project_path, "settings.gradle")
+            settings_gradle_kts = File.join(project_path, "settings.gradle.kts")
+            
+            # 优先使用 settings.gradle.kts，如果不存在则使用 settings.gradle
+            if File.exist?(settings_gradle_kts)
+              settings_gradle = settings_gradle_kts
+            end
+            
             if File.exist?(settings_gradle)
               content = File.read(settings_gradle)
               if content =~ /rootProject\.name\s*=\s*['"](.+)['"]/