pindo 4.7.3 → 4.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c21050abb1c90a03a0692aac01e408ff0bbce3968b89677358bec75c1e903c7e
-  data.tar.gz: '0235831d8df25e4c7227a4980339a858aa8d271f72480ac6f9afc727d1898cae'
+  metadata.gz: e8159df0872fa738e51e47c58871fd774599288933ad5b0abb06a1f75d034576
+  data.tar.gz: 7092870505178a36f55cc54d5eaa8248314a0f5c0af5188f446dab6e42bb65d0
 SHA512:
-  metadata.gz: 3b2b2a2a3e7efdcfe0882510269d7bb8b10ab49a571c15f01f5a6538f64a909fd90b91d246d100b1f9883462adec0f25ae0fda3f5c8640cba235009bd94bbbe0
-  data.tar.gz: 2fa34d8dd3cc0f7c4d0ab76354b63a5bde85307990f33cb08fa7a8fc7654a0eff88b7a2faf882325ba61431ee6b211e3fccdffcca062fe9556b2344300e1fc87
+  metadata.gz: bb1cf7c60caf44e8d92ee0d0cab2118c63fd842c4d0a27a3d4e0a0b33ac03d01a3a4b59b29c7589f30476f957dcd5011c4b0753bb155aa1efe2762fa19730ee3
+  data.tar.gz: b734c08d987650edd74d00b63a1c7bd9eec5dd7ba5ba947691f5a82a539b04e09fb3d96d76d5fde205f6fbca1bab6ec23137afc5503ad0cd42a9d8edc6b0a8d7

data/lib/pindo/base/aeshelper.rb

@@ -1,7 +1,7 @@
 require 'openssl'
 
 module Pindo
- 
+
 
   module AESHelper
 
@@ -17,7 +17,7 @@ module Pindo
 
       unless password
           password = FastlaneCore::Helper.ask_password(message: "请输入证书仓库的加密密码: ", confirm: true)
-          Security::InternetPassword.add(server_name, "", password)     
+          Security::InternetPassword.add(server_name, "", password)
       end
       return password
     end
@@ -54,17 +54,9 @@ module Pindo
     def self.encrypt_specific_file(src_file: nil, password: nil, output_dir: nil)
       UI.user_error!("No password supplied") if password.to_s.strip.length == 0
 
-      data_to_encrypt = File.binread(path)
-      salt = SecureRandom.random_bytes(8)
-
-      # The :: is important, as there is a name clash
-      cipher = ::OpenSSL::Cipher.new('AES-256-CBC')
-      cipher.encrypt
-      cipher.pkcs5_keyivgen(password, salt, 1, "MD5")
-      encrypted_data = "Salted__" + salt + cipher.update(data_to_encrypt) + cipher.final
-
       destfile = File.join(output_dir, File.basename(src_file))
-      File.write(destfile, Base64.encode64(encrypted_data))
+      e = Match::Encryption::MatchFileEncryption.new
+      e.encrypt(file_path: src_file, password: password, output_path:destfile)
       return destfile
     rescue error
       puts path
@@ -74,32 +66,20 @@ module Pindo
     # The encryption parameters in this implementations reflect the old behavior which depended on the users' local OpenSSL version
     # 1.0.x OpenSSL and earlier versions use MD5, 1.1.0c and newer uses SHA256, we try both before giving an error
     def self.decrypt_specific_file(src_file: nil, password: nil, output_dir: nil, hash_algorithm: "MD5")
-      
-      begin 
-        stored_data = Base64.decode64(File.read(src_file))
-        salt = stored_data[8..15]
-        data_to_decrypt = stored_data[16..-1]
 
-        decipher = ::OpenSSL::Cipher.new('AES-256-CBC')
-        decipher.decrypt
-        decipher.pkcs5_keyivgen(password, salt, 1, hash_algorithm)
-
-        decrypted_data = decipher.update(data_to_decrypt) + decipher.final
+      begin
         destfile = File.join(output_dir, File.basename(src_file))
