pindo 5.16.2 → 5.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92f22542154ae382604b43308458957cf98e13e28827d03060b81f0644a1bb5
-  data.tar.gz: fa89cceb033d7e4bb3933a6adb8963107e111b7d6232108bdd9955a2924f405c
+  metadata.gz: 061bf75ae3563da24c18d0d4204fdecac9d03011e1493dd4e89b53d9b112d617
+  data.tar.gz: a51d17f8a46a767527a34f970657c7cf164511902c28f46e7567b6264de3079f
 SHA512:
-  metadata.gz: faddb6f7f1994b614f9a4e463d4d9aae9121158cac4bb1d496ae44daddc6acb818737aa766be45a6718cee15d546157bf58a361b2f8ef8a2669268ec0807ef9c
-  data.tar.gz: 02b1e2b5f9b299eeebeb2e41ab0fb462df55582195154456bb9ee58228e97fd673a4e8fbc9c6d07be7154f7b65a093f4bd371e3eb5f329536234fcd31c5d4f21
+  metadata.gz: efc7584e50c172c78c3e53f45ff97b335f18c60565d02ef8892273c29c253199909c54f590673ab232dfe688a086270d7200097293d7a6c1e0320efd682d2dfb
+  data.tar.gz: d0d46c6e9bc600c526e7c3ef2cb4fce1fafd47d39d8e806161d3843cbd40098fac4fecc33fb1f2141cec6d7163ea1ca1ec1642e10f214c7f3beef220bce54e5c

data/lib/pindo/base/funlog.rb

@@ -105,7 +105,7 @@ module Pindo
            Funlog.current_output_sink.log_info(Funlog.current_task_id, message)
          else
            # 串行模式：保持原有行为
-           puts "  ✓ #{message}"
+           puts "   #{message}"
          end
       end
 

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

@@ -0,0 +1,253 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'tmpdir'
+require 'pindo/base/funlog'
+
+module Pindo
+  class Command
+    class Utils < Command
+      class Installskills < Utils
+
+        self.summary = '安装 Claude Code 技能到本地项目'
+
+        self.description = <<-DESC
+安装 Claude Code 技能到本地项目。
+
+支持功能:
+    - 从技能仓库克隆指定技能
+    - 支持安装单个或多个技能
+
+使用示例:
+    pindo utils installskills                    # 交互式选择仓库安装
+    pindo utils installskills skill-name         # 从默认仓库安装指定技能
+    pindo utils installskills skill1 skill2      # 安装多个技能
+    pindo utils installskills --source=https://gitee.com/your/skills.git  # 从指定仓库安装
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('skill_name', false),
+        ]
+
+        def self.options
+          [
+            ['--source=URL', '指定技能仓库地址，指定后跳过仓库选择'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @skill_names = argv.arguments! || []
+          @source = argv.option('source')
+
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def run
+          # 确定使用的仓库
+          repo_info = determine_repo
+          return if repo_info.nil?
+
+          # 克隆仓库到临时目录
+          temp_dir = clone_repo_to_temp(repo_info)
+          return if temp_dir.nil?
+
+          begin
+            # 安装 command 和 skills
+            install_from_repo(temp_dir, repo_info['skills_repo_name'] || 'custom')
+          ensure
+            # 清理临时目录
+            FileUtils.rm_rf(temp_dir) if File.exist?(temp_dir)
+          end
+        end
+
+        private
+
+        def determine_repo
+          # 如果指定了 --source，直接使用
+          if @source
+            return {
+              'skills_repo_name' => 'custom',
+              'skills_repo_desc' => '自定义仓库',
+              'git_url' => @source
+            }
+          end
+
+          # 从配置读取仓库列表
+          repos = skills_repo_array
+
+          if repos.empty?
+            Funlog.error("未配置技能仓库，请在 ~/.pindo/pindo_common_config/pindo_config.json 中配置 skills_repo_array")
+            return nil
+          end
+
+          if repos.length == 1
+            Funlog.info("使用默认仓库: #{repos.first['skills_repo_name']}")
+            return repos.first
+          end
+
+          # 交互式选择仓库
+          interactive_select_repo(repos)
+        end
+
+        def skills_repo_array
+          config = pindo_single_config.pindo_user_config_json
+          return [] unless config
+
+          repos = config['skills_repo_array']
+          return [] unless repos.is_a?(Array)
+
+          repos
+        end
+
+        def interactive_select_repo(repos)
+          Funlog.info("")
+          Funlog.info("=============================================================")
+          Funlog.info("                  请选择要安装的仓库")
+          Funlog.info("=============================================================")
+          Funlog.info("")
+
+          repos.each_with_index do |repo, index|
+            name = repo['skills_repo_name'] || "未命名#{index + 1}"
+            desc = repo['skills_repo_desc'] || ''
+
+            # 显示序号和名称
+            Funlog.info("[#{index + 1}] #{name}")
+
+            # 显示描述（如果有）
+            unless desc.empty?
+              desc.lines.each do |line|
+                Funlog.info("    #{line.chomp}")
+              end
+            end
+
+            # 显示仓库URL（调试模式）
+            if ENV['PINDO_DEBUG'] && repo['git_url']
+              Funlog.info("    URL: #{repo['git_url']}")
+            end
+
+            Funlog.info("")
+          end
+
+          # 使用 HighLine 获取用户输入
+          cli = HighLine.new
+          input = cli.ask("请输入序号 (1-#{repos.length}): ")
+
+          num = input.to_i
+          if num >= 1 && num <= repos.length
+            selected = repos[num - 1]
+            Funlog.info("已选择: #{selected['skills_repo_name']}")
+            selected
+          else
+            Funlog.error("无效选择，请输入 1-#{repos.length} 之间的数字")
+            nil
+          end
+        end
+
+        def clone_repo_to_temp(repo_info)
+          url = repo_info['git_url']
+          repo_name = repo_info['skills_repo_name'] || 'temp_repo'
+
+          unless url
+            Funlog.error("仓库配置错误，缺少 git_url")
+            return nil
+          end
+
+          # 创建系统临时目录
+          temp_dir = Dir.mktmpdir(['pindo_skills_', "_#{repo_name}"])
+
+          Funlog.fancyinfo_start("克隆仓库: #{url}...")
+          Funlog.info("仓库 URL: #{url}") if ENV['PINDO_DEBUG']
+
+          # 克隆仓库
+          success = system("git clone #{url} #{temp_dir} --quiet 2>/dev/null")
+
+          unless success && File.exist?(File.join(temp_dir, '.git'))
+            Funlog.fancyinfo_error("仓库克隆失败: #{url}")
+            FileUtils.rm_rf(temp_dir) if File.exist?(temp_dir)
+            return nil
+          end
+
+          Funlog.fancyinfo_success("仓库克隆完成")
+          temp_dir
+        end
+
+        def install_from_repo(repo_dir, repo_name)
+          installed = false
+
+          # 安装 commands 目录（合并式拷贝）
+          source_commands = File.join(repo_dir, 'commands')
+          target_commands = File.expand_path('~/.claude/commands')
+
+          if File.exist?(source_commands) && File.directory?(source_commands)
+            Funlog.info("安装 commands...")
+            FileUtils.mkdir_p(target_commands)
+
+            Dir.glob(File.join(source_commands, '*')).each do |item|
+              next if File.basename(item).start_with?('.')
+
+              target = File.join(target_commands, File.basename(item))
+
+              if File.directory?(item)
+                # 子目录：合并到目标对应子目录
+                FileUtils.mkdir_p(target)
+                Dir.glob(File.join(item, '*')).each do |sub_item|
+                  next if File.basename(sub_item).start_with?('.')
+                  target_sub = File.join(target, File.basename(sub_item))
+                  FileUtils.rm_rf(target_sub) if File.exist?(target_sub)
+                  FileUtils.cp_r(sub_item, target_sub)
+                end
+              else
+                # 直接文件：拷贝到目标目录
+                FileUtils.rm_f(target) if File.exist?(target)
+                FileUtils.cp(item, target)
+              end
+              Funlog.info("  ✓ #{File.basename(item)}")
+            end
+            installed = true
+          end
+
+          # 安装 skills 目录（合并式拷贝）
+          source_skills = File.join(repo_dir, 'skills')
+          target_skills = File.expand_path('~/.claude/skills')
+
+          if File.exist?(source_skills) && File.directory?(source_skills)
+            Funlog.info("安装 skills...")
+            FileUtils.mkdir_p(target_skills)
+
+            Dir.glob(File.join(source_skills, '*')).each do |item|
+              next if File.basename(item).start_with?('.')
+
+              target = File.join(target_skills, File.basename(item))
+
+              if File.directory?(item)
+                # 子目录：合并到目标对应子目录
+                FileUtils.mkdir_p(target)
+                Dir.glob(File.join(item, '*')).each do |sub_item|
+                  next if File.basename(sub_item).start_with?('.')
+                  target_sub = File.join(target, File.basename(sub_item))
+                  FileUtils.rm_rf(target_sub) if File.exist?(target_sub)
+                  FileUtils.cp_r(sub_item, target_sub)
+                end
+              else
+                # 直接文件：拷贝到目标目录
+                FileUtils.rm_f(target) if File.exist?(target)
+                FileUtils.cp(item, target)
+              end
+              Funlog.info("  ✓ #{File.basename(item)}")
+            end
+            installed = true
+          end
+
+          if installed
+            Funlog.fancyinfo_success("技能安装完成: #{repo_name}")
+            Funlog.info("安装位置: ~/.claude/")
+          else
+            Funlog.warning("仓库中未找到 commands 或 skills 目录")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/pindo/command/utils.rb

@@ -13,6 +13,7 @@ require 'pindo/command/utils/updateconfig'
 require 'pindo/command/utils/fabric'
 require 'pindo/command/utils/encrypt'
 require 'pindo/command/utils/decrypt'
+require 'pindo/command/utils/installskills'
 
 
 module Pindo

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

@@ -312,10 +312,12 @@ module Pindo
                     # 替换所有旧的图标引用为标准名称
                     # app_icon -> ic_launcher
                     # app_icon_round -> ic_launcher_round
-                    content.gsub!('@mipmap/app_icon_round', '@mipmap/ic_launcher_round')
-                    content.gsub!('@mipmap/app_icon', '@mipmap/ic_launcher')
-                    content.gsub!('@drawable/app_icon_round', '@drawable/ic_launcher_round')
-                    content.gsub!('@drawable/app_icon', '@drawable/ic_launcher')
+                    # 使用正则表达式精确匹配，避免替换 app_icon_topleft 等变体
+                    # (?=["'\s>]) 表示后面必须是引号、空格或尖括号（但不包含在替换结果中）
+                    content.gsub!(/@mipmap\/app_icon_round(?=["'\s>])/, '@mipmap/ic_launcher_round')
+                    content.gsub!(/@mipmap\/app_icon(?=["'\s>])/, '@mipmap/ic_launcher')
+                    content.gsub!(/@drawable\/app_icon_round(?=["'\s>])/, '@drawable/ic_launcher_round')
+                    content.gsub!(/@drawable\/app_icon(?=["'\s>])/, '@drawable/ic_launcher')
 
                     # 如果内容有变化，保存文件
                     if content != original_content

data/lib/pindo/module/task/model/nuget/nuget_upload_task.rb

@@ -164,19 +164,47 @@ module Pindo
         # 4. 提交到 JPS 项目
         puts "📋 提交到 JPS 项目..."
 
+        # 构建请求参数
+        request_params = {
+          packageUrl: file_url,
+          attachFileUrls: []
+        }
+
+        if ENV['PINDO_DEBUG']
+          puts "[DEBUG] 提交参数:"
+          puts "[DEBUG]   项目ID: #{nuget_project['id']}"
+          puts "[DEBUG]   项目名称: #{nuget_project['projectName']}"
+          puts "[DEBUG]   包URL: #{file_url}"
+          puts "[DEBUG]   附件URLs: #{request_params[:attachFileUrls].inspect}"
+        end
+
+        puts "++++++ 1 upload_nuget_package" if ENV['PINDO_DEBUG']
         result = jps_client.upload_nuget_package(
           projectId: nuget_project['id'],
-          params: {
-            packageUrl: file_url,
-            attachFileUrls: []
-          }
+          params: request_params
         )
 
+        if ENV['PINDO_DEBUG']
+          puts "[DEBUG] API 响应:"
+          puts "[DEBUG]   #{result.inspect}"
+        end
+
         if result && (result['code'] == 0 || result['code'] == 200)
           puts "✅ 提交成功"
           print_upload_result(result)
         else
           error_msg = result['message'] || result['msg'] || '未知错误'
+          error_code = result['code']
+
+          puts "[ERROR] 提交失败详情:"
+          puts "[ERROR]   错误代码: #{error_code}"
+          puts "[ERROR]   错误消息: #{error_msg}"
+
+          if ENV['PINDO_DEBUG']
+            puts "[DEBUG] 完整响应内容:"
+            puts "[DEBUG]   #{JSON.pretty_generate(result)}" rescue puts "[DEBUG]   #{result.inspect}"
+          end
+
           raise Informative, "提交失败: #{error_msg}"
         end
       end

data/lib/pindo/module/xcode/xcode_build_helper.rb

@@ -514,7 +514,7 @@ module Pindo
 
             project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
             main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) }.first
-            provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
+            provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase
 
             # 确定构建类型和 iCloud 环境
             build_type = "app-store"
@@ -522,10 +522,10 @@ module Pindo
 
             if !project_build_platform.nil? && project_build_platform.eql?("macosx")
                 # macOS 平台
-                if provisioning_profile_name.include?("development")
+                if provisioning_profile_name.downcase.include?("development")
                     build_type = "development"
                     icloud_env = "Development"
-                elsif provisioning_profile_name.include?("appstore")
+                elsif provisioning_profile_name.downcase.include?("appstore")
                     build_type = "mac-application"
                     icloud_env = "Production"
                 else
@@ -534,10 +534,10 @@ module Pindo
                 end
             else
                 # iOS 平台
-                if provisioning_profile_name.include?("adhoc")
+                if provisioning_profile_name.downcase.include?("adhoc")
                     build_type = "ad-hoc"
                     icloud_env = "Development"
-                elsif provisioning_profile_name.include?("development")
+                elsif provisioning_profile_name.downcase.include?("development")
                     build_type = "development"
                     icloud_env = "Development"
                 else

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.16.2"
+  VERSION = "5.16.5"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.16.2
+  version: 5.16.5
 platform: ruby
 authors:
 - wade
@@ -112,7 +112,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +355,7 @@ files:
 - lib/pindo/command/utils/encrypt.rb
 - lib/pindo/command/utils/fabric.rb
 - lib/pindo/command/utils/icon.rb
+- lib/pindo/command/utils/installskills.rb
 - lib/pindo/command/utils/renewcert.rb
 - lib/pindo/command/utils/renewproj.rb
 - lib/pindo/command/utils/repoinit.rb