pindo 4.9.2 → 4.9.4

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

@@ -0,0 +1,210 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+require 'pindo/base/executable'
+require 'pindo/module/build/buildhelper'
+
+module Pindo
+    class Command
+        class Ios < Command
+            class Autobuild < Ios
+        
+                include Appselect
+                # 命令的简要说明 - 打包iOS工程并发布到蒲公英
+                self.summary = '打包iOS工程并发布到蒲公英'
+    
+                # 命令的详细说明,包含用法示例
+                self.description = <<-DESC
+                    编译iOS Debug包并支持上传到测试平台。
+                    
+                    支持功能:
+
+                        * 编译Debug包
+
+                        * 上传到测试平台  
+
+                        * 发送测试通知
+
+                    使用示例:
+
+                        $ pindo ios autobuild                    # 编译Debug包
+
+                        $ pindo ios autobuild --upload           # 编译并上传
+
+                        $ pindo ios autobuild --send             # 编译上传并发送通知
+
+                        $ pindo ios autobuild --proj=myapp       # 指定项目名称
+                DESC
+
+                # 命令的参数列表
+                self.arguments = [
+                    # 暂无参数
+                ]
+
+                # 命令的选项列表
+                def self.options
+                    [
+                        ['--bundleid', '指定打包的bundleID'],
+                        # 指定上传到蒲公英的项目
+                        ['--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')  
+                    @args_bundle_id = argv.option('bundleid')
+
+                    if @args_send_flag
+                        @args_upload_flag = true
+                    end
+
+                    super
+                    @additional_args = argv.remainder!
+                end
+
+                def validate!
+                    
+                    super
+                end
+
+                def run
+                    
+                    pindo_unity_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
+                    unless build_helper.ios_project?(pindo_unity_project_dir)
+                        raise Informative, "当前目录不是iOS工程，请在iOS工程根目录下执行此命令"
+                    end
+
+                    if @args_upload_flag
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        if is_need_add_tag
+                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                        end
+                    end
+
+
+                    mainapp_bundleid= nil
+                    if @args_bundle_id
+                        mainapp_bundleid = @args_bundle_id
+                    else
+                        if @args_deploy_flag
+                            mainapp_bundleid = get_selected_deploy_bundleid()
+                        else
+                            mainapp_bundleid = get_selected_dev_bundleid()
+                        end
+                    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")
+                    Pindo::Command::Ios::Debug::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
+  

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

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'json'
 require 'xcodeproj'
 require 'gym'
+require 'pindo/module/build/buildhelper'
 
 module Pindo
     class Command
@@ -64,6 +65,19 @@ module Pindo
 
                 def run
 
+                    pindo_unity_project_dir = Dir.pwd
+                    build_helper = Pindo::BuildHelper.share_instance
+                    unless build_helper.ios_project?(pindo_unity_project_dir)
+                        raise Informative, "当前目录不是iOS工程，请在iOS工程根目录下执行此命令"
+                    end
+
+                    if @args_upload_flag
+                        is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_unity_project_dir)
+                        if is_need_add_tag
+                            Pindo::Command::Dev::Tag::run(tag_action_parms) 
+                        end
+                    end
+
                     
                     app_info_obj = nil
                     if @args_upload_flag 

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

@@ -1,195 +1,164 @@
-require 'highline/import'
-require 'xcodeproj'
-require 'find'  
 require 'fileutils'
-require 'pindo/base/executable'
 
 module Pindo
-    class Command
-        class Ios < Command
-            class Debug < Ios
+  class Command
+    class Ios < Command
+      class Debug < Ios
         
