pindo 4.6.9 → 4.7.1

data/lib/pindo/client/aws3sclient.rb

@@ -2,9 +2,9 @@
 require 'uri'
 require 'json'
 require 'faraday'
-require 'pindo/base/aeshelper'
 require "aws-sdk-s3"
 require 'securerandom'
+require 'pindo/base/aeshelper'
 
 module Pindo
  
@@ -115,64 +115,51 @@ module Pindo
         object_key = upload_path + file_uuid + extension
 
         puts "上传路径: #{object_key}"
-
+        puts
+        
         upload_result = nil
+
+
+        Funlog.instance.fancyinfo_start("开始上传...")
+
         begin
-          
-          
-          obj = Aws::S3::Object.new(@bucket_name, object_key)
 
-          progress = Proc.new do |bytes, totals|
-            set_progress(bytes.sum, totals.sum)
+            obj = Aws::S3::Object.new(@bucket_name, object_key)
+            progress = Proc.new do |bytes, totals|
+              set_progress(bytes.sum, totals.sum)
+            end
+
+            if isAttach
+              obj.upload_file(binary_file, progress_callback: progress, content_disposition:content_disposition)
+            else
+              obj.upload_file(binary_file, progress_callback: progress)
+            end
+            
+            upload_result = object_key
+
+            Funlog.instance.fancyinfo_success(@upload_message)
+            Funlog.instance.fancyinfo_success("#{binary_file} 上传成功!")
+          rescue => ex
+            Funlog.instance.fancyinfo_error("#{binary_file} 上传失败!")
           end
-          
-          
-          if isAttach
-            puts 
-            puts "正在上传附件..."
-            obj.upload_file(binary_file, progress_callback: progress, content_disposition:content_disposition)
-          else
-            puts 
-            puts "正在上传安装包..."
-            obj.upload_file(binary_file, progress_callback: progress)
-          end
-          
-          upload_result = object_key
-
-        #   bucket = find_bucket!()
-        #   details = {
-        #     # acl: 'private'
-        #     key: object_key,
-        #     body: bytes
-        #   }
-        #   obj = bucket.put_object(details)
-        #   # When you enable versioning on a S3 bucket,
-        #   # writing to an object will create an object version
-        #   # instead of replacing the existing object.
-        #   # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/ObjectVersion.html
-        #   if obj.kind_of?(Aws::S3::ObjectVersion)
-        #     obj = obj.object
-        #   end
-
-        #   # Return public url
-        #   puts obj.public_url.to_s
-        #   upload_result = object_key
-        rescue => ex
-          puts ex.to_s
-          puts "Upload S3 failed !!!"
-        end
 
         return upload_result
       end
 
 
-      def set_progress(index_num, total_num,  char = '=')
+      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
 
-          $stdout.print "    已上传: #{progress_str} \% ", (char * (index/1).floor).ljust(100, ' '), " Total: #{total_size} M \r"
-          $stdout.flush
+          # (char * (index/1).floor).ljust(100, ' ')
+
+          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
+          # $stdout.print "    已上传: #{progress_str} \% ", (char * (index/1).floor).ljust(100, ' '), " Total: #{total_size} M \r"
+          # $stdout.flush
           # print "    已上传: #{progress_str} \% ", (char * (index/1).floor).ljust(100, ' '), " Total: #{total_size} M \r"
           # $stdout.flush
       end

data/lib/pindo/client/bossclient.rb

@@ -24,7 +24,7 @@ module Pindo
     attr_accessor :base_url
 
 
-    def initialize(app_type:"FancyApp", is_dev:true, base_url:nil)
+    def initialize(app_type:"FunnyApp", is_dev:true, base_url:nil)
 
 #   
         @app_type = app_type

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,17 +39,18 @@ module Pindo
 
       end
 
-      
+
       def do_login(force_login:false)
 
-          login_success = false
 
-          @token = load_token()    
+
+          login_success = false
+          @token = load_token()
           if !@token.nil? && !@token["token"].nil? && !force_login
               login_success = true
 
-              puts "用户#{@token["username"]}登录pgyer成功!!!"
-              puts
+              # puts "用户#{@token["username"]}登录pgyer成功!!!"
+              # puts
 
           else
               username = nil
@@ -57,41 +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)
-          puts "do logn pgyer --- "
-          
-          
+
+
           login_name = username
