pindo 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa24d37418344443f4d08b84d7e01ce51dc295830659ab24572c0237ef2f430
-  data.tar.gz: 42e2903366c4eac78957837609d4bfe23660cdd8f5ebdb10e20ce2262bc03adc
+  metadata.gz: 5eda913afe12b6e589a0ac3981040fe27b575045a488afb373f1825e548fb53d
+  data.tar.gz: 660bfab7bec17ed41564c2d925d7fb7014754e421a2db9cc5cf77369a0b41db3
 SHA512:
-  metadata.gz: '05883da5dbaad58a396d33d3b3b2d496bfc2755c1914ddf57cf01a5d3b988af094834a7426fcb0b4b73d817262d882717b1f505e4f39d465bf3b296ecc3e364c'
-  data.tar.gz: 2769c89d11df67437faf53633a1b966b21746740f2dea973301acef409ea963c4d2ba4ffd3673ae0e8dfd39cc4c972e87fd274353dcb8f656256b93a78b07480
+  metadata.gz: b3712e5cc54bae69dd86d022f1ba73c6e8a1848beb4c09d420e4dd94ce5b9a9d5b96a88acc723525bfb4b3fa3b0bf1ecfa6b7c0567ea6f08fbfd4392c8e554fd
+  data.tar.gz: 4c8cc257d0ccc1fc5cc475421ab805d98f159a645c88feb81ca8559ebe519fe57ae83f63e152cb1ef46ea057ed325b0f0a671f1caa29e426e9a1f01c04872988

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

@@ -79,22 +79,21 @@ module Pindo
         def android_autobuild
 
           pindo_project_dir = Dir.pwd
-          build_helper = Pindo::BuildHelper.share_instance
+          
+          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
 
+          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
-
+          
           scheme_name = @args_proj_name if @args_proj_name
           if !app_info_obj.nil? && !app_info_obj["appName"].nil? && !app_info_obj["appName"].empty?
               scheme_name = app_info_obj["appName"]

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

@@ -73,13 +73,12 @@ module Pindo
           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
+            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

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

@@ -78,15 +78,6 @@ module Pindo
             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

data/lib/pindo/command/feishu/send_message.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+
+require 'json'
+require 'net/http'
+require 'uri'
+require 'pindo/client/httpclient'
+
+module Pindo
+  module Command
+    module Feishu
+      class SendMessage
+        def self.run(options)
+          new(options).run
+        end
+
+        def initialize(options)
+          @options = options
+          @webhook_url = options[:webhook_url]
+          @message = options[:message]
+          @title = options[:title] || "通知"
+          @at_all = options[:at_all] || false
+        end
+
+        def run
+          unless @webhook_url
+            puts "错误：未提供飞书 webhook URL"
+            return false
+          end
+
+          unless @message
+            puts "错误：未提供消息内容"
+            return false
+          end
+
+          send_message
+        end
+
+        private
+
+        def send_message
+          uri = URI(@webhook_url)
+          
+          # 构建消息内容
+          content = {
+            "msg_type": "post",
+            "content": {
+              "post": {
+                "zh_cn": {
+                  "title": @title,
+                  "content": [
+                    [
+                      {
+                        "tag": "text",
+                        "text": @message
+                      }
+                    ]
+                  ]
+                }
+              }
+            }
+          }
+
+          # 如果需要@所有人
+          if @at_all
+            content[:content][:post][:zh_cn][:content][0].unshift(
+              {
+                "tag": "at",
+                "user_id": "all"
+              }
+            )
+          end
+
+          # 发送请求
+          begin
+            con = HttpClient.create_instance_with_proxy
+            res = con.post do |req|
+              req.url uri
+              req.headers['Content-Type'] = 'application/json'
+              req.body = content.to_json
+            end
+
+            if res.status == 200
+              result = JSON.parse(res.body)
+              if result['code'] == 0
+                puts "消息发送成功！"
+                return true
+              else
+                puts "消息发送失败：#{result['msg']}"
+                return false
+              end
+            else
+              puts "消息发送失败：HTTP #{res.status}"
+              return false
+            end
+          rescue => e
+            puts "发送消息时出错：#{e.message}"
+            return false
+          end
+        end
+      end
+    end
+  end
+end 

