pindo 4.7.0 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c7daab6ca92e2942ae682695e06ea741b5cb2ae45804dd9af94bdacc59a49cf
-  data.tar.gz: d237736dfdf676455395a85590142ac30ab8604cd8dd2636577582b48d1da389
+  metadata.gz: 5d5ed09cbd0c1dd5f1fae766fd8d97f98e786b25d34056f8065efede5f478cc0
+  data.tar.gz: b75e1716c757c7d2eabcb5c757c5ea8df886f4e1338cf984d04232a6acd180b6
 SHA512:
-  metadata.gz: d5dc55d34adbd57fd5fa0d0d5268418f88b5fe019e2f1f33c9f5dd19016e15ff3ce00272966c76d6a90b8b68af2eb0d40f49f700990010557abbad69e3338bdf
-  data.tar.gz: f6d9f58c141d0a0b2702f84f34745315b821d59d04f59f8a61c963c6cfc8497b3532455d344e65f73cdfbccd7282cb84166ee5dd46517e5f47c7463a003f36d3
+  metadata.gz: 670591b6329e7d53bdb36156a3dcea8cac1a1477ada5f1451e22d1e457cdc0c91f34c4a5c705844902c48f259e06fec7bb7800f003e41702f20b1e8026cbd14c
+  data.tar.gz: 1327366d3216fd62a113997380b48bf66797092cb81a374557abb9d50c942278efba586751134babafa27810cad6b30eeed5d7d367eadf7071e00c5f9c081ab5

data/lib/pindo/base/aeshelper.rb

@@ -6,6 +6,34 @@ module Pindo
   module AESHelper
 
 
+    def self.fetch_password(keychain_name:nil)
+      # password = ENV["MATCH_PASSWORD"]
+
+      server_name = ["pindo", keychain_name].join("_")
+
+      item = Security::InternetPassword.find(server: server_name)
+
+      password = item.password if item
+
+      unless password
+
+          password = FastlaneCore::Helper.ask_password(message: "请输入证书仓库的加密密码: ", confirm: true)
+          Security::InternetPassword.add(server_name, "", password)     
+      end
+      return password
+    end
+
+    def self.delete_password(keychain_name:nil)
+      server_name = ["pindo", keychain_name].join("_")
+      Security::InternetPassword.delete(server_name)
+    end
+
+    def self.store_password(keychain_name:nil, password:nil)
+      server_name = ["pindo", keychain_name].join("_")
+      Security::InternetPassword.add(server_name, "", password)
+    end
+
+
     def self.aes_128_ecb_encrypt(key, encrypted_string)
       cipher = OpenSSL::Cipher::Cipher.new('AES-128-ECB')
       cipher.encrypt
@@ -48,7 +76,7 @@ module Pindo
     # 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
+      begin 
         stored_data = Base64.decode64(File.read(src_file))
         salt = stored_data[8..15]
         data_to_decrypt = stored_data[16..-1]
@@ -66,7 +94,8 @@ module Pindo
         if hash_algorithm != fallback_hash_algorithm
           decrypt_specific_file(src_file: src_file, password: password, hash_algorithm: fallback_hash_algorithm)
         else
-          raise Informative, "Couldn't decrypt the repo, please make sure you enter the right password!"
+          Funlog.instance.fancyinfo_error("解析文件失败: #{src_file}")
+          return nil
         end
       end
     end

data/lib/pindo/base/githelper.rb

@@ -226,7 +226,7 @@ module Pindo
         current=Dir.pwd
         local_repo_dir = File::join(path, reponame)
 
-        Funlog.instance.fancyinfo_start("开始更新仓库:#{local_repo_dir}...")
+        Funlog.instance.fancyinfo_update("开始更新仓库:#{local_repo_dir}...")
 
         begin
           