-        File.binwrite(destfile, decrypted_data)
+        e = Match::Encryption::MatchFileEncryption.new
+        e.decrypt(file_path: src_file, password: password, output_path:destfile)
         return destfile
       rescue => error
-        fallback_hash_algorithm = "SHA256"
-        if hash_algorithm != fallback_hash_algorithm
-          decrypt_specific_file(src_file: src_file, password: password, hash_algorithm: fallback_hash_algorithm)
-        else
           Funlog.instance.fancyinfo_error("解析文件失败: #{src_file}")
+          raise Informative, error
           return nil
-        end
       end
     end
 
-  end
 
 
+  end
 end

data/lib/pindo/command/deploy/itcapp.rb

@@ -92,9 +92,9 @@ module Pindo
               temp_version = @config_json["app_info"]["app_version"]
             end 
 
-            if @com_name.nil? && @config_json.nil? && @config_json["account_info"] && @config_json["app_info"]["acount_company_name"]
+            if (@com_name.nil? || @com_name.empty?) && !@config_json.nil? && !@config_json["account_info"].nil? && !@config_json["account_info"]["acount_company_name"].nil?
               @com_name = @config_json["account_info"]["acount_company_name"].strip
-            end 
+            end
 
             app = nil
             if !temp_bundle_id.nil?

data/lib/pindo/module/appstore/appstore_in_app_purchase.rb

@@ -378,16 +378,13 @@ module Pindo
                     include: 'territory',
                     filter: {
                         territory: 'USA',
-                        price_tier: purchase_item["price_tier"]
                     },
-                    limit:100
+                    limit:800
                 )
                 # puts JSON.pretty_generate(respose_price)
 
-
                 price_id = nil
 
-
                 respose_price[:data].each do |price_item|
                     if price_item[:attributes][:customer_price].to_s.eql?(purchase_item["price"].to_s)
                         price_id = price_item[:id]
@@ -395,8 +392,9 @@ module Pindo
                         puts "          更新价格 :" + purchase_item["price"] +"$"
                     end
                 end
+
                 if !price_id.nil?
-                    in_app_purchase = appstore_client.create_in_app_purchase_price_schedule(
+                   purchase_response = appstore_client.create_in_app_purchase_price_schedule(
                         relationships: {
                             manual_prices: {
                                 data: [
@@ -411,32 +409,32 @@ module Pindo
                                     type: 'inAppPurchases',
                                     id: in_app_purchase_id
                                 }
+                            },
+                            baseTerritory: {
+                                data: {
+                                    type: 'territories',
+                                    id: 'USA'
+                                }
                             }
                         },
                         included: [
                             {
-                            type: 'inAppPurchasePrices',
-                            id: '${price1}',
-                            attributes: {
-                                startDate: nil
-                            },
-                            relationships: {
-                                inAppPurchaseV2: {
-                                    data: {
-                                        type: 'inAppPurchases',
-                                        id: in_app_purchase_id
-                                    }
+                                type: 'inAppPurchasePrices',
+                                id: '${price1}',
+                                attributes: {
+                                    startDate: nil
                                 },
-                                inAppPurchasePricePoint: {
-                                data: {
-                                    type: 'inAppPurchasePricePoints',
-                                    id: price_id
-                                }
+                                relationships: {
+                                    inAppPurchasePricePoint: {
+                                        data: {
+                                            type: 'inAppPurchasePricePoints',
+                                            id: price_id
+                                        }
+                                    }
                                 }
                             }
-                            }
-                        ]
-                        )
+                        ])
+                    # puts JSON.pretty_generate(purchase_response)
                 end
 
             rescue => err

data/lib/pindo/version.rb

@@ -1,13 +1,13 @@
 module Pindo
 
-  	VERSION = "4.7.3"
+  	VERSION = "4.7.5"
 
   	class VersionCheck
 
 		def self.check_pindo_new_version
 
-			puts
-			puts "pindo #{Pindo::VERSION}"
+			# puts
+			# puts "pindo #{Pindo::VERSION}"
 
 			begin
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.3
+  version: 4.7.5
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide