pindo 4.6.9

data/lib/pindo/module/icon_contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "icon20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "icon20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "icon40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "icon60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "icon60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "icon20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "icon20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "icon40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "icon40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "icon76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "icon83_5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "icon1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

data/lib/pindo/module/imessage_icon.json

@@ -0,0 +1,91 @@
+{
+  "images" : [
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "icon29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x45",
+      "idiom" : "iphone",
+      "filename" : "icon60_45@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x45",
+      "idiom" : "iphone",
+      "filename" : "icon60_45@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "icon29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "67x50",
+      "idiom" : "ipad",
+      "filename" : "icon67_50@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "74x55",
+      "idiom" : "ipad",
+      "filename" : "icon74_55@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "icon1024@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "27x20",
+      "idiom" : "universal",
+      "filename" : "icon27_20@2x.png",
+      "scale" : "2x",
+      "platform" : "ios"
+    },
+    {
+      "size" : "27x20",
+      "idiom" : "universal",
+      "filename" : "icon27_20@3x.png",
+      "scale" : "3x",
+      "platform" : "ios"
+    },
+    {
+      "size" : "32x24",
+      "idiom" : "universal",
+      "filename" : "icon32_24@2x.png",
+      "scale" : "2x",
+      "platform" : "ios"
+    },
+    {
+      "size" : "32x24",
+      "idiom" : "universal",
+      "filename" : "icon32_24@3x.png",
+      "scale" : "3x",
+      "platform" : "ios"
+    },
+    {
+      "size" : "1024x768",
+      "idiom" : "ios-marketing",
+      "filename" : "icon1024_768@1x.png",
+      "scale" : "1x",
+      "platform" : "ios"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

data/lib/pindo/module/imgset_contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [
+    {
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "filename": "w768_h1024@2x.png",
+      "scale": "2x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

data/lib/pindo/module/launchimg_contents.json

@@ -0,0 +1,21 @@
+{
+  "images": [
+    {
+      "idiom": "universal",
+      "scale": "1x"
+    },
+    {
+      "idiom": "universal",
+      "filename": "w768_h1024@2x.png",
+      "scale": "2x"
+    },
+    {
+      "idiom": "universal",
+      "scale": "3x"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

data/lib/pindo/module/pemcreate.rb

@@ -0,0 +1,63 @@
+
+module Pindo
+  module Pemcreate
+    def create_certificate(bundle_id:nil, type:"prod", output_path:"")
+
+      if bundle_id.empty? || output_path.empty?
+        UI.user_error!("bundle id is nil or output_path is nil.")
+      end
+
+      puts "Creating a new push certificate for app '#{bundle_id}'. "
+
+      csr, pkey = Spaceship::Portal.certificate.create_certificate_signing_request
+
+      cert = nil
+      begin
+        if type == "dev"
+          cert = Spaceship::Portal.certificate.development_push.create!(csr: csr, bundle_id: bundle_id)
+        else
+          cert = Spaceship::Portal.certificate.production_push.create!(csr: csr, bundle_id: bundle_id)
+        end
+      rescue => ex
+        if ex.to_s.include?("You already have a current")
+          # That's the most common failure probably
+          raise Informative, "You already have 2 active push profiles for this application/environment. You'll need to revoke an old certificate to make room for a new one"
+        else
+          raise ex
+        end
+      end
+
+
+      x509_certificate = cert.download
+      certificate_type = (type == "dev" ? 'development' : 'production')
+
+      base_base = bundle_id.gsub('.', '_')
+      puts base_base
+      filename_base = base_base + '_' + type
+      
+      
+      private_key_path = File.join(output_path, "#{filename_base}.pkey")
+      File.write(private_key_path, pkey.to_pem)
+      puts "key: #{private_key_path}"
+
+
+      p12_cert_path = File.join(output_path, "#{filename_base}.p12")
+      p12 = OpenSSL::PKCS12.create('goodcert1', certificate_type, pkey, x509_certificate)
+      File.write(p12_cert_path, p12.to_der)
+      puts "p12 : #{p12_cert_path}"
+
+
+      x509_cert_path = File.join(output_path, "#{filename_base}.pem")
+      File.write(x509_cert_path, x509_certificate.to_pem + pkey.to_pem)
+      puts "pem : #{x509_cert_path}"
+
+      return x509_cert_path
+    end
+
+    def login(apple_id:nil)
+      puts apple_id
+      Spaceship::Portal.login(apple_id.to_s)
+      Spaceship::Portal.select_team
+    end
+  end
+end

data/lib/pindo/module/pgyerhelper.rb

@@ -0,0 +1,339 @@
+
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'faraday'
+require "rqrcode"
+require 'pindo/client/pgyerclient'
+require 'pindo/client/aws3sclient'
+
+
+module Pindo
+
+    class PgyerHelper
+
+        class << self
+          attr_writer :instance
+        end
+
+        def self.share_instace
+          @instance ||= new
+        end
+
+        def get_user_local_wechat_url( )
+
+            wechat_msg_url = nil
+            wechat_msg_url = PindoUserLocalConfig.instance.read_local_wechat_url
+            if !wechat_msg_url.nil? && wechat_msg_url.length > 1
+            else
+
+                wechat_msg_url = ask('请输入Wechat Url:')
+                if !wechat_msg_url.nil? && wechat_msg_url.length > 1
+                    PindoUserLocalConfig.instance.write_local_wechat_url(wechat_msg_url:wechat_msg_url)
+                end
+
+            end
+            wechat_msg_url
+        end
+
+
+        def send_apptest_wechat_msg(msg_data:nil)
+
+                wechat_msg_url = get_user_local_wechat_url()
+
+                if !wechat_msg_url.nil? && wechat_msg_url.length >1
+
+                else
+                    puts "企业微信Wechat Url无效"
+                end
+
+                begin
+
+                        download_url = msg_data[:download_url]
+                        app_name = msg_data[:app_name]
+                        download_password = msg_data[:download_password]
+                        bundle_id = msg_data[:bundle_id]
+                        app_version = msg_data[:app_version]
+                        index_num = msg_data[:index_num]
+                        upload_time = msg_data[:time]
+                        description = msg_data[:description]
+                        msg_from = msg_data[:msg_from]
+
+
+                        # current_dir = current_dir = Dir.pwd
+                        # output_file = File.join(current_dir, app_name + "_qrcode.png")
+                        qrcode = RQRCode::QRCode.new(download_url)
+
+                        png = qrcode.as_png(
+                          bit_depth: 1,
+                          border_modules: 4,
+                          color_mode: ChunkyPNG::COLOR_GRAYSCALE,
+                          color: "black",
+                          file: nil,
+                          fill: "white",
+                          module_px_size: 6,
+                          resize_exactly_to: false,
+                          resize_gte_to: false,
+                          size: 300
+                        )
+
+
+                        checksum = Digest::MD5.hexdigest(png.to_s)
+                        image_base64_data =  Base64.strict_encode64(png.to_s)
+
+                        body_data = {
+                            msgtype:"image",
+                            image:{
+                                base64: image_base64_data,
+                                md5:checksum
+                            }
+                        }
+
+                        con = Faraday.new
+                        res = con.post do |req|
+                            req.url wechat_msg_url
+                            req.headers['Content-Type'] = 'application/json'
+                            req.body =  body_data.to_json
+                        end
+                        
+
+                        body_data = {
+                            msgtype:"text",
+                            text:{
+                                content: "#{app_name} 测试\r\r版本号: #{app_version}   build:#{index_num}\r安装密码: #{download_password}\r上传时间: #{upload_time}\rBundle Id: #{bundle_id}\r链接:#{download_url}\r\n说明:\r\r#{description}\r\r消息发送来自: #{msg_from}"
+
+                            }
+                        }
+
+                        con = Faraday.new
+                        res = con.post do |req|
+                            req.url wechat_msg_url
+                            req.headers['Content-Type'] = 'application/json'
+                            req.body =  body_data.to_json
+                        end
+                        puts
+                        puts "发送企业微信成功 ！！!"
+                        puts
+
+                rescue StandardError => e
+                        puts
+                        puts "发送企业微信失败 ！！!"
+                        puts
+                end
+
+        end
+
+        def print_app_version_info(msg_data:nil)
+
+            qrcode = RQRCode::QRCode.new(msg_data[:download_url])
+            svg = qrcode.as_ansi(
+              light: "\033[47m", dark: "\033[40m",
+              fill_character: "  ",
+              quiet_zone_size: 1,
+              size: 300
+            )
+            puts "\r\n\r\n\r\n\r\n"
+            puts svg
+            puts
+            puts "#{msg_data[:app_name]} 测试"
+            puts "Bundle Id:  #{msg_data[:bundle_id]}"
+            puts "版本号:    #{msg_data[:app_version]}  build: #{msg_data[:index_num]}"
+            puts "安装密码:  #{msg_data[:download_password]}"
+            puts "上传时间:  #{msg_data[:time]}"
+            puts "链接:     #{msg_data[:download_url]}"
+            puts "说明:     #{msg_data[:description]}"
+            puts "\r\n\r\n\r\n\r\n"
+
+        end
+
+        def find_app_info_with_obj_list(proj_name:nil)
+            if proj_name.nil?
+                return nil
+            end
+
+            key_proj_name = proj_name.downcase.strip.gsub(/[\s\-_]/, '')
+
+            app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
+            app_info_obj = app_info_list&.find do |app_info_item|
+                app_info_item_name = app_info_item["appName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
+                app_info_item_name.eql?(key_proj_name) && app_info_item["appType"].eql?("iOS")
+            end
+
+            app_info_obj
+        end
+
+        def get_app_version(client:nil, appId:nil, app_version_index:nil, latest_version:true)
+
+            version_data = client.get_app_version_list_req(appId:appId)
+
+            version_item_obj = nil
+            if latest_version
+               version_item_obj = version_data["data"].find{ |item| item["latest"]}
+            else
+                if !app_version_index.nil?
+                    version_item_obj = version_data["data"].find{ |item| item["incId"].to_s.eql?(app_version_index.to_s)}
+                end
+            end
+
+            # puts JSON.pretty_generate(version_item_obj)
+
+            return version_item_obj
+        end
+
+        def get_app_list_in_pgyer(client:nil)
+
+            puts "正在向pgyer拉取app信息列表， 查找app信息..."
+            params = {
+                pageNo:1,
+                pageSize:1000
+            }
+
+            app_info_list = Pindoconfig.instance.get_pgyerapps_info_list()
+            if app_info_list.nil?
+                res_data = client.get_app_list_req(params:params)
+                # puts JSON.pretty_generate(res_data)
+                if !res_data["data"].nil? && res_data["data"].size > 0
+                    app_info_list = res_data["data"]
+                    Pindoconfig.instance.set_pgyerapps_info_list(app_info_list:app_info_list)
+                end
+            end
+
+            if app_info_list.nil?
+                res_data = client.get_app_list_req(params:params)
+                # puts JSON.pretty_generate(res_data)
+                if !res_data["data"].nil? && res_data["data"].size > 0
+                    app_info_list = res_data["data"]
+                    Pindoconfig.instance.set_pgyerapps_info_list(app_info_list:app_info_list)
+                end
+            end
+
+            if app_info_list.nil?
+                raise Informative, "Pgyer网络数据异常!!!"
+            end
+            return app_info_list
+        end
+
+        def get_versioon_history_item(client:nil, app_info_obj:nil, list_select_flat:false)
+
+                appId = app_info_obj["appId"]
+                version_data = client.get_app_version_list_req(appId:appId) || {}
+
+                if version_data["data"].nil? || version_data["data"].size <=0
+                    raise Informative, "#{proj_name} 错误， 没有找到上传记录"
+                end
+
+                app_incId_index = nil
+                if list_select_flat
+
+                    #获取version_data 最后10个数
+                    list_num = [version_data["data"].size, 10].min
+                    #获取version_data 最后10个的incId， bundleId, updateTime组成新数组
+                    version_array_temp = version_data["data"].take(list_num).map do |item|
+                        {
+                          "appVersion" => item["appVersion"] + "(build " + item["build"] + " )",
+                          "incId" => item["incId"],
+                          "bundleId" => item["bundleId"],
+                          "updateTime" => item["updateTime"]
+                        }
+                    end
+
+                    version_array_temp.each do |item|
+                        puts "版本:#{item["appVersion"]}  Build号:#{item["incId"]}  bundleId:#{item["bundleId"]} 上传时间:#{item["updateTime"]}"
+                    end
+                    puts
+                    app_incId_index = ask('请选择上面的Build号:')
+
+                end
+
+                version_item_obj = nil
+                if !app_incId_index.nil?
+                    version_item_obj = version_data["data"].find{ |item| item["incId"].to_s.eql?(app_incId_index.to_s)}
+                else
+                    version_item_obj = version_data["data"].find{ |item| item["latest"]}
+                end
+
+                version_item_obj
+
+        end
+
+
+        def get_description()
+            comment_array = []
+            puts "请输入备注信息(按Esc结束):"
+            loop do
+
+              line = STDIN.gets.chomp
+              comment_array << line
+
+              key = STDIN.getch
+              break if key == "\e"  # Break the loop if Esc key is pressed
+            end
+            puts "================================="
+            puts "输入结束,输入内容为:"
+            puts "================================="
+            comment_str = comment_array.join("\n")
+            puts comment_array
+            puts "================================="
+            return comment_str
+        end
+
+        def modify_coment(client:nil, app_info_obj:nil, version_item_obj:nil)
+
+            comment_str = get_description()
+            puts
+            puts "确修改信息:"
+            puts
+            puts  "================================="
+            puts "App: #{app_info_obj["appName"]}"
+            puts "版本: #{version_item_obj["appVersion"]} (build #{version_item_obj["build"]})"
+            puts "Build号: #{version_item_obj["incId"]}"
+            puts "bundleId: #{version_item_obj["bundleId"]}"
+            puts "上传时间: #{version_item_obj["updateTime"]}"
+            puts
+            puts "旧备注: \n#{version_item_obj["description"]}"
+            puts
+            puts "修改备注: \n#{comment_str.strip}"
+            puts  "================================="
+            puts
+            answer = agree("确认修改备注信息(Y/n)?:")
+            unless answer
+                raise Informative, "暂停修改！！"
+            end
+
+            client.post_update_upload_comment(appId:app_info_obj["appId"], id:version_item_obj["id"], comment:comment_str.strip)
+
+            puts "备注信息修改成功！！"
+
+        end
+
+        def make_msg_data(app_info_obj:nil, app_version_info_obj:nil, msg_from: nil)
+
+                app_name = app_info_obj["appName"]
+                download_password = app_info_obj["password"]
+                download_url = app_info_obj["downloadUrl"] + "?" + "id=" + app_version_info_obj["id"]
+                bundle_id = app_version_info_obj["bundleId"]
+                app_version = app_version_info_obj["appVersion"]
+                index_num = app_version_info_obj["incId"]
+                time = app_version_info_obj["updateTime"]
+                description = app_version_info_obj["description"]
+                msg_from = msg_from || " "
+                msg_data  ={
+                    app_name: app_name,
+                    download_password: download_password,
+                    download_url: download_url,
+                    bundle_id: bundle_id,
+                    app_version: app_version,
+                    index_num: index_num,
+                    time: time,
+                    description: description,
+                    msg_from:msg_from
+                }
+
+                return msg_data
+
+        end
+
+
+    end
+
+end