@@ -249,15 +249,10 @@ module Pindo
 
                 git!(%W(-C #{local_repo_dir} fetch origin --progress))
               else
-                puts "Cloning `#{remote_url}` into `#{local_repo_dir}`."
                 git! ['clone', remote_url, local_repo_dir]
               end
 
               Dir.chdir(local_repo_dir)
-              if !remote_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
-                  raise Informative, "仓库中的#{new_branch}分支不存在 !!!"
-              end
-
               current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
               if current_branch.eql?(new_branch)
                   git!(%W(-C #{local_repo_dir} reset --hard origin/#{new_branch}))      
@@ -269,7 +264,11 @@ module Pindo
                 if local_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
                   git!(%W(-C #{local_repo_dir} checkout #{new_branch})) 
                 else
-                  git!(%W(-C #{local_repo_dir} checkout -b #{new_branch})) 
+                  if !remote_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
+                      git!(%W(-C #{local_repo_dir} checkout -b #{new_branch})) 
+                  else
+                      raise Informative, "仓库中的#{new_branch}分支不存在 !!!"
+                  end
                 end
                 git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch})) 
                 git!(%W(-C #{local_repo_dir} pull))
@@ -285,7 +284,7 @@ module Pindo
               end
 
           end
-          
+          $stdin.flush
           Funlog.instance.fancyinfo_success("仓库#{local_repo_dir}更新完成!")
         rescue StandardError => e
 

data/lib/pindo/client/aws3sclient.rb

@@ -154,7 +154,7 @@ module Pindo
 
           # (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(100, '_') +  "】Total: #{total_size} M"
           @upload_message = upload_message
           Funlog.instance.fancyinfo_update(upload_message)
           # @spinner.reset

data/lib/pindo/client/bossconfigclient.rb

@@ -133,10 +133,10 @@ module Pindo
 
           # all_cookies = res['set-cookie']
           all_cookies = File.read("/Users/wade/Desktop/cookie.txt") 
-          puts "111"
-          puts all_cookies
+          # puts "111"
+          # puts all_cookies
           cookies_array = parse_cookie(all_cookies) 
-          puts JSON.pretty_generate(cookies_array) 
+          # puts JSON.pretty_generate(cookies_array) 
   
 
       end

data/lib/pindo/client/pgyerclient.rb

@@ -6,9 +6,9 @@ require 'pindo/client/httpclient'
 
 
 module Pindo
- 
 
-  class PgyerClient 
+
+  class PgyerClient
 
 
       attr_accessor :use_local_wechat_url
@@ -23,7 +23,7 @@ module Pindo
             @pgyer_token_file = File.join(File::expand_path(Pindoconfig.instance.pindo_dir), ".pgyer_token")
             config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_common_configdir), "pgyer_client_config.json")
             config_json = JSON.parse(File.read(config_file))
-            
+
             @use_local_wechat_url = config_json["use_local_wechat_url"]
             @baseurl = config_json["pgyerapps_base_url"]
             @request_config = config_json["pgyerapps_req_config"]
@@ -31,7 +31,7 @@ module Pindo
 
           rescue => error
               raise Informative,  "加载pgyer配置文件失败， 需要执行 pindo setup 或者pindo env dreamstudio"
-          end 
+          end
 
       end
 
@@ -39,13 +39,13 @@ module Pindo
 
       end
 
-      
+
       def do_login(force_login:false)
 
-          
+
 
           login_success = false
-          @token = load_token()    
+          @token = load_token()
           if !@token.nil? && !@token["token"].nil? && !force_login
               login_success = true
 
@@ -58,43 +58,45 @@ module Pindo
                   username = @token["username"]
                   checksum_password = nil
                   if !@token["password"].nil?
-                    checksum_password = @token["password"]  
+                    checksum_password = @token["password"]
                   end
               end
-              token = do_login_req(username:username, checksum_password:checksum_password)    
+              token = do_login_req(username:username, checksum_password:checksum_password)
               if !token.nil? && !token["token"].nil?
                   @token = token
                   login_success = true
-              end 
-          end    
+              end
+          end
 
           return login_success
       end
 
       def do_login_req(username:nil, checksum_password:nil)
-          
-          
+
+
           login_name = username
-          if login_name.nil?
+          if login_name.nil? || login_name.empty?
               login_name = ask('请输入pgger网站的usernmae:') || nil
           end
 
-          puts "用户: #{login_name} "
+          checksum_pass = checksum_password
+          if checksum_pass.nil? || checksum_pass.empty?
+              login_passwork = ask('请输入pgger网站的密码:') || nil
+              checksum_pass = Digest::MD5.hexdigest(login_passwork)
+          end
+
+        if !login_name.nil? && !login_name.empty? && !checksum_pass.nil? && !checksum_pass.empty?
 
-          result_data = do_send_code(username:login_name)
+        else
+            raise Informative, "请输入正确的用户名和密码！"
+        end
 
-          puts "验证码: #{result_data["msg"]}"
 
+        Funlog.instance.fancyinfo_start("正在登录pgyer...")
 
-          checksum_pass = checksum_password
-          if checksum_pass.nil?
-              login_passwork = ask('请输入pgger网站的密码:') || nil
-              checksum_pass = Digest::MD5.hexdigest(login_passwork)    
-          end
 
-          # puts "passwork: #{checksum_pass}"
+        result_data = do_send_code(username:login_name)
 
-          Funlog.instance.fancyinfo_start("正在登录pgyer...")
 
           boss_url = @baseurl + @request_config["do_login"]
           body_params = {
@@ -109,26 +111,25 @@ module Pindo
 
           begin
 
-            con = HttpClient.create_instance_with_proxy  
-            res = con.post do |req|
-                req.url boss_url
-                req.headers['Content-Type'] = 'application/json'
-                req.body = body_params.to_json
-            end
+        con = HttpClient.create_instance_with_proxy
+        res = con.post do |req|
+            req.url boss_url
+            req.headers['Content-Type'] = 'application/json'
+            req.body = body_params.to_json
+        end
 
-            
-            if !res.body.nil?
-                
-                login_response_data = JSON.parse(res.body)    
-            end
+        if !res.body.nil?
+
+            login_response_data = JSON.parse(res.body)
+        end
 
           rescue => error
               Funlog.instance.fancyinfo_error("pgyer登录失败!")
               puts "登录失败，请重试!!!"
-          end 
+          end
+
 
 
-          
           # puts JSON.pretty_generate(login_response_data)
 
           if !login_response_data.nil? && !login_response_data["code"].nil? && login_response_data["code"].to_s.eql?("200")
@@ -143,7 +144,7 @@ module Pindo
 
           else
               if File.exist?(@pgyer_token_file)
-                FileUtils.rm_rf(@pgyer_token_file)  
+                FileUtils.rm_rf(@pgyer_token_file)
               end
               Funlog.instance.fancyinfo_error("pgyer登录失败!")
           end
@@ -158,7 +159,7 @@ module Pindo
           Funlog.instance.fancyinfo_success("正在读取pgyer token...")
           if File.exist?(@pgyer_token_file)
               begin
-                data = File.read(@pgyer_token_file) 
+                data = File.read(@pgyer_token_file)
 
                 data_string = AESHelper::aes_128_ecb_decrypt(@pgyer_aes_key, data)
                 temp_token = data_string
@@ -166,37 +167,37 @@ module Pindo
                 if !temp_token.nil? && !temp_token["token"].nil? && !temp_token["username"].nil?
                     @token = temp_token
                     Funlog.instance.fancyinfo_success("读取pgyer token成功!")
-                end 
+                end
               rescue => error
                   puts error
                   # puts "加载pgyer token 失败!!! "
                   if File.exist?(@pgyer_token_file)
-                    FileUtils.rm_rf(@pgyer_token_file)  
+                    FileUtils.rm_rf(@pgyer_token_file)
                   end
                   Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
                   @token  = nil
-              end 
+              end
           else
               Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
-          end    
+          end
 
-          return @token    
+          return @token
       end
 
       def store_token(token:nil)
 
           begin
             @token = token
-            
+
             data_string = AESHelper::aes_128_ecb_encrypt(@pgyer_aes_key, @token.to_json)
             File.open(@pgyer_token_file, "w") do |f|
               f.write(data_string)
             end
             Funlog.instance.fancyinfo_success("token 存储成功!")
             # puts "store pgyer token---- sucess !!!"
-          rescue => error            
+          rescue => error
             Funlog.instance.fancyinfo_error("token存储失败!")
-          end 
+          end
       end
 
       def do_send_code(username:nil)
@@ -209,7 +210,7 @@ module Pindo
           }
           # puts JSON.pretty_generate(body_params)
 
-          con = HttpClient.create_instance_with_proxy  
+          con = HttpClient.create_instance_with_proxy
           res = con.post do |req|
               req.url boss_url
               req.headers['Content-Type'] = 'application/json'
@@ -218,13 +219,13 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
+
           # puts JSON.pretty_generate(result_date)
 
           if !result_date.nil? && !result_date["code"].nil? && result_date["code"].to_s.eql?("200")
-              
+
 
               res = con.post do |req|
                   req.url boss_url
@@ -233,14 +234,14 @@ module Pindo
               end
 
               if !res.body.nil?
-                  result_date = JSON.parse(res.body)    
+                  result_date = JSON.parse(res.body)
               end
-              
+
           end
 
-          
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return  result_date
 
       end
@@ -261,9 +262,9 @@ module Pindo
           }
 
           params.each { |key,value| get_params[key] = value }
-          
 
-          con = HttpClient.create_instance_with_proxy  
+
+          con = HttpClient.create_instance_with_proxy
           res = con.get do |req|
               req.url boss_url
               req.headers['Content-Type'] = 'application/json'
@@ -273,22 +274,17 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)   
+              result_date = JSON.parse(res.body)
 
               if !result_date["code"].nil? && result_date["code"].to_s.eql?("401")
                   do_login(force_login:true)
               end
           end
-          
-          
-          # puts JSON.pretty_generate(result_date)
-          
-          return  result_date
 
-      end
 
-      def do_request(method, params)
+          # puts JSON.pretty_generate(result_date)
 
+          return  result_date
 
       end
 
@@ -304,9 +300,9 @@ module Pindo
               return
           end
           params.each { |key,value| body_params[key] = value }
-          
 
-          con = HttpClient.create_instance_with_proxy  
+
+          con = HttpClient.create_instance_with_proxy
           res = con.post do |req|
               req.url boss_url
               req.headers['Content-Type'] = 'application/json'
@@ -317,18 +313,18 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
-          
+
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return  result_date
 
       end
 
 
-      
+
       # def post_app_update_binary(appId:nil, key_id:nil, description:nil)
       def post_app_update_binary(appId:nil, params:nil)
 
@@ -344,14 +340,14 @@ module Pindo
           }
 
           # puts body_params.to_json
-          # 
+          #
 
           params.each { |key,value| body_params[key] = value }
           # puts body_params.to_json
-          
+
           # puts JSON.pretty_generate(body_params)
           # puts "111"
-          con = HttpClient.create_instance_with_proxy  
+          con = HttpClient.create_instance_with_proxy
           res = con.post do |req|
               req.url boss_url
               req.headers['Content-Type'] = 'application/json'
@@ -362,12 +358,12 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
-          
+
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return result_date
 
       end
@@ -382,11 +378,11 @@ module Pindo
               pageNo:1,
               pageSize:20,
           }
-          
+
           params.each { |key,value| get_params[key] = value }
-          
 
-          con = HttpClient.create_instance_with_proxy  
+
+          con = HttpClient.create_instance_with_proxy
           res = con.get do |req|
               req.url boss_url
               req.headers['Content-Type'] = 'application/json'
@@ -396,12 +392,12 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
-          
+
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return  result_date
 
       end
@@ -420,7 +416,7 @@ module Pindo
           }
 
 
-          con = HttpClient.create_instance_with_proxy 
+          con = HttpClient.create_instance_with_proxy
 
           res = con.post do |req|
               req.url boss_url
@@ -432,12 +428,12 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
-          
+
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return result_date
 
       end
@@ -447,7 +443,7 @@ module Pindo
           params = {} if params.nil?
           boss_url = @baseurl + @request_config["get_cert_list"]
 
-          con = HttpClient.create_instance_with_proxy  
+          con = HttpClient.create_instance_with_proxy
           res = con.get do |req|
               req.url boss_url
               req.headers['Content-Type'] = 'application/json'
@@ -456,12 +452,12 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
-          
+
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return  result_date
 
       end
@@ -476,7 +472,7 @@ module Pindo
             }
 
 
-          con = HttpClient.create_instance_with_proxy 
+          con = HttpClient.create_instance_with_proxy
 
           res = con.post do |req|
               req.url boss_url
@@ -488,16 +484,15 @@ module Pindo
 
           result_date = nil
           if !res.body.nil?
-              result_date = JSON.parse(res.body)    
+              result_date = JSON.parse(res.body)
           end
-          
-          
+
+
           # puts JSON.pretty_generate(result_date)
-          
+
           return result_date
 
       end
 
   end
 end
-

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

@@ -17,7 +17,7 @@ module Pindo
                 DESC
 
                 self.arguments = [
-                    CLAide::Argument.new('path/to/config.json', true),
+                    
                 ]
 
                 def initialize(argv)

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

@@ -81,31 +81,33 @@ module Pindo
                 bundle_id_array = get_bundle_id_map.values
                 provisioning_info_array = nil
 
-                # if @renew_cert_flag || @match_flag
+                if @renew_cert_flag || @match_flag
                   values = get_create_cert_match_values(apple_id:@apple_id, bundle_id_array:bundle_id_array, build_type:@build_type, renew_flag:@renew_cert_flag)
                   config = FastlaneCore::Configuration.create(Match::Options.available_options, values)
                   Match::Runner.new.run(config)
                   provisioning_info_array = create_provisioning_info_array(build_type:@build_type)
                   pindo_single_config.set_cert_info(dict: provisioning_info_array)
+                
+                else
+                  cert_git_url = pindo_single_config.deploy_cert_giturl
+                  if @apple_id.eql?(pindo_single_config.demo_apple_id)
+                    cert_git_url = pindo_single_config.dev_cert_giturl
+                  end
+                  cert_reponame = cert_git_url.split("/").last.chomp(".git")
+                  certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:@apple_id)
 
