pindo 4.7.0 → 4.7.1

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

@@ -39,6 +39,10 @@ module Pindo
                     @args_send_flag = argv.flag?('send', false)  
                     @args_proj_name = argv.option('proj')
 
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
                     super
                     @additional_args = argv.remainder!
                 end
@@ -58,7 +62,7 @@ module Pindo
                     end
 
                     app_info_obj = nil
-                    if @args_upload_flag || @args_send_flag
+                    if @args_upload_flag 
                         proj_name = @args_proj_name
                         app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
                     end
@@ -120,7 +124,18 @@ module Pindo
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
 
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 
-                        result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:nil)
+                        description = nil
+                        if File.exist?(File.join(pindo_new_project_dir, ".release_info"))
+                            description = File.read(File.join(pindo_new_project_dir, ".release_info"))
+                        else
+                            if File.exist?(File.join(pindo_new_project_dir, ".git"))
+                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format='%h %s')).strip
+                                unless !description.nil? && description.length > 10
+                                    description = nil
+                                end
+                            end
+                        end
+                        result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
                             msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
                             PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)

data/lib/pindo/command/dev/autoresign.rb

@@ -45,6 +45,10 @@ module Pindo
                     @args_send_flag = argv.flag?('send', false)  
                     @args_proj_name = argv.option('proj')
 
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
                     super
                     @additional_args = argv.remainder!
                 end

data/lib/pindo/command/dev/build.rb