-                include Appselect
-                # 命令的简要说明 - 打包iOS工程并发布到蒲公英
-                self.summary = '打包iOS工程并发布到蒲公英'
-    
-                # 命令的详细说明,包含用法示例
-                self.description = <<-DESC
-                    编译iOS Debug包并支持上传到测试平台。
-                    
-                    支持功能:
-
-                        * 编译Debug包
-
-                        * 上传到测试平台  
-
-                        * 发送测试通知
-
-                    使用示例:
-
-                        $ pindo ios debug                    # 编译Debug包
-
-                        $ pindo ios debug --upload           # 编译并上传
-
-                        $ pindo ios debug --send             # 编译上传并发送通知
-
-                        $ pindo ios debug --proj=myapp       # 指定项目名称
-                DESC
-
-                # 命令的参数列表
-                self.arguments = [
-                    # 暂无参数
-                ]
-
-                # 命令的选项列表
-                def self.options
-                    [
-                        ['--bundleid', '指定打包的bundleID'],
-                        # 指定上传到蒲公英的项目
-                        ['--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')  
-                    @args_bundle_id = argv.option('bundleid')
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
+            include Appselect
+            
+            include XcodeCertHelper
+            self.summary = '更新iOS证书并使用新证书设置Xcode工程'
+            self.description = <<-DESC
+                更新iOS证书并使用新证书设置Xcode工程。
+                
+                支持功能:
 
-                    super
-                    @additional_args = argv.remainder!
-                end
-
-                def validate!
-                    
-                    super
-                end
-
-                def run
-                    
-                    mainapp_bundleid= nil
-                    if @args_bundle_id
-                        mainapp_bundleid = @args_bundle_id
-                    else
-                        if @args_deploy_flag
-                            mainapp_bundleid = get_selected_deploy_bundleid()
-                        else
-                            mainapp_bundleid = get_selected_dev_bundleid()
-                        end
-                    end
+                    * 更新iOS证书
 
-                    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
+                    * 设置Xcode工程证书
 
-                    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([])
+                    $ pindo ios debug                    # 更新开发证书
 
-                        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
+                    $ pindo ios debug --deploy           # 更新发布bundle id
 
-                        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
+                    $ pindo ios debug --adhoc            # 更新adhoc证书
 
-                    end
-                    
+                    $ pindo ios debug --macos            # 更新macos平台证书
 
-                    args_temp = []
-                    if @args_adhoc_flag
-                        args_temp << "--adhoc"
-                    else
-                        args_temp << "--dev"
-                    end
+            DESC
 
-                    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
+            self.arguments = [
 
-                    if @args_macos_flag
-                        args_temp << "--macos"
-                    end
+            ]
+  
+            # 命令选项
+            def self.options
+              [
+                ['--deploy', '默认使用开发环境的bundle id,使用此选项切换为发布环境的bundle id'],
+                ['--adhoc', '默认使用开发证书,使用此选项切换为adhoc证书'],
+                ['--macos', '指定为macOS平台的证书'],
+                ['--upload', '生成用于上传到蒲公英平台的证书'],
+              ].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)
+              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
+
+              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")
+              Pindo::Command::Ios::Debug::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
 
-                    Pindo::Command::Deploy::Cert::run(args_temp)
+              args_temp = []
+              if @args_adhoc_flag
+                  args_temp << "--adhoc"
+              else
+                  args_temp << "--dev"
+              end
 
-                    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)}
+              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 !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
+              if @args_macos_flag
+                args_temp << "--macos"
+              end
+
+              if @upload_flag
+                args_temp << "--upload"
+              end
+              
+              Pindo::Command::Deploy::Cert::run(args_temp)
+
+            end
+
+            def self.modify_cert_with_project(project_dir:nil, config_file:nil)
+
+              project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+              if !project_fullname.nil?
+
+                    entitlements_plist_path = nil
+                    project_obj = Xcodeproj::Project.open(project_fullname)
+                    project_obj.targets.each do |target|
+                        if target.product_type.to_s.eql?("com.apple.product-type.application") then
+                            temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
+                            if !temp_entitlements_file.nil? && !temp_entitlements_file.empty?
+                              entitlements_plist_path = File.join(project_dir, temp_entitlements_file)
                             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
+
+                    # puts entitlements_plist_path
+                    if !entitlements_plist_path.nil? && File.exist?(entitlements_plist_path)
+                        config_json = nil
+                        if File.exist?(config_file)
+                            config_json = JSON.parse(File.read(config_file))
+                        end
+
+                        entitlements_plist_dict = Xcodeproj::Plist.read_from_path(entitlements_plist_path)
+
+                        if entitlements_plist_dict["com.apple.developer.icloud-container-identifiers"].nil?
+                            if !config_json.nil? && !config_json["app_info"]['app_icloud_id'].nil?
+                              config_json["app_info"].delete('app_icloud_id')
                             end
                         end