data/lib/pindo/command/feishu.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+require 'claide'
+require 'pindo/command/feishu/send_message'
+
+module Pindo
+  module Command
+    class Feishu < CLAide::Command
+      self.description = '飞书相关命令'
+      self.command = 'feishu'
+      self.abstract_command = true
+
+      def self.options
+        [
+          ['--webhook-url=URL', '飞书 webhook URL'],
+          ['--message=MESSAGE', '要发送的消息内容'],
+          ['--title=TITLE', '消息标题（可选）'],
+          ['--at-all', '是否@所有人（可选）']
+        ]
+      end
+
+      def initialize(argv)
+        super
+        @webhook_url = argv.option('webhook-url')
+        @message = argv.option('message')
+        @title = argv.option('title')
+        @at_all = argv.flag?('at-all')
+      end
+
+      def validate!
+        super
+        unless @webhook_url
+          help! '必须提供 webhook URL'
+        end
+        unless @message
+          help! '必须提供消息内容'
+        end
+      end
+
+      def run
+        Pindo::Command::Feishu::SendMessage.run(
+          webhook_url: @webhook_url,
+          message: @message,
+          title: @title,
+          at_all: @at_all
+        )
+      end
+    end
+  end
+end 

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

@@ -88,6 +88,7 @@ module Pindo
                     args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
                     args_temp << "--upload" if @args_upload_flag
                     args_temp << "--send" if @args_send_flag
+                    args_temp << "--bundleid=#{@args_bundle_id}" if @args_bundle_id
                     case project_type
                     when :ios
                         ios_autobuild
@@ -106,15 +107,12 @@ module Pindo
 
                     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
+                      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
-
                     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)
@@ -122,6 +120,7 @@ module Pindo
                     
                     
                     mainapp_bundleid= nil
+                    puts "args_bundle_id: #{@args_bundle_id}"
                     if @args_bundle_id
                         mainapp_bundleid = @args_bundle_id
                     else
@@ -158,8 +157,8 @@ module Pindo
                         end
                     end
 
-                    Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:pindo_project_dir, config_file:config_json_file, scheme_name:scheme_name)
-
+                    Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:pindo_project_dir, config_file:config_json_file, scheme_name:scheme_name, bundleid:mainapp_bundleid)
+                    
                     if File.exist?(File.join(pindo_project_dir, "Podfile"))
                         
                         args_temp = []
@@ -212,7 +211,8 @@ module Pindo
                     end
 
                     Pindo::Command::Deploy::Cert::run(args_temp)
-
+                    Pindo::Command::Ios::Debug::modify_plist_scheme(project_dir:pindo_project_dir, scheme_name:scheme_name)
+                    
                     Dir.chdir(pindo_project_dir)
                     Pindo::Command::Deploy::Build::run(args_temp)
 

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

@@ -91,11 +91,10 @@ module Pindo
                     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
+                      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
 
                     new_project_fullname = Dir.glob(File.join(pindo_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}

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

@@ -72,7 +72,7 @@ module Pindo
               project_dir = Dir.pwd
               Dir.chdir(project_dir)
               config_json_file = File.join(project_dir,"config.json")
-              Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
+              Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file, bundleid:mainapp_bundleid)
 
               args_temp = []
               if @args_adhoc_flag
@@ -104,7 +104,7 @@ module Pindo
 
             end
 
-            def self.modify_cert_with_project(project_dir:nil, config_file:nil, scheme_name:nil)
+            def self.modify_cert_with_project(project_dir:nil, config_file:nil, scheme_name:nil, bundleid:nil)
 
               project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
               if !project_fullname.nil?
@@ -128,16 +128,18 @@ module Pindo
                     if !info_plist_path.nil? && File.exist?(info_plist_path) && !scheme_name.nil? && !scheme_name.empty?
                       scheme_name = scheme_name.to_s.downcase.strip.gsub(/[\s\-_]/, '')
                       info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