@@ -0,0 +1,94 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'xcodeproj'
+require 'gym'
+
+module Pindo
+    class Command
+        class Dev < Command
+            class Build < Dev
+
+
+                self.summary = '编译工程,并支持上传ipa到测试网站'
+
+                self.description = <<-DESC
+                    编译工程. 用法：在工程目录下执行 pindo dev build --upload
+                DESC
+
+                self.arguments = [
+
+                ]
+
+
+                def self.options
+                    [
+                        ['--proj', '指定上传到pgyer对应的项目名称(大小写空格忽略)，用法:pindo ipa autobuild --proj=aichatv4'],
+                        ['--upload', '是否上传编译后的ipa, 用法:pindo ipa autobuild --upload'],
+                        ['--send',  '上传到之后是否发送测试信息,用法:pindo ipa autobuild --send'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_upload_flag = argv.flag?('upload', false)  
+                    @args_send_flag = argv.flag?('send', false)  
+                    @args_proj_name = argv.option('proj')
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                    @additional_args = argv.remainder!
+                end
+
+                def run
+
+                    
+                    app_info_obj = nil
+                    if @args_upload_flag 
+                        proj_name = @args_proj_name
+                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+                    end
+
+                    args_temp = []
+                    Pindo::Command::Deploy::Build::run(args_temp)
+
+
+                    pindo_new_project_dir = Dir.pwd
+                    build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
+                    ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
+
+                    if !ipa_file_upload.nil? && !app_info_obj.nil? 
+
+                        description = nil
+                        if File.exist?(File.join(pindo_new_project_dir, ".release_info"))
+                            description = File.read(File.join(pindo_new_project_dir, ".release_info"))
+                        else
+                            if File.exist?(File.join(pindo_new_project_dir, ".git"))
+                                description = git!(%W(-C #{pindo_new_project_dir} show -s --format='%h %s')).strip
+                                unless !description.nil? && description.length > 10
+                                    description = nil
+                                end
+                            end
+                        end
+                        result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
+                        if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
+                            msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+                            PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                            if @args_send_flag
+                                PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    
+                            end
+                        end
+                    end
+
+                    system "open #{project_dir}"
+
+                end
+
+
+            end
+        end
+    end
+end

data/lib/pindo/command/dev.rb

@@ -8,6 +8,7 @@ require 'pindo/command/dev/pub'
 require 'pindo/command/dev/debug'
 require 'pindo/command/dev/autoresign'
 require 'pindo/command/dev/autobuild'
+require 'pindo/command/dev/build'
 # require 'pindo/command/dev/renewcert'
 # require 'pindo/command/dev/pgyercert'
 # require 'pindo/command/dev/createbuild'

data/lib/pindo/command/ipa/autoresign.rb

@@ -46,6 +46,10 @@ module Pindo
                     @args_send_flag = argv.flag?('send', false)
                     @args_proj_name = argv.option('proj')
 
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
                     super
                     @additional_args = argv.remainder!
                 end

data/lib/pindo/command/ipa/import.rb

@@ -175,7 +175,7 @@ module Pindo
                         end
                     end
 
-                    if pods_array.include?("FancyAD")
+                    if pods_array.include?("FancyAD") || pods_array.include?("AppLovinSDK")
                         puts
                         puts "Run Applovin Script ..."
                         Dir.chdir(pindo_new_project_dir)

data/lib/pindo/command/ipa/output.rb

@@ -45,6 +45,11 @@ module Pindo
                     @args_send_flag = argv.flag?('send', false)
                     @args_increase_flag = argv.flag?('increase', false)
 
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
                     super
                 end
 

data/lib/pindo/command/lib/update.rb

@@ -53,22 +53,22 @@ module Pindo
 
                     private_source = sources.select { |s| s.git? && s.url.to_s.eql?(pod_index_url)}.first
                     if !private_source.nil?
-                        
-                        puts "地址:#{private_source.url}"
-                        puts "目录：#{private_source.repo}"
+
+                        puts "私有Pod地址:#{pod_index_url}"
+                        puts "私有Pod目录：~/.cocoapods"
                         getcode_to_dir(reponame:File.basename(private_source.repo), remote_url: pod_index_url, path:repos_path)
                     else
-                        puts "地址:#{pod_index_url}"
-                        puts "目录：~/.cocoapods"
+                        puts "私有Pod地址:#{pod_index_url}"
+                        puts "私有Pod目录：~/.cocoapods"
                         repository_name = pod_index_url.split("/").last.chomp(".git")
                         getcode_to_dir(reponame:repository_name, remote_url: pod_index_url, path:repos_path)
                     end
-                    
+
 
                     if @args_install_flag
                         begin
-                            if File.exist?("#{working_dir}/Podfile")  
-                                Pod::Command::Install::run(['--clean-install']) 
+                            if File.exist?("#{working_dir}/Podfile")
+                                Pod::Command::Install::run(['--clean-install'])
                             end
                         rescue => e
                             puts e.message

data/lib/pindo/config/pindoconfig.rb

@@ -281,6 +281,14 @@ module Pindo
       return url
     end
 
+    def cert_key_password
+      cert_key_password = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        cert_key_password =  @pindo_user_config_json["develop_accout_info"]["cert_key_password"]
+      end
+      return cert_key_password
+    end
+
     def deploy_cert_giturl
       url = ''
       if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
@@ -288,6 +296,16 @@ module Pindo
       end
       return url
     end
+    
+    def deploy_cert_decrypt_password
+      pass = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        pass =  @pindo_user_config_json["develop_accout_info"]["deploy_cert_decrypt_password"]
+      end
+      return pass
+    end
+
+
 
     def dev_cert_giturl
       url = ''
@@ -297,6 +315,15 @@ module Pindo
       return url
     end
 
+
+    def dev_cert_decrypt_password
+      pass = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        pass =  @pindo_user_config_json["develop_accout_info"]["dev_cert_decrypt_password"]
+      end
+      return pass
+    end
+
     def demo_apple_id
       url = ''
       if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?

data/lib/pindo/module/appselect.rb

@@ -45,7 +45,6 @@ module Pindo
 
         def all_tool_bundleid
           setting_file = File.join(pindo_single_config.pindo_env_configdir,'bundleid_config.json')
-          puts setting_file
           setting_json = load_setting(setting_file:setting_file)
           sub_json = []
           if !setting_json.nil? && !setting_json['all_tool_bundleid'].nil?
@@ -86,10 +85,10 @@ module Pindo
             puts "具体参考文档: https://tower.im/teams/851356/repository_documents/714/"
             puts ""
             puts "App Type:"
-
+            puts 
             cli.choose do |menu|                                  # you can also use constants like :blue
-                menu.header = "选用哪个bundle id?"
-                menu.prompt = "请选择使用的bundle id,请输入选项(1/2/3...):"
+                menu.header = "可用的Bundle Id如下:"
+                menu.prompt = "请选择使用的Bundle Id,请输入选项(1/2/3...):"
                 menu.index_suffix = ") "
                 if !sub_setting_json.nil? 
                   sub_setting_json.each do |key, items|
@@ -115,9 +114,10 @@ module Pindo
                    
           cli = HighLine.new
           menu_choice="None"
+          puts 
           cli.choose do |menu|                                  # you can also use constants like :blue
-              menu.header = "选用哪个bundle id?"
-              menu.prompt = "请选择使用的bundle id,请输入选项(1/2/3...):"
+              menu.header = "可用的Bundle Id如下:"
+              menu.prompt = "请选择使用的Bundle Id,请输入选项(1/2/3...):"
               if !all_bundleid.nil? && all_bundleid.length > 0
                 for bunld_id in all_bundleid do
                   menu.choice(bunld_id) do |details|
@@ -140,10 +140,11 @@ module Pindo
           
           cli = HighLine.new
           menu_choice="None"
+          puts 
           cli.choose do |menu|                                  # you can also use constants like :blue
 
-              menu.header = "选用哪个bundle id?"
-              menu.prompt = "请选择使用的bundle id,请输入选项(1/2/3...):"
+              menu.header = "可用的Bundle Id如下:"
+              menu.prompt = "请选择使用的Bundle Id,请输入选项(1/2/3...):"
               if !all_bundleid.nil? && all_bundleid.length > 0
                 for bunld_id in all_bundleid do
                   menu.choice(bunld_id) do |details|

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

@@ -9,11 +9,7 @@ require 'pindo/module/cert/provisioninghelper'
 module Pindo
 
   module CertHelper
-
-    def server_name(keychain_name)
-      ["match", keychain_name].join("_")
-    end
-      
+   
     def get_cert_info(cer_certificate)
       # can receive a certificate path or the file data
       begin
@@ -65,7 +61,7 @@ module Pindo
       (/darwin/ =~ RUBY_PLATFORM) != nil
     end
 
-    def install_certs(certs_dir:nil, cert_type:nil)
+    def install_certs(cert_url:nil, certs_dir:nil, cert_type:nil)
 
       
       if !cert_type.downcase.include?("development")
@@ -79,45 +75,59 @@ module Pindo
         raise Informative, "No certificates found in #{certs_dir}"
       else
           output_dir = Dir.mktmpdir
-          decrypt_password = "Gxtest#1"
-
+          
+          decrypt_password = AESHelper.fetch_password(keychain_name:cert_url)
           Funlog.instance.fancyinfo_start("正在安装证书...")
 
           cert_path = AESHelper.decrypt_specific_file(src_file: certs.first, password:decrypt_password, output_dir: output_dir)
+          unless cert_path.nil? || File.exist?(cert_path)
+            AESHelper.delete_password(keychain_name:cert_url)
+            raise Informative, "证书解析失败，密码错误！"
+          end
+
           key_path = AESHelper.decrypt_specific_file(src_file: keys.first, password:decrypt_password, output_dir: output_dir)
+          unless key_path.nil? || File.exist?(key_path)
+            AESHelper.delete_password(keychain_name:cert_url)
+            raise Informative, "证书解析失败，密码错误！"
+          end
 
           unless is_cert_valid?(cert_path)
-             raise Informative, "Your certificate '#{File.basename(cert_path)}' is not valid, please check end date and renew it if necessary"
+             raise Informative, "证书已经过期，请重新生产新证书!"
           end
 
+
           if isMac?
 
             keychain_name = "login.keychain"
-
             if FastlaneCore::CertChecker.installed?(cert_path, in_keychain: nil)
               Funlog.instance.fancyinfo_success("证书#{File.basename(cert_path)}已安装，无需重复安装!")
             else
-              cert_password = "goodcert1"
+
+              cert_password = Pindoconfig.instance.cert_key_password
               keychain = 'login.keychain'
               keychain_path = FastlaneCore::Helper.keychain_path(keychain)
 
-              KeychainHelper.import_file(cert_path, keychain_path, keychain_password: cert_password, certificate_password: "", skip_set_partition_list: false, output: false)
-              KeychainHelper.import_file(key_path, keychain_path, keychain_password: cert_password, certificate_password: "", skip_set_partition_list: false, output: false)
+              KeychainHelper.import_file(cert_path, keychain_path, keychain_password: cert_password, certificate_password:'' )
+              KeychainHelper.import_file(key_path, keychain_path, keychain_password: cert_password, certificate_password: '')
 
 
               Funlog.instance.fancyinfo_success("证书'#{File.basename(cert_path)}'安装完成！")
             end
           else
-            puts "非Mac电脑不支持安装证书."
+            Funlog.instance.fancyinfo_error("非Mac电脑不支持安装证书!")
           end
 
       end
 
-      def install_provisionfiles(certs_dir:nil, bundle_id_map:nil, cert_type:nil)
+      def install_provisionfiles(cert_url:nil, certs_dir:nil, bundle_id_map:nil, cert_type:nil)
+
+
+          Funlog.instance.fancyinfo_start("正在安装Provisioning Profiles文件...")
+
 
           if cert_type.downcase.include?("development")
             cert_type = "Development"
-          elsif cert_type.downcase.include?("Adhoc")
+          elsif cert_type.downcase.include?("adhoc")
             cert_type = "Adhoc"
           else
             cert_type = "AppStore"
@@ -133,13 +143,12 @@ module Pindo
 
             bundle_id_map.each do |type, bundle_id_temp|
                 profile_filename = File.join(certs_dir, "profiles", cert_type.downcase.to_s,[cert_type.to_s, bundle_id_temp].join('_') + '.mobileprovision') 
-
                   unless File.exist?(profile_filename)
                     un_exist_files << profile_filename 
                     next
                   end
-                  puts "正在安装 #{profile_filename}..."
-                  decrypt_password = "Gxtest#1"
+                  # puts "正在安装 #{bundle_id_temp}..."
+                  decrypt_password = AESHelper.fetch_password(keychain_name:cert_url)
                   output_dir = Dir.mktmpdir
                   file_decrypt = AESHelper.decrypt_specific_file(src_file: profile_filename, password:decrypt_password, output_dir: output_dir)
                   destpath = Provisioninghelper.install(file_decrypt)
@@ -151,17 +160,19 @@ module Pindo
                   provisioning_info['profile_name'] = parsed_data['Name']
                   provisioning_info['profile_path'] = destpath
 
+
                   cert_info = get_cert_info(parsed_data["DeveloperCertificates"].first.string).to_h
                   provisioning_info['signing_identity'] = cert_info["Common Name"]
                   provisioning_info['team_id'] = parsed_data["TeamIdentifier"].first
 
-                  puts JSON.pretty_generate(provisioning_info)
+                  # puts JSON.pretty_generate(provisioning_info)
                   provisioning_info_array << provisioning_info
             end
 
-            
+            Funlog.instance.fancyinfo_success("Provisioning Profiles文件安装完成！")
 
             if un_exist_files.size > 0
+              Funlog.instance.fancyinfo_error("证书Provisioning Profiles文件不存在！")
               raise Informative, "The following profiles do not exist: #{un_exist_files.join(', ')}"
             end
 

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

@@ -3,11 +3,13 @@ require 'open3'
 require 'security'
 
 module Pindo
-  
+
   module KeychainHelper
 
     def self.import_file(path, keychain_path, keychain_password: nil, certificate_password: "", skip_set_partition_list: false, output: false)
-      puts "Could not find file '#{path}'" unless File.exist?(path)
+      # puts path
+
+      # puts "Could not find file '#{path}'" unless File.exist?(path)
 
       password_part = " -P #{certificate_password.shellescape}"
 
@@ -19,22 +21,28 @@ module Pindo
       command << " -T /usr/bin/productsign"  # to not be asked for permission when using an installer cert for macOS
       command << " 1> /dev/null" unless output
 
-      sensitive_command = command.gsub(password_part, " -P ********")
-      UI.command(sensitive_command) if output
-      Open3.popen3(command) do |stdin, stdout, stderr, thrd|
-        UI.command_output(stdout.read.to_s) if output
+      # puts command
+      # sensitive_command = command.gsub(password_part, " -P ********")
 
+      # UI.command(sensitive_command) if output
+      Open3.popen3(command) do |stdin, stdout, stderr, thrd|
+        # UI.command_output(stdout.read.to_s) if output
+        # puts "123"
         # Set partition list only if success since it can be a time consuming process if a lot of keys are installed
         if thrd.value.success? && !skip_set_partition_list
+          # puts "安装成功!"
           keychain_password ||= resolve_keychain_password(keychain_path)
           set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output)
         else
           # Output verbose if file is already installed since not an error otherwise we will show the whole error
           err = stderr.read.to_s.strip
+
           if err.include?("SecKeychainItemImport") && err.include?("The specified item already exists in the keychain")
-            # UI.verbose("'#{File.basename(path)}' is already installed on this machine")
+            # UI.verbose("'}' is already installed on this machine")
+            # puts "证书key已经存在，安装完成!"
           else
-            raise Informative, err
+            # puts err
+            # raise Informative, err
           end
         end
       end
@@ -64,8 +72,9 @@ module Pindo
         # Helper.show_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)")
 
         # Strip keychain password from command output
-        sensitive_command = command.gsub(password_part, " -k ********")
-        UI.command(sensitive_command) if output
+        # sensitive_command = command.gsub(password_part, " -k ********")
+        # puts command
+        # UI.command(sensitive_command) if output
         Open3.popen3(command) do |stdin, stdout, stderr, thrd|
           unless thrd.value.success?
             err = stderr.read.to_s.strip
@@ -73,6 +82,9 @@ module Pindo
             # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
             if err.include?("SecKeychainItemSetAccessWithPassword")
               keychain_name = File.basename(keychain_path, ".*")
+              # puts "password #{keychain_password}"
+              # puts "keychain #{keychain_name}"
+              # puts "security #{server_name(keychain_name)}"
               Security::InternetPassword.delete(server: server_name(keychain_name))
 
               # UI.important("")
@@ -83,9 +95,9 @@ module Pindo
               # UI.important("Please look at the following docs to see how to set a keychain password:")
               # UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
               # UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
-              puts "密码错误"
+              # puts "证书密码错误!"
             else
-              raise Informative, err
+              puts err
             end
           end
         end
@@ -130,7 +142,7 @@ module Pindo
 
     # server name used for accessing the macOS keychain
     def self.server_name(keychain_name)
-      ["fastlane", "keychain", keychain_name].join("_")
+      ["pindo", "keychain", keychain_name].join("_")
     end
 
     private_class_method :server_name

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

@@ -89,7 +89,7 @@ module Pindo
 
         
         destination = File.join(profiles_path, profile_filename(path, keychain_path))
-        puts "Installing provisioning profile... #{destination}"
+        # puts "Installing provisioning profile... #{destination}"
         
         if path != destination
           # copy to Xcode provisioning profile directory