pindo 4.7.2 → 4.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f5abed812ba1c0068fad2e583c9b4195ceaf65f7535a3b878b68c1e842c8f6
-  data.tar.gz: b4ecb804c33881b62ec284c560d69d39cddd9632cc6f274ae1125a1d647f24a2
+  metadata.gz: df037923380f2b620207356880503d0999f322ff1567b91f851cab7e16a5c3d5
+  data.tar.gz: cfe5b3f9a2968750ed4e78bf0d3127a74bbd20c53a703ae74606394fc0433ab2
 SHA512:
-  metadata.gz: 7395a2bb7ebda1d191e6122ad27d51cd546a1954d6fc8c392fd738815d5f9f940d9575f46ef26dbd6e0c9188dcf8154f5d89a57cdf920f1890a067c6993dc294
-  data.tar.gz: a4fc02fa9c1f567c4e37e9ad9fba752cfb95efaa1ecee8ca1f5e54307804f61ff94df1ba514199ce1ddb3b4f4fcbebe91b050b66fc4b1ce333a39e0600c01046
+  metadata.gz: 4f05b640b14b6f4d7de61e8b359b0350a15b5b48dd63f39ef71e6f8287d62f8350eaac767b5935241af9b8df8d9b2482329b33f31cca4b9911c96114b9f27528
+  data.tar.gz: d2fe50e1eb3cd860248c05e746d307e9a8ca554225f9134788fa7ab3aed3b4f2470a7610bf3048c5f82ff5e2a4930d046cb6ca4888f1b34fcccaf5fcd8b3c0f6

data/lib/pindo/client/aws3sclient.rb

@@ -150,11 +150,11 @@ module Pindo
       def set_progress(index_num, total_num,  char ='>' )
           progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
           total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 ) 
-          index = 100.0 * index_num / total_num
+          index = 40.0 * index_num / total_num
 
           # (char * (index/1).floor).ljust(100, ' ')
 
-          upload_message = "已上传:#{progress_str}\%【" + (char * (index/1).floor).ljust(100, '_') +  "】Total: #{total_size} M"
+          upload_message = "已上传:#{progress_str}\%【" + (char * (index/1).floor).ljust(40.0, '_') +  "】Total: #{total_size} M"
           @upload_message = upload_message
           Funlog.instance.fancyinfo_update(upload_message)
           # @spinner.reset

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

@@ -548,9 +548,8 @@ module Pindo
                         end
 
                         new_iap_items["in_app_purchase_type"] = in_app_purchase_type
-                        new_iap_items["available_in_all_territories"] = true
                         new_iap_items["price"] = purchase_item["price"].to_s.strip
-                        new_iap_items["price_tier"] = iap_consumable_tier_dict[new_iap_items["price"]]
+                        new_iap_items["price_tier"] = iap_consumable_tier_dict[new_iap_items["price"].to_s]
 
                         if new_iap_items["price_tier"].nil?
                           raise "购买项价格错误 " + new_iap_items["product_id"] + " 价格 :" + purchase_item["price"]
@@ -569,7 +568,7 @@ module Pindo
                         new_iap_items["localization"]["en-US"]["description"] = purchase_item["description"].to_s.strip
                         if !new_iap_items["localization"]["en-US"]["description"].nil? && new_iap_items["localization"]["en-US"]["description"].length > 45
                             puts temp_product_id
-                            raise Informative, "description 超出限定的45个字符 !!!"
+                            raise Informative, "purchuse description 超出限定的45个字符 !!!"
                         end
 
                         new_iap_items["review_note"] = "username: " + iap_tester["email"] + "      password: " + iap_tester["password"]
@@ -651,7 +650,6 @@ module Pindo
                           raise Informative, "product_id 超出限定的100个字符 !!!"
                       end
 
-                      new_subs_item["available_in_all_territories"] = true
                       new_subs_item["family_sharable"] = false
                       new_subs_item["price"] = subs_item["price"].to_s.strip
                       new_subs_item["subscription_duration"] = subscription_duration_dict[subs_item["subscription_duration"]]

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/command/dev/autoresign.rb

@@ -92,12 +92,12 @@ module Pindo
 
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
-                    proj_name = nil
-                    if @args_upload_flag || @args_send_flag
+                    app_info_obj = nil
+                    if @args_upload_flag 
                         proj_name = @args_proj_name
-                        proj_name = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
                     end
-
+                    
                     args_temp = []
                     if @args_adhoc_flag
                         args_temp << "--adhoc"

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

@@ -91,8 +91,8 @@ module Pindo
 
                       progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
                       total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 ) 
-                      index = 100.0 * index_num / total_num
-                      download_message = "已下载:#{progress_str}\%【" + (char_in * (index/1).floor).ljust(100, char_out) +  "】Total: #{total_size} M"
+                      index = 40.0 * index_num / total_num
+                      download_message = "已下载:#{progress_str}\%【" + (char_in * (index/1).floor).ljust(40.0, char_out) +  "】Total: #{total_size} M"
                       Funlog.instance.fancyinfo_update(download_message)
 
                     }) do |file|