-          if login_name.nil?
+          if login_name.nil? || login_name.empty?
               login_name = ask('请输入pgger网站的usernmae:') || nil
           end
 
-          puts "usernmae: #{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
 
-          result_data = do_send_code(username:login_name)
+        if !login_name.nil? && !login_name.empty? && !checksum_pass.nil? && !checksum_pass.empty?
 
-          puts "验证码: #{result_data["msg"]}"
+        else
+            raise Informative, "请输入正确的用户名和密码！"
+        end
 
 
-          checksum_pass = checksum_password
-          if checksum_pass.nil?
-              login_passwork = ask('请输入pgger网站的密码:') || nil
-              checksum_pass = Digest::MD5.hexdigest(login_passwork)    
-          end
+        Funlog.instance.fancyinfo_start("正在登录pgyer...")
+
+
+        result_data = do_send_code(username:login_name)
 
-          # puts "passwork: #{checksum_pass}"
 
           boss_url = @baseurl + @request_config["do_login"]
           body_params = {
@@ -106,39 +111,42 @@ 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")
-              puts "登录成功!!!"
 
               token = {}
               token= login_response_data["data"]
               token["password"] = checksum_pass
               # puts JSON.pretty_generate(token)
               store_token(token:token)
+
+              Funlog.instance.fancyinfo_success("用户:#{@token["username"]}登录pgyer成功!")
+
           else
               if File.exist?(@pgyer_token_file)
-                FileUtils.rm_rf(@pgyer_token_file)  
+                FileUtils.rm_rf(@pgyer_token_file)
               end
-              puts "登录失败，请重试!!!"
+              Funlog.instance.fancyinfo_error("pgyer登录失败!")
           end
 
           return token
@@ -148,47 +156,48 @@ module Pindo
       def load_token()
 
           @token = nil
+          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
                 temp_token = JSON.parse(data_string)
                 if !temp_token.nil? && !temp_token["token"].nil? && !temp_token["username"].nil?
                     @token = temp_token
-                    # puts "加载pgyer token 成功!!! "
-                end 
+                    Funlog.instance.fancyinfo_success("读取pgyer token成功!")
+                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
-              # puts "load pgyer token ---- fail !!! "
-          end    
+              Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
+          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
-            puts "store pgyer token---- sucess !!!"
+            Funlog.instance.fancyinfo_success("token 存储成功!")
+            # puts "store pgyer token---- sucess !!!"
           rescue => error
-            puts 
-            puts "store pgyer token---- sucess !!!"
-            puts error
-          end 
+            Funlog.instance.fancyinfo_error("token存储失败!")
+          end
       end
 
       def do_send_code(username:nil)
@@ -201,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'
@@ -210,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
@@ -225,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
@@ -253,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'
@@ -265,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
 
@@ -296,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'
@@ -309,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)
 
@@ -336,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'
@@ -354,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
@@ -374,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'
@@ -388,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
@@ -412,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
@@ -424,16 +428,71 @@ 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 get_cert_list( )
+
+          params = {} if params.nil?
+          boss_url = @baseurl + @request_config["get_cert_list"]
+
+          con = HttpClient.create_instance_with_proxy
+          res = con.get do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+          end
+
+          result_date = nil
+          if !res.body.nil?
+              result_date = JSON.parse(res.body)
+          end
+
+
+          # puts JSON.pretty_generate(result_date)
+
+          return  result_date
+
+      end
+
+      def post_resign(appVersionId:nil, certId:nil)
+
+          boss_url = @baseurl + @request_config["post_resign"]
+
+          body_params = {
+                appVersionId:appVersionId,
+                certId:certId
+            }
+
+
+          con = HttpClient.create_instance_with_proxy
+
+          res = con.post do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+              req.body = body_params.to_json
+          end
+
+
+          result_date = nil
+          if !res.body.nil?
+              result_date = JSON.parse(res.body)
+          end
+
+
+          # puts JSON.pretty_generate(result_date)
+
           return result_date
 
       end
 
   end
 end
-

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

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Iap < Appstore
+
+
+                self.summary = 'Appstore中iap相关操作'
+
+                self.description = <<-DESC
+                    Appstore中iap相关操作，配置目录下执行：pindo appstore iap, 默认创建iap购买项
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo ipa output --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_download_name = argv.option('download')
+                    
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end