pindo 5.2.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ca5e3dbb878c537b082d578d30f1747dc3fad983b09c1de9806757999448f84
-  data.tar.gz: 80bcd36c8a88a294f41fae77d522c65e800b39550afd052c589d8158d07e70e6
+  metadata.gz: 7c2661db4329460e129f8991d5dd81f01f341cc4b4d2d8fe98474ec5501ceef0
+  data.tar.gz: dd9727246984781d88c85d2b7442845261552c1e5eec07e3f049c45c7630c432
 SHA512:
-  metadata.gz: 060f5318addc7ab02dd102440a6fc0f41c497aab113670ea24ddbb1fa98dd08edece8a8d38cc2a1400f6bc9984fcd882dd9f4768e6c407535393bc28781e6dcd
-  data.tar.gz: 71c5e364d6c179e0d28ce7084057bdc0218fd00c263c251aa5a066a85ae485905cb789a3972b7adba2e9e39d1bff0d0b01003b597573f768d0970c0361b3b6b7
+  metadata.gz: cb87c6296195cc7bc34db428a358800f380a2b6abee912088bb209e176cc2414988315e838f0dd6b7caf18fe8c48744a5754c7e996166582986c38eb469c77d6
+  data.tar.gz: 682de2c7b676c65e4a836be1b2bfe4988a6c0547fa3d8dc97c77d415f504b07adad7f176ad958d2aaedaef398ee8dbe246e53bf10ded800c2b65d31d80a9d613

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

@@ -107,7 +107,19 @@ module Pindo
           end
 
           android_build_helper = Pindo::AndroidBuildHelper.share_instance
+          
+          # 添加以项目名称为 scheme 的配置
           android_build_helper.add_test_scheme(project_dir:pindo_project_dir,scheme_name:scheme_name)
+          
+          # 获取 bundle ID 并添加以 bundle ID 为 scheme 的配置
+          bundle_id = android_build_helper.get_application_id(pindo_project_dir)
+          if !bundle_id.nil? && !bundle_id.empty?
+            puts "获取到 Bundle ID: #{bundle_id}"
+            android_build_helper.add_test_scheme(project_dir:pindo_project_dir,scheme_name:bundle_id)
+          else
+            puts "警告: 未能获取到 Bundle ID，跳过添加 Bundle ID scheme"
+          end
+          
           apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
           ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
 

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

@@ -126,7 +126,8 @@ module Pindo
                     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\-_]/, '')
+                      # scheme_name = scheme_name.to_s.downcase.strip.gsub(/[\s\-_]/, '')
+                      scheme_name = scheme_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
                       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
@@ -195,7 +196,9 @@ module Pindo
                     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\-_]/, '')
+
+                      scheme_name = scheme_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
+
                       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
@@ -215,7 +218,7 @@ module Pindo
                       info_plist_dict["CFBundleURLTypes"] = info_plist_dict["CFBundleURLTypes"] || []
                       # info_plist_dict["CFBundleURLTypes"] 中不存在CFBundleURLName为bundleid的item
                       #bundle id去除. 特殊字符串，保留全小写
-                      bundleid_scheme_valeu = bundleid_scheme_name.gsub(/[^\w\s]/, '').downcase
+                      bundleid_scheme_valeu = bundleid_scheme_name.gsub(/[^a-zA-Z0-9]/, '').downcase
 
                       if !bundleid_scheme_name.nil? || bundleid_scheme_name.empty? || !info_plist_dict["CFBundleURLTypes"].any? { |item| item["CFBundleURLName"] == bundleid_scheme_valeu }
                         item0 = {}

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

@@ -30,7 +30,8 @@ module Pindo
       return puts "错误: 需要提供项目路径" if project_dir.nil?
       return puts "错误: 项目路径不存在: #{project_dir}" unless File.directory?(project_dir)
 
-      scheme_name = scheme_name.to_s.downcase.strip.gsub(/[\s\-_]/, '')
+      # scheme_name = scheme_name.to_s.downcase.strip.gsub(/[\s\-_]/, '')
+      scheme_name = scheme_name.to_s.gsub(/[^a-zA-Z0-9]/, '').downcase
       # 查找所有可能的模块
       main_module = get_main_module(project_dir)
       search_modules = ["app", "unityLibrary"]

data/lib/pindo/version.rb

@@ -1,6 +1,7 @@
 module Pindo
 
-  	VERSION = "5.2.0"
+  	VERSION = "5.2.2"
+
 
   	class VersionCheck
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.2
 platform: ruby
 authors:
 - wade