-                      info_plist_dict["CFBundleURLTypes"] = []
-                      item0 = {}
-                      item0["CFBundleTypeRole"] = "Editor"
-                      item0["CFBundleURLName"] = scheme_name
-                      item0["CFBundleURLSchemes"] = []
-                      item0["CFBundleURLSchemes"] << scheme_name
-                      info_plist_dict["CFBundleURLTypes"] << item0
+                      info_plist_dict["CFBundleURLTypes"] = info_plist_dict["CFBundleURLTypes"] || []
+                      # info_plist_dict["CFBundleURLTypes"] 中不存在CFBundleURLName为scheme_name的item
+                      if !info_plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == scheme_name }
+                        item0 = {}
+                        item0["CFBundleTypeRole"] = "Editor"
+                        item0["CFBundleURLName"] = scheme_name
+                        item0["CFBundleURLSchemes"] = []
+                        item0["CFBundleURLSchemes"] << scheme_name
+                        info_plist_dict["CFBundleURLTypes"] << item0
+                      end
                       Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
                     end
-                    
                     # puts entitlements_plist_path
                     if !entitlements_plist_path.nil? && File.exist?(entitlements_plist_path)
                         config_json = nil
@@ -174,7 +176,59 @@ module Pindo
 
             end
 
+            def self.modify_plist_scheme(project_dir:nil, scheme_name:nil)
+
+              puts "modify_plist_scheme: #{project_dir} #{scheme_name}"
+              project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+              if !project_fullname.nil?
+                    info_plist_path = nil
+                    bundleid_scheme_name = nil
+                    project_obj = Xcodeproj::Project.open(project_fullname)
+                    project_obj.targets.each do |target|
+                        if target.product_type.to_s.eql?("com.apple.product-type.application") then
+                            temp_info_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+                            if !temp_info_file.nil? && !temp_info_file.empty?
+                              info_plist_path = File.join(project_dir, temp_info_file)
+                            end
+                            bundleid_scheme_name = target.build_configurations.first.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+                        end
+                    end
+                    
+                    if !info_plist_path.nil? && File.exist?(info_plist_path) && !scheme_name.nil? && !scheme_name.empty?
+                      scheme_name = scheme_name.to_s.downcase.strip.gsub(/[\s\-_]/, '')
+                      info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
+                      info_plist_dict["CFBundleURLTypes"] = info_plist_dict["CFBundleURLTypes"] || []
+                      # info_plist_dict["CFBundleURLTypes"] 中不存在CFBundleURLName为scheme_name的item
+                      if !info_plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == scheme_name }
+                        item0 = {}
+                        item0["CFBundleTypeRole"] = "Editor"
+                        item0["CFBundleURLName"] = scheme_name
+                        item0["CFBundleURLSchemes"] = []
+                        item0["CFBundleURLSchemes"] << scheme_name
+                        info_plist_dict["CFBundleURLTypes"] << item0
+                      end
+                      Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
+                    end
+
+                    if !info_plist_path.nil? && File.exist?(info_plist_path) && !bundleid_scheme_name.nil? && !bundleid_scheme_name.empty?
+                      info_plist_dict = Xcodeproj::Plist.read_from_path(info_plist_path)
+                      info_plist_dict["CFBundleURLTypes"] = info_plist_dict["CFBundleURLTypes"] || []
+                      # info_plist_dict["CFBundleURLTypes"] 中不存在CFBundleURLName为bundleid的item
+                      if !bundleid_scheme_name.nil? || bundleid_scheme_name.empty? || !info_plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == bundleid_scheme_name }
+                        item0 = {}
+                        item0["CFBundleTypeRole"] = "Editor"
+                        item0["CFBundleURLName"] = bundleid_scheme_name
+                        item0["CFBundleURLSchemes"] = []
+                        item0["CFBundleURLSchemes"] << bundleid_scheme_name
+                        info_plist_dict["CFBundleURLTypes"] << item0
+                      end
+                      Xcodeproj::Plist.write_to_path(info_plist_dict, info_plist_path)
+                    end
 
+              end
+
+
+            end
       end
     end
   end

data/lib/pindo/command/pgyer/upload.rb

@@ -106,8 +106,6 @@ module Pindo
 
                     current_project_dir = Dir.pwd
                     build_helper = Pindo::BuildHelper.share_instance
-                    build_helper.check_check_and_install_cliff(current_project_dir)
-                    is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(current_project_dir)
 
                     Dir.chdir(current_project_dir)
                     if is_need_add_tag

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

@@ -76,16 +76,14 @@ module Pindo
                     unless unity_helper.unity_project?(pindo_project_dir)
                         raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
                     end
-
+                    build_helper = Pindo::BuildHelper.share_instance
                     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
+                      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}"

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

@@ -46,6 +46,7 @@ module Pindo
                 # 命令选项
                 def self.options
                     [
+                        ['--bundleid', '指定打包的bundleID'],
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         ['--upload', '上传编译后的IPA到测试平台'],
                         ['--base',   'Unity工程编译lib模式'],
@@ -58,6 +59,7 @@ module Pindo
                     @args_proj_name = argv.option('proj')
                     @args_upload_flag = argv.flag?('upload', false)
                     @args_base_flag = argv.flag?('base', false)
+                    @args_bundle_id = argv.option('bundleid')
                 
 
                     super
@@ -124,12 +126,15 @@ module Pindo
 
                     pindo_project_dir = Dir.pwd
                     mainapp_bundleid= nil
-                    if @args_deploy_flag
-                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    if @args_bundle_id
+                        mainapp_bundleid = @args_bundle_id
                     else
-                        mainapp_bundleid = get_selected_dev_bundleid()
+                        if @args_deploy_flag
+                            mainapp_bundleid = get_selected_deploy_bundleid()
+                        else
+                            mainapp_bundleid = get_selected_dev_bundleid()
+                        end
                     end
-
                     isLibrary = @args_base_flag
                     ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
                     if File.directory?(ios_export_lib_dir)

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

@@ -48,6 +48,7 @@ module Pindo
                 # 命令选项
                 def self.options
                     [
+                        ['--bundleid', '指定打包的bundleID'],
                         ['--proj',   '指定上传到测试平台的项目名称'],
                         ['--upload', '上传编译后的IPA到测试平台'],
                         ['--send',   '上传成功后发送测试通知'],
@@ -65,7 +66,7 @@ module Pindo
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_base_flag = argv.flag?('base', false)
                     @force_select_unity = argv.flag?('unity-version', false)
-                    
+                    @args_bundle_id = argv.option('bundleid')
 
                     if @args_send_flag
                         @args_upload_flag = true
@@ -84,13 +85,13 @@ module Pindo
                     unless unity_helper.unity_project?(pindo_project_dir)
                         raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
                     end
-
+                    
+                    build_helper = Pindo::BuildHelper.share_instance
                     if @args_upload_flag
-                        build_helper = Pindo::BuildHelper.share_instance
-                        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
+                      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)
@@ -107,10 +108,14 @@ module Pindo
                     end
 
                     mainapp_bundleid= nil
-                    if @args_deploy_flag
-                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    if @args_bundle_id
+                        mainapp_bundleid = @args_bundle_id
                     else
-                        mainapp_bundleid = get_selected_dev_bundleid()
+                        if @args_deploy_flag
+                            mainapp_bundleid = get_selected_deploy_bundleid()
+                        else
+                            mainapp_bundleid = get_selected_dev_bundleid()
+                        end
                     end
 
                     isLibrary = @args_base_flag

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "5.1.3"
+  	VERSION = "5.1.4"
 
   	class VersionCheck
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.4
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-04-23 00:00:00.000000000 Z
+date: 2025-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -341,6 +341,8 @@ files:
 - lib/pindo/command/env/quarkenv.rb
 - lib/pindo/command/env/swarkenv.rb
 - lib/pindo/command/env/workhard.rb
+- lib/pindo/command/feishu.rb
+- lib/pindo/command/feishu/send_message.rb
 - lib/pindo/command/gplay.rb
 - lib/pindo/command/gplay/iap.rb
 - lib/pindo/command/gplay/itcapp.rb