+
+                        if entitlements_plist_dict["com.apple.security.application-groups"].nil?
+                            if !config_json.nil? && !config_json["app_info"]['app_group_id'].nil?
+                              config_json["app_info"].delete('app_group_id')
+                            end
+                        end
+
+                        # puts JSON.pretty_generate(config_json)
+                        if !config_json.nil?
+                            File.open(config_file, "w") do |f|
+                              f.write(JSON.pretty_generate(config_json))
+                            end
+                          
+                        end
+
                     end
-                    
-                    system "open #{project_dir}"
 
-                end
+              end
+
 
             end
-        end
+
+
+      end
     end
+  end
 end
   

data/lib/pindo/command/ios.rb

@@ -1,7 +1,7 @@
 
-require 'pindo/command/ios/cert'
-require 'pindo/command/ios/build'
 require 'pindo/command/ios/debug'
+require 'pindo/command/ios/build'
+require 'pindo/command/ios/autobuild'
 require 'pindo/command/ios/adhoc'
 require 'pindo/command/ios/autoresign'
 require 'pindo/command/ios/applovin'

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

@@ -199,7 +199,7 @@ module Pindo
                         applovin_args = []
                         applovin_args << "--appstore"
                         applovin_args << "--install"
-                        Pindo::Command::Dev::Applovin::run(applovin_args)
+                        Pindo::Command::Ios::Applovin::run(applovin_args)
                     end
 
                     if @build_flag

data/lib/pindo/command/pgyer/apptest.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -9,11 +7,27 @@ module Pindo
         class Pgyer < Command
             class Apptest < Pgyer
 
-
                 self.summary = '获取pgyer中指定app的测试链接和二维码'
 
                 self.description = <<-DESC
-                  获取pgyer中指定app的测试链接和二维码，终端运行：pindo pgyer apptest
+                    获取pgyer中指定app的测试链接和二维码。
+
+                    支持功能:
+
+                        * 获取app测试链接
+                        * 获取app二维码
+                        * 发送测试信息
+                        * 查看历史版本
+
+                    使用示例:
+
+                        $ pindo pgyer apptest                    # 获取当前目录项目的测试链接
+                        
+                        $ pindo pgyer apptest --proj=demo       # 获取指定项目的测试链接
+                        
+                        $ pindo pgyer apptest --list            # 列出历史版本供选择
+                        
+                        $ pindo pgyer apptest --send            # 发送测试信息
                 DESC
 
                 self.arguments = [
@@ -29,7 +43,6 @@ module Pindo
                   ].concat(super)
                 end
 
-
                 def initialize(argv)
 
                     @args_login_flag = argv.flag?('login', false)
@@ -55,7 +68,6 @@ module Pindo
                         raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， pgyer网站没有该App"
                     end
 
-
                     if !app_info_obj.nil?
 
                         version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
@@ -79,7 +91,6 @@ module Pindo
 
                 end
 
-
             end
         end
     end

data/lib/pindo/command/pgyer/comment.rb

@@ -1,5 +1,3 @@
-
-
 require 'highline/import'
 require 'fileutils'
 require 'pindo/module/pgyer/pgyerhelper'
@@ -13,7 +11,21 @@ module Pindo
                 self.summary = '修改pgyer中已经上传安装包的备注信息'
 
                 self.description = <<-DESC
-                  修改pgyer中已经上传安装包的备注信息，终端运行：pindo pgyer apptest
+                修改pgyer中已经上传安装包的备注信息。
+                
+                支持功能:
+
+                    * 修改版本备注
+                    * 查看历史版本
+                    * 选择指定版本
+
+                使用示例:
+
+                        $ pindo pgyer comment                    # 修改当前目录项目的最新版本备注
+                        
+                        $ pindo pgyer comment --proj=demo       # 修改指定项目的版本备注
+                        
+                        $ pindo pgyer comment --list            # 列出历史版本供选择修改
                 DESC
 
                 self.arguments = [