pindo 4.8.6 → 4.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7602974c19aabb025aceb56f2f2c4580939a4648654b9074e7aaf7b4649b366
-  data.tar.gz: 9a7338f72073b9728753134ac626678795e890faf5e11361dc8cace4a0d947a5
+  metadata.gz: 24b5673e6e6b22077a55006939dc549e2b545537d935c6a004bed385dd936014
+  data.tar.gz: 699659aa13cff6c29fd5cbf63ba1a16707cb1ba6e8811f913094c968d4fcd09a
 SHA512:
-  metadata.gz: 3aafd84653797ddd17f31e549ff714974e8329211cb7ae5cd28ad65946586f57ae62e6587c7204bb48f4f7507bb1097fba0203df8d8a0491e1a0d2623e9cee7a
-  data.tar.gz: 84ee12d99b2c71f249ac382f9f5e11d0bc149e5e064ef8c7b362c654d7fa4144b751da586e84d375911686c5eec0fd174cbda6a1b2b5626d6b054c159f5b6e03
+  metadata.gz: 1ae0851cb8497f852602e3fe26c49f6a1e69e0ba922c44833cf43abe12c186b6d1fec343ac29c3d62c1299c841dda8b0a0782caec8c952885a2fb9c1b0bd4805
+  data.tar.gz: 7ba1a294c60d4d1633e0f136a04d24712f7b01aec7c0702e890b8d7325e0261497897a67fbe55e1a9f63faaec566e70e8f98d52081c75c134bfbd3bd6953077a

data/lib/pindo/module/cert/xcodecerthelper.rb

@@ -34,15 +34,23 @@ module Pindo
             provisioning_info = {}
             provisioning_info['type'] = type
             provisioning_info['bundle_id'] = bundle_id_temp
-            name_temp = Match::Utils.environment_variable_name_profile_name(app_identifier: bundle_id_temp, type: build_type, platform:platform_type)
+
+
+            match_build_type = build_type
+            if platform_type.downcase.include?("macos") && match_build_type.downcase.include?("adhoc")
+                match_build_type = "developer_id"
+            end
+
+            name_temp = Match::Utils.environment_variable_name_profile_name(app_identifier: bundle_id_temp, type: match_build_type, platform:platform_type)
             provisioning_info['profile_name'] = ENV[name_temp]
-            path_temp = Match::Utils.environment_variable_name_profile_path(app_identifier:bundle_id_temp,type: build_type, platform:platform_type)
+            path_temp = Match::Utils.environment_variable_name_profile_path(app_identifier:bundle_id_temp,type: match_build_type, platform:platform_type)
             provisioning_info['profile_path'] = ENV[path_temp]
-            signing_identity_key=Match::Utils.environment_variable_name_certificate_name(app_identifier: bundle_id_temp,type: build_type, platform:platform_type)
+            signing_identity_key=Match::Utils.environment_variable_name_certificate_name(app_identifier: bundle_id_temp,type: match_build_type, platform:platform_type)
             provisioning_info["signing_identity"] = ENV[signing_identity_key]
-            team_id_key =  Match::Utils.environment_variable_name_team_id(app_identifier: bundle_id_temp,type:build_type, platform:platform_type)
+            team_id_key =  Match::Utils.environment_variable_name_team_id(app_identifier: bundle_id_temp,type:match_build_type, platform:platform_type)
             provisioning_info["team_id"] = ENV[team_id_key]
             provisioning_info_array << provisioning_info
+            
           end
 
             
@@ -299,7 +307,7 @@ module Pindo
             if !File.exist?(cert_dest_dir)
                 FileUtils.mkdir_p(cert_dest_dir)
             end
-
+            cert_type_temp = cert_type
             cert_sub_dir = cert_type.downcase
             if platform_type.downcase.eql?("macos")
                 if cert_type.downcase.include?("development")
@@ -307,7 +315,8 @@ module Pindo
                 elsif cert_type.downcase.eql?("appstore")
                     cert_sub_dir = "distribution"
                 else
-                  cert_sub_dir = "developer_id_application"
+                    cert_type_temp = "developer_id"
+                    cert_sub_dir = "developer_id_application"
                 end
             else
                 if !cert_type.downcase.include?("development")
@@ -332,7 +341,7 @@ module Pindo
                 raise Informative, "证书解析失败，密码错误！"
             end
 
-            FileUtils.copy(key_path, File.join(cert_dest_dir, "#{cert_type}.p12"))
+            FileUtils.copy(key_path, File.join(cert_dest_dir, "#{cert_type_temp}.p12"))
 
         end
 
@@ -381,20 +390,15 @@ module Pindo
             account_cert_set["certs"].delete_if { |x| x["cert_id"].eql?(bundle_id_signing_identity)}
             end
 
-            cert_item["cert_id"] = cert_item["cert_id"] || bundle_id_signing_identity
-            cert_item["password"] = "goodcert1"
-            cert_item["cert_file"] = "#{cert_type}.p12"
-            cert_item["cert_type"] = cert_type
-            cert_item["cert_provisioning_group"] = cert_item["cert_provisioning_group"] || []
-
-
             provision_start_name = "Development"
+            cert_type_temp = cert_type
             if platform_type.downcase.include?("macos")
               if cert_type.downcase.include?("development")
                 provision_start_name = "development"
               elsif cert_type.downcase.eql?("appstore")
                 provision_start_name = "appstore"
               else
+                cert_type_temp = "developer_id"
                 provision_start_name = "direct"
               end
             else
@@ -407,8 +411,17 @@ module Pindo
               end
             end
 
+            cert_item["cert_id"] = cert_item["cert_id"] || bundle_id_signing_identity
+            cert_item["password"] = "goodcert1"
+            cert_item["cert_file"] = "#{cert_type_temp}.p12"
+            cert_item["cert_type"] = cert_type_temp
+            cert_item["cert_provisioning_group"] = cert_item["cert_provisioning_group"] || []
+
+
+
+
             cert_provisioning_group_item = {}
-            provisioning_group_id = [provision_start_name, platform_type, bundle_id].join("_")
+            provisioning_group_id = [cert_type_temp, platform_type, bundle_id].join("_")
 
             provisioning_group_result = cert_item["cert_provisioning_group"].select { |x| x["provisioning_group_id"].eql?(provisioning_group_id)}.first
             if provisioning_group_result.nil?
@@ -432,6 +445,7 @@ module Pindo
                 bundle_id_temp = provisioning_info['bundle_id']
                 provisioning_id = [provision_start_name, bundle_id_temp].join("_")
                 real_path = provisioning_info["profile_path"]
+
                 extname = File.extname(real_path)
                 cert_provisioning_group_item["provisioning_items"] << {
                   "bundle_id" => bundle_id_temp,

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.8.6"
+  	VERSION = "4.8.7"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.8.6
+  version: 4.8.7
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-24 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide