pindo 4.8.7 → 4.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b5673e6e6b22077a55006939dc549e2b545537d935c6a004bed385dd936014
-  data.tar.gz: 699659aa13cff6c29fd5cbf63ba1a16707cb1ba6e8811f913094c968d4fcd09a
+  metadata.gz: '05280c1e438cd48e755e5a943dcb80296ebacec092a3cdd92997141206eeb49e'
+  data.tar.gz: e3c127d77c032834b54dfee874f9c79499b217afa67e61c99b96bca34d355384
 SHA512:
-  metadata.gz: 1ae0851cb8497f852602e3fe26c49f6a1e69e0ba922c44833cf43abe12c186b6d1fec343ac29c3d62c1299c841dda8b0a0782caec8c952885a2fb9c1b0bd4805
-  data.tar.gz: 7ba1a294c60d4d1633e0f136a04d24712f7b01aec7c0702e890b8d7325e0261497897a67fbe55e1a9f63faaec566e70e8f98d52081c75c134bfbd3bd6953077a
+  metadata.gz: 9184262c10bbd7aeec778658d9b267d1fa613dc5065e55bd0f5d3313dbff55dc19e08cb40218eaad9b3a45b4bb583686e67daf810f7f797ccc24b9fa48a5f07d
+  data.tar.gz: fd7d0b9a6ff225f2ff1f9bcac2557ba1146a1f96e8c6478af12198f3bdcb43b3ac3cce7d512b6a66ce6553e7045247607ad24d04fd459cf759b0c44a5920a9fc

data/lib/pindo/client/pgyerclient.rb

@@ -180,7 +180,7 @@ module Pindo
           else
               Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
           end
-
+          puts "token: #{@token}"
           return @token
       end
 
@@ -494,5 +494,38 @@ module Pindo
 
       end
 
+      def post_message(appId:nil, appVersionId:nil, chatEnv: nil, receiveType:nil)
+
+          boss_url = @baseurl + @request_config["send_lark_message"]
+
+          body_params = {
+                appId:appId,
+                appVersionId:appVersionId,
+                chatEnv:chatEnv,
+                receiveType:receiveType
+            }
+
+
+          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/android/debug.rb

@@ -0,0 +1,73 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Android < Command
+      class Debug < Android
+
+        # Android Debug包编译和上传命令
+        self.summary = '编译Android Debug包并支持上传到测试平台'
+
+        # 详细说明
+        self.description = <<-DESC
+            编译Android Debug包并支持上传到测试平台。
+            
+            支持功能:
+
+                * 编译Debug包
+
+                * 上传到测试平台  
+
+                * 发送测试通知
+
+            使用示例:
+
+                $ pindo android debug                    # 编译Debug包
+
+                $ pindo android debug --upload           # 编译并上传
+
+                $ pindo android debug --send             # 编译上传并发送通知
+
+                $ pindo android debug --proj=myapp       # 指定项目名称
+
+        DESC
+
+        # 命令参数
+        self.arguments = [
+          # 暂无参数
+        ]
+
+        # 命令选项
+        def self.options
+          [
+            ['--proj',   '指定上传到测试平台的项目名称'],
+            ['--upload', '上传编译后的apk到测试平台'],
+            ['--send',   '上传成功后发送测试通知']
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @args_adhoc_flag = argv.flag?('adhoc', false)
+          @args_deploy_flag = argv.flag?('deploy', false)
+          @args_macos_flag = argv.flag?('macos', false)
+          @upload_flag = argv.flag?('upload', false)
+          @send_flag = argv.flag?('send', false)
+          @proj_name = argv.option('proj')
+          
+          if @send_flag
+            @upload_flag = true
+          end
+          
+          super
+        end
+
+        def run
+          # TODO: 实现编译和上传逻辑
+          puts "Android Debug包编译和上传命令"
+          
+        end
+
+      end
+    end
+  end
+end

data/lib/pindo/command/android.rb

@@ -0,0 +1,14 @@
+
+
+require 'pindo/command/android/debug'
+
+module Pindo
+  class Command
+    
+    class Android < Command
+      self.abstract_command = true
+      self.summary = 'Android相关命令'
+    end
+
+  end
+end

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

@@ -69,6 +69,8 @@ module Pindo
 
                     args_temp = []
                     args_temp << mainapp_bundleid
+
+
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
                     project_dir = Dir.pwd

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

@@ -53,12 +53,13 @@ module Pindo
                         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,app}")
+                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app,apk}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
 
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 
@@ -74,9 +75,11 @@ module Pindo
                                 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)    

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

@@ -12,22 +12,38 @@ module Pindo
             self.summary = '更新证书并使用新证书设置工程'
     
             self.description = <<-DESC
+                更新证书并使用新证书设置工程。
                 
-                更新证书并使用新证书设置工程,如果在工程目录下执行,会自动给工程设置对应的证书。用法:pindo dev debug  默认使用开发bundle id, 使用dev证书。
-                使用发布相关bundle id 或者adhoc证书，用法如下:pindo dev debug --deploy --adhoc              
-                
+                支持功能:
+
+                    * 自动更新证书
+                    
+                    * 自动设置工程证书
+                    
+                    * 支持开发和发布证书
+                    
+                    * 支持iOS和macOS平台
+
+                使用示例:
+
+                    $ pindo dev debug                    # 使用开发证书
+                    
+                    $ pindo dev debug --deploy           # 使用发布bundle id
+                    
+                    $ pindo dev debug --adhoc           # 使用adhoc证书
+                    
+                    $ pindo dev debug --macos           # 使用macOS证书
             DESC
 
             self.arguments = [
-
+                # 暂无参数
             ]
   
             def self.options
               [
-                ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id'],
-                ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书'],
-                ['--macos', 'macos平台证书'],
-                ['--upload', '生成上传pgyer的证书'],
+                ['--deploy', '使用发布bundle id(默认使用开发bundle id)'],
+                ['--adhoc',  '使用adhoc证书(默认使用dev证书)'],
+                ['--macos',  '使用macOS平台证书'],
               ].concat(super)
             end
 
@@ -35,7 +51,6 @@ module Pindo
               @args_adhoc_flag = argv.flag?('adhoc', false)
               @args_deploy_flag = argv.flag?('deploy', false)
               @args_macos_flag = argv.flag?('macos', false)
-              @upload_flag = argv.flag?('upload', false)
               super 
             end
 
@@ -80,10 +95,6 @@ module Pindo
               if @args_macos_flag
                 args_temp << "--macos"
               end
-
-              if @upload_flag
-                args_temp << "--upload"
-              end
               
               Pindo::Command::Deploy::Cert::run(args_temp)
 
@@ -145,5 +156,4 @@ module Pindo
       end
     end
   end
-end
-  
+end

data/lib/pindo/command/gplay/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 appstore iap --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_download_name = argv.option('download')
+                    
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/itcapp.rb

@@ -0,0 +1,41 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Itcapp < Appstore
+
+
+                self.summary = 'Appstore中创建app'
+
+                self.description = <<-DESC
+                    Appstore中创建app，配置目录下执行：pindo appstore itcapp
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/metadata.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Metadata < Appstore
+
+
+                self.summary = 'Appstore中metadata相关操作'
+
+                self.description = <<-DESC
+                    Appstore中metadata相关操作, 用法:pindo appstre metadata
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore metadata --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/screenshots.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Screenshots < Appstore
+
+
+                self.summary = 'Appstore中screenshots相关操作'
+
+                self.description = <<-DESC
+                    Appstore中screenshots相关操作, 用法:pindo appstre screenshots
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore screenshots --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/upload.rb

@@ -0,0 +1,40 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Upload < Appstore
+
+                self.summary = '上传ipa到appstore'
+
+                self.description = <<-DESC
+                    上传ipa到appstore：pindo appstore upload
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay.rb

@@ -0,0 +1,17 @@
+
+require 'pindo/command/appstore/iap'
+require 'pindo/command/appstore/itcapp'
+require 'pindo/command/appstore/metadata'
+require 'pindo/command/appstore/screenshots'
+require 'pindo/command/appstore/upload'
+
+module Pindo
+  class Command
+    
+    class Appstore < Command
+      self.abstract_command = true
+      self.summary = 'appstore的相关命令'
+    end
+
+  end
+end

data/lib/pindo/command/ios/adhoc.rb

@@ -0,0 +1,190 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+require 'pindo/base/executable'
+
+module Pindo
+    class Command
+        class Ios < Command
+            class Adhoc < Ios
+        
+                include Appselect
+
+                # 命令的简要说明 - 设置开发环境并编译iOS工程
+                self.summary = '设置开发环境并编译iOS工程'
+    
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    设置开发环境并编译iOS工程。
+                    
+                    支持功能:
+
+                        * 自动设置开发环境
+
+                        * 编译打包上传
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo ios adhoc                    # 设置开发环境
+
+                        $ pindo ios adhoc --upload           # 编译并上传
+
+                        $ pindo ios adhoc --send             # 编译并上传并发送通知
+
+                        $ pindo ios adhoc --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令的参数列表
+                self.arguments = [
+
+                ]
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        # 指定上传到蒲公英的项目
+                        ['--proj',   '指定上传到测试平台的项目名称'],
+                        # 上传编译包
+                        ['--upload', '上传编译后的ipa到测试平台'],
+                        # 发送通知
+                        ['--send',   '上传成功后发送测试通知']
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_deploy_flag = argv.flag?('deploy', false)
+                    @args_adhoc_flag = argv.flag?('adhoc', false)  
+                    @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 validate!
+                    
+                    super
+                end
+
+                def run
+                    
+                    mainapp_bundleid= nil
+                    if @args_deploy_flag
+                        mainapp_bundleid = get_selected_deploy_bundleid()
+                    else
+                        mainapp_bundleid = get_selected_dev_bundleid()
+                    end
+
+                    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 = []
+                    args_temp << mainapp_bundleid
+                    Pindo::Command::Deploy::Pullconfig::run(args_temp)
+
+                    project_dir = Dir.pwd
+                    Dir.chdir(project_dir)
+                    config_json_file = File.join(project_dir,"config.json")
+                    Cert::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
+
+                    if File.exist?(File.join(project_dir, "Podfile"))
+                        
+                        args_temp = []
+                        args_temp << config_json_file
+                        Pindo::Command::Lib::Update::run([])
+
+                        begin
+                            if File.exist?(File.join(project_dir, "Podfile.lock"))
+                                FileUtils.rm_rf(File.join(project_dir, "Podfile.lock"))    
+                            end
+                            if File.exist?(File.join(project_dir,"Pods"))
+                                FileUtils.rm_rf(File.join(project_dir, "Pods"))    
+                            end
+                            puts "正在执行pod deintegrate..."
+                            system 'pod deintegrate'
+                            puts "正在执行pod install..."
+                            system 'pod install'
+                        rescue => error
+                            puts(error.to_s)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+                        Dir.chdir(project_dir)
+                        pod_lock_file = File.join(project_dir, "Podfile.lock")
+                        if !File.exist?(pod_lock_file)
+                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
+                        end
+
+                    end
+                    
+
+                    args_temp = []
+                    if @args_adhoc_flag
+                        args_temp << "--adhoc"
+                    else
+                        args_temp << "--dev"
+                    end
+
+                    project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+                    if !project_fullname.nil?
+                        project_obj = Xcodeproj::Project.open(project_fullname)
+                        project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
+                        if !project_build_platform.nil? && project_build_platform.eql?("macosx")
+                            @args_macos_flag = true
+                        end
+                    end
+
+                    if @args_macos_flag
+                        args_temp << "--macos"
+                    end
+
+                    Pindo::Command::Deploy::Cert::run(args_temp)
+
+                    Dir.chdir(project_dir)
+                    Pindo::Command::Deploy::Build::run(args_temp)
+
+
+                    pindo_new_project_dir = Dir.pwd
+                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app}")
+                    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
+                            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
+