-                # else
-
-                #   cert_git_url = pindo_single_config.deploy_cert_giturl
-                #   if @apple_id.eql?(pindo_single_config.demo_apple_id)
-                #     cert_git_url = pindo_single_config.dev_cert_giturl
-                #   end
-                #   cert_reponame = cert_git_url.split("/").last.chomp(".git")
-                #   certs_dir = getcode_to_dir(reponame:cert_reponame, remote_url:cert_git_url, path: pindo_single_config.pindo_dir, new_branch:@apple_id)
-
-                #   install_certs(certs_dir:certs_dir, cert_type:@build_type)
-                #   bundle_id_map = get_bundle_id_map
-                #   provisioning_info_array = install_provisionfiles(certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type)
-                #   pindo_single_config.set_cert_info(dict: provisioning_info_array)
-                # end
+                  install_certs(cert_url:cert_git_url, certs_dir:certs_dir, cert_type:@build_type)
+                  bundle_id_map = get_bundle_id_map
+                  provisioning_info_array = install_provisionfiles(cert_url:cert_git_url, certs_dir:certs_dir, bundle_id_map:bundle_id_map, cert_type:@build_type)
+                  pindo_single_config.set_cert_info(dict: provisioning_info_array)
+                end
 
+                provisioning_info_array = provisioning_info_array || []
+                unless provisioning_info_array.size > 0
+                  raise Informative, "未找到证书信息"
+                end
 
-                team_id_key =  Match::Utils.environment_variable_name_team_id(app_identifier: @bundle_id,type:@build_type)
-                @team_id_vaule = ENV[team_id_key]
+                @team_id_vaule = provisioning_info_array.first["team_id"]
 
                 #发布机需要给swark注册bundle id
                 add_swark_authorize_json
@@ -124,8 +126,10 @@ module Pindo
                 new_project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
                 if !new_project_fullname.nil? && File.exist?(new_project_fullname) && !provisioning_info_array.nil? && provisioning_info_array.size > 0
                   new_proj_name = File.basename(new_project_fullname, ".xcodeproj")
+                  Funlog.instance.fancyinfo_start("正在给Xcode配置证书...")
                   config_project_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, cert_type:@build_type, team_id_vaule:@team_id_vaule, provisioning_info_array:provisioning_info_array)
                   config_infoplist_cert(new_proj_name:new_proj_name, new_project_dir:new_project_dir, icloud_id:@icloud_id, group_id:@group_id, provisioning_info_array:provisioning_info_array)
+                  Funlog.instance.fancyinfo_success("Xcode配置证书完成！")
                 end
               end
         end