pindo 4.6.9

data/lib/pindo/dev/createbuild.rb

@@ -0,0 +1,159 @@
+require 'fileutils'
+require 'match'
+require 'pindo/client/giteeclient'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Createbuild < Dev
+
+            include Appselect
+            include Buildconfighelper
+
+
+            self.summary = '创建工程编译选项'
+    
+            self.description = <<-DESC
+                
+              创建工程编译选项, 用法:pindo dev createbuild，按照提示填写。创建完成之后， 使用pindo dev autobuild编译时可以选择创建好的编译选项
+
+            DESC
+
+            self.arguments = [
+
+            ]
+  
+            def self.options
+              [
+                ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id来重签名, 用法: --deploy'],
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @args_deploy_flag = argv.flag?('deploy', false)
+              super 
+            end
+
+            def validate!
+              super
+
+              @app_type = ask('App的代号(必填): ')
+              help! '需要一个唯一的代号' if @app_type.nil? || @app_type.empty?
+
+              @platform_name = ask('使用的Boss平台名称(必填): ')
+              help! '需要指定Boss平台' if @platform_name.nil? || @platform_name.empty?
+              @git_repo_name = @platform_name
+
+              @app_desc = ask('请填写App代号的描述(可不填): ')
+
+
+
+              @selected_bundleid= nil
+              if @args_deploy_flag
+                @selected_bundleid = get_selected_deploy_bundleid()
+              else
+                @selected_bundleid = get_selected_dev_bundleid()
+              end
+
+              puts "选择使用的bundle id: #{@selected_bundleid}"
+
+            end
+  
+            def run
+
+              @gitee_client = GiteeClient.new(access_token:pindo_single_config.gitee_api_key)
+              pindo_setting_dir = pindo_single_config.pindo_env_configdir
+
+              setting_file = 'dev_build_setting.json'
+              if @args_deploy_flag
+                setting_file = 'deploy_build_setting.json'
+              end
+
+              setting_file_fullname = File.join(pindo_setting_dir, setting_file)
+              setting_file_json = JSON.parse(File.read(setting_file_fullname))
+              if setting_file_json[@app_type]
+                answer = agree("输入的App代号已存，重新创建？(Y/n）:")
+                unless answer
+                  raise Informative, "输入的App代号已存在!!!"
+                end 
+              end
+
+              puts "========================="
+              puts "========================="
+              puts 
+              puts 
+              puts "App的代号: #{@app_type}"
+              puts "Boss平台名称: #{@platform_name}"
+              puts "App选择的bundle id: #{@selected_bundleid}"
+              puts "仓库名称: #{@git_repo_name}"
+              puts "App的描述: #{@app_desc}"
+              puts 
+
+              answer = agree("请确认上面信息是否正确(Y/n）:")
+              unless answer
+                raise Informative, "重新输入 !!!"
+              end 
+
+              args_temp = [@git_repo_name]
+              args_temp << "--test"
+              Pindo::Command::Deploy::Initconfig::run(args_temp)
+
+              modify_build_setting
+              
+              modify_build_config_json
+
+            end
+
+
+            
+            def modify_build_setting
+
+                pindo_setting_dir = clone_pindo_env_config_repo(force_delete:false)
+                setting_file = 'dev_build_setting.json'
+                if @args_deploy_flag
+                  setting_file = 'deploy_build_setting.json'
+                end
+                setting_file_fullname = File.join(pindo_setting_dir, setting_file)
+                setting_file_json = JSON.parse(File.read(setting_file_fullname))
+                setting_file_json[@app_type] = {}
+                setting_file_json[@app_type]['git_repo_name'] = @git_repo_name
+                setting_file_json[@app_type]['build_desc'] = @app_desc
+                setting_file_json = Hash[setting_file_json.sort]
+                File.open(setting_file_fullname, "w") do |f|
+                  f.write(JSON.pretty_generate(setting_file_json))
+                end
+
+                git_addpush_repo(path:pindo_setting_dir, message:"add app_type: #{@app_type}", commit_file_params:[setting_file])
+            end
+
+            def modify_build_config_json
+
+                pindo_dir = pindo_single_config.pindo_dir
+                app_config_dir = File.join(pindo_dir, @git_repo_name)
+
+                selected_config_dir = clong_buildconfig_repo(repo_name: @selected_bundleid)
+                if File.exist?(File.join(selected_config_dir, "config.json"))
+                  FileUtils.cp_r(File.join(selected_config_dir, "config.json"), app_config_dir)
+                end
+
+                app_config_file = File.join(app_config_dir, "config.json")
+                app_config_json = JSON.parse(File.read(app_config_file))
+
+                app_config_json = app_config_json || {}
+                app_config_json["project_info"]["app_type"] = @app_type
+                app_config_json["project_info"]["app_desc"] = @app_desc
+                app_config_json["app_setting"]["kGUKeyAppPlatform"] = @platform_name
+
+                File.open(app_config_file, "w") do |f|
+                  f.write(JSON.pretty_generate(app_config_json))
+                end
+                git_addpush_repo(path:app_config_dir, message:"更新配置")
+            end
+
+           
+
+      end
+    end
+  end
+end
+  

data/lib/pindo/dev/debug.rb

@@ -0,0 +1,141 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Debug < Dev
+        
+            include Appselect
+            
+            include Xcodebuildpre
+
+            self.summary = '更新证书并使用新证书设置工程'
+    
+            self.description = <<-DESC
+                
+                更新证书并使用新证书设置工程,如果在工程目录下执行,会自动给工程设置对应的证书。用法:pindo dev debug  默认使用开发bundle id, 使用dev证书。
+                使用发布相关bundle id 或者adhoc证书，用法如下:pindo dev debug --deploy --adhoc              
+                
+            DESC
+
+            self.arguments = [
+
+            ]
+  
+            def self.options
+              [
+                ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id'],
+                ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书'],
+              ].concat(super)
+            end
+
+            def initialize(argv)
+              @args_adhoc_flag = argv.flag?('adhoc', false)
+              @args_deploy_flag = argv.flag?('deploy', 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
+              puts "选择使用的bundle id: #{mainapp_bundleid}"
+
+              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")
+              Debug::modify_cert_with_project(project_dir:project_dir, config_file:config_json_file)
+
+              args_temp = []
+              if @args_adhoc_flag
+                  args_temp << "--adhoc"
+              else
+                  args_temp << "--dev"
+              end
+
+              Pindo::Command::Deploy::Cert::run(args_temp)
+
+            end
+
+            def self.modify_cert_with_project(project_dir:nil, config_file:nil)
+
+
+              project_fullname = ""
+              Dir.foreach(project_dir) do |file|  
+                  if file =~ /(.*).xcodeproj/
+                      project_fullname = file
+                      break;
+                  end
+              end 
+
+              if !project_fullname.nil?
+                  proj_name = File.basename(project_fullname, ".xcodeproj")
+
+                    entitlements_plist_path = File.join(project_dir, proj_name + ".entitlements")
+                    proj_fullname = File.join(project_dir, proj_name) + ".xcodeproj"
+                    if File.exist?(proj_fullname)
+                        project_obj = Xcodeproj::Project.open(proj_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
+                        end
+                    end
+
+                    # puts entitlements_plist_path
+                    if 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
+
+              end
+
+
+            end
+
+
+      end
+    end
+  end
+end
+  

data/lib/pindo/dev/pub.rb

@@ -0,0 +1,171 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Pub < Dev
+
+          self.summary = '发布代码,添加tag,添加发布信息,并合并到发布分支'
+
+          self.description = <<-DESC
+              发布代码,添加tag,添加发布信息,并合并到发布分支。用法：在当前代码仓库下执行pindo dev pub
+          DESC
+
+          self.arguments = [
+
+          ]
+
+          def self.options
+            [
+            ].concat(super)
+            end
+
+            def initialize(argv)
+
+                super
+                @additional_args = argv.remainder!
+            end
+
+          def run
+
+              release_branch = "master"
+              current_project_dir = Dir.pwd
+
+              process_need_add_files(project_dir:current_project_dir)
+
+              answer = agree("是否添加发布备注信息?(Y/n)")
+              if answer
+                add_release_info(project_dir:current_project_dir)
+              end
+              
+              answer = agree("是否将代码合并到master分支?(Y/n)")
+
+              if answer
+                  current_branch = git!(%W(-C #{current_project_dir} rev-parse --abbrev-ref HEAD)).strip
+                  coding_branch = current_branch
+                  merge_to_release_branch(project_dir:current_project_dir, release_branch:release_branch, coding_branch:coding_branch)
+                  add_release_tag(project_dir:current_project_dir)
+              end
+   
+
+          end
+
+          def add_release_info(project_dir:nil)
+              
+              puts 
+              puts "输入Release 备注:"
+              description = PgyerHelper.share_instace.get_description()
+              File.open("#{project_dir}/.release_info", 'w') { |f| f.write(description) }
+              git_addpush_repo(path:project_dir, message:"update release info", commit_file_params:[".release_info"])           
+
+          end
+
+          def add_release_tag(project_dir:nil)
+
+              time_str =  Time.now.strftime('%Y_%m_%d')
+              tag_name = "dev_" + time_str
+              remove_tag(local_repo_dir:project_dir, tag_name:tag_name)
+              result = add_tag(local_repo_dir:project_dir, tag_name:tag_name)
+
+              puts
+              puts "已经为当前仓库添加tag: #{tag_name}"
+              puts "仓库路径:#{project_dir}"
+              puts
+
+          end
+
+
+          def merge_to_release_branch(project_dir:nil, release_branch:nil, coding_branch:nil)
+
+                current_project_dir = project_dir
+
+
+                if !coding_branch.eql?(release_branch)
+
+                    coding_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{coding_branch})).strip
+                    release_branch_commit_id = "111"
+                      
+                      if remote_branch_exists?(local_repo_dir: current_project_dir, branch:release_branch)
+                            if local_branch_exists?(local_repo_dir: current_project_dir, branch:release_branch)
+                                puts "存在#{release_branch}远程分支"
+                                puts "存在#{release_branch}本地分支"
+                                git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+                            else
+                                puts "存在#{release_branch}远程分支"
+                                puts "不存在#{release_branch}本地分支"
+                                git!(%W(-C #{current_project_dir} checkout -b #{release_branch} origin/#{release_branch}))
+                            end
+
+                            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+                            git!(%W(-C #{current_project_dir} pull))
+                            # git!(%W(-C #{current_project_dir} merge #{coding_branch} --quiet))
+                            res_data = Executable.capture_command('git', %W(merge #{coding_branch}), :capture => :out)
+
+                            conflict_filelist = git!(%W(-C #{current_project_dir} diff --name-only --diff-filter=U --relative))
+                            if !conflict_filelist.nil? && conflict_filelist.size > 0
+                                puts "合并代码冲突， 冲突文件如下："
+
+                                raise Informative, "请手动处理冲突的文件！！！"
+
+                            else
+                                git!(%W(-C #{current_project_dir} push))
+
+
+                                puts ""
+                                puts "===================================="
+                                puts "代码已经合并到#{release_branch}分支"
+                                puts "===================================="
+                                puts ""
+                                release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+                            end
+
+                      else
+                            if local_branch_exists?(local_repo_dir: current_project_dir, branch:release_branch)
+                                puts "不存在#{release_branch}远程分支"
+                                puts "存在#{release_branch}本地分支"
+                                git!(%W(-C #{current_project_dir} checkout #{release_branch}))
+                                git!(%W(-C #{current_project_dir} checkout -b #{release_branch}_temp))
+                                git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+                                git!(%W(-C #{current_project_dir} branch -D #{release_branch}))
+                            else
+                                puts "不存在#{release_branch}远程分支"
+                                puts "不存在#{release_branch}本地分支"
+                            end
+
+                            git!(%W(-C #{current_project_dir} checkout -b #{release_branch}))
+                            git!(%W(-C #{current_project_dir} push origin #{release_branch}))
+                            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{release_branch} #{release_branch}))
+
+
+                            puts ""
+                            puts "===================================="
+                            puts "代码已经合并到#{release_branch}分支"
+                            puts "===================================="
+                            puts ""
+                            release_branch_commit_id = git!(%W(-C #{current_project_dir} rev-parse #{release_branch})).strip
+                      end
+
+
+                      git!(%W(-C #{current_project_dir} checkout #{coding_branch}))
+                      if !release_branch_commit_id.eql?(coding_branch_commit_id)
+                          git!(%W(-C #{current_project_dir} merge #{release_branch}))
+                          puts
+                          puts "已将#{release_branch}合并到#{coding_branch}"
+                          puts
+                      end
+
+                else
+                            puts ""
+                            puts "===================================="
+                            puts "代码处于#{coding_branch}分支,无需合并"
+                            puts "===================================="
+                            puts ""
+                end
+
+          end
+
+
+      end
+    end
+  end
+end

data/lib/pindo/dev/renewcert.rb

@@ -0,0 +1,142 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Renewcert < Dev
+        
+            include Appselect
+
+            self.summary = '更新证书下所有的Provisioning Profile文件'
+    
+            self.description = <<-DESC
+                如果不存在证书,会自动生成新证书，重新生成证书下所有Provisioning Profile文件. 添加新设备或者证书过期时使用, 一般情况请勿操作！！！
+                用法：pindo dev renewcert 
+            DESC
+
+            self.arguments = [
+
+            ]
+  
+              def self.options
+              [
+
+                ['--fast', '快速更新证书，开发用bundle id只更新dev证书，发布bundle id只更新adhoc证书'],
+                ['--fixedid', '重新更新bundle id的功能，检查bundle id的功能是否更新'],
+              ].concat(super)
+            end
+
+
+            def initialize(argv)
+
+              @fast_flag = argv.flag?('fast', false)
+              @fixedid_flag = argv.flag?('fixedid', false)
+              
+              super 
+
+            end
+
+
+            def run
+
+              auto_fixed_cert
+              
+            end
+
+            def auto_fixed_cert
+
+
+                @dev_bundle_id_array = all_dev_bundleid() + all_tool_bundleid()
+                @deploy_bundle_id_array = all_release_bundleid()
+                @all_bundle_id_array = all_itc_bundleid()
+
+
+                fixed_bundleid = @fixedid_flag
+
+
+                fixed_bundleid_array = @all_bundle_id_array
+                puts fixed_bundleid_array
+
+                fixed_bundleid_array.each do |bundle_id|
+                    begin
+                      fixed_cert(bundle_id:bundle_id, fixed_bundleid:@fixedid_flag)
+                    rescue => err
+                        puts 
+                        puts 
+                        puts "Fixed #{bundle_id} cert---------Error-------!!!"
+                        puts 
+                        puts 
+                    end
+
+                end
+
+            end
+
+            def fixed_cert(bundle_id:nil, fixed_bundleid: )
+                puts "#{bundle_id}"
+
+                args_temp = []
+                args_temp << "#{bundle_id}"
+
+                Pindo::Command::Deploy::Pullconfig::run(args_temp)
+
+                if fixed_bundleid
+                    Pindo::Command::Deploy::Bundleid::run([])    
+                end
+
+                if @fast_flag
+
+                    if @dev_bundle_id_array.include?(bundle_id)
+                        args_temp = []
+                        args_temp << "--a=#{bundle_id}"
+                        args_temp << "--dev"
+                        args_temp << "--renew"
+                        Pindo::Command::Deploy::Cert::run(args_temp)
+                    end
+
+                    if @deploy_bundle_id_array.include?(bundle_id)
+                        args_temp = []
+                        args_temp << "--a=#{bundle_id}"
+                        args_temp << "--adhoc"
+                        args_temp << "--renew"
+                        Pindo::Command::Deploy::Cert::run(args_temp)
+                    end
+
+                else
+
+                    # args_temp = []
+                    # args_temp << "--a=#{bundle_id}"
+                    # args_temp << "--dev"
+                    # args_temp << "--renew"
+                    # Pindo::Command::Deploy::Cert::run(args_temp)
+
+                    args_temp = []
+                    args_temp << "--a=#{bundle_id}"
+                    args_temp << "--adhoc"
+                    args_temp << "--renew"
+                    Pindo::Command::Deploy::Cert::run(args_temp)
+                end
+            end
+
+
+            def fixed_push(bundle_id:nil, fixed_bundleid: false)
+                
+                Pindo::Command::Deploy::Pullconfig::run(args_temp)
+
+                args_temp = []
+                args_temp << "--a=#{bundle_id}"
+                args_temp << "--dev"
+                Pindo::Command::Deploy::Pem::run(args_temp)
+
+                args_temp = []
+                args_temp << "--a=#{bundle_id}"
+                args_temp << "--adhoc"
+                Pindo::Command::Deploy::Pem::run(args_temp)
+
+            end
+
+      end
+    end
+  end
+end
+  

data/lib/pindo/dev.rb

@@ -0,0 +1,23 @@
+# require 'pindo/dev/create'
+
+
+# require 'pindo/dev/confuseproj'
+# require 'pindo/dev/confusecode'
+# require 'pindo/dev/cert'
+require 'pindo/dev/pub'
+require 'pindo/dev/debug'
+require 'pindo/dev/autoresign'
+require 'pindo/dev/autobuild'
+require 'pindo/dev/renewcert'
+require 'pindo/dev/createbuild'
+
+module Pindo
+    class Command
+        
+        class Dev < Command
+        self.abstract_command = true
+        self.summary = '开发阶段使用的相关命令'
+        end
+        
+    end
+end

data/lib/pindo/env/dreamstudio.rb

@@ -0,0 +1,53 @@
+
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Env < Command
+            class Dreamstudio < Env
+        
+                self.summary = '切换到 dreamstudio 环境'
+  
+                self.description = <<-DESC
+                    切换到 dreamstudio 环境,终端下运行: pindo env dreamstudio
+                DESC
+        
+
+                self.arguments = [
+
+                  ]
+          
+                def self.options
+                  [
+        
+                  ].concat(super)
+                end
+        
+                def initialize(argv)
+                    super(argv)
+                    @additional_args = argv.remainder!
+                end
+        
+                def validate!
+                    super
+                end
+        
+                def run
+                    
+                    clone_pindo_common_config_repo(force_delete:false)
+
+                    pindo_single_config.update_pindo_env(env_name:"dreamstudio_config")
+                    Pindoconfig.reload_instance
+
+                    pindo_env_dir = pindo_single_config.pindo_env_configdir
+                    if File.exist?(pindo_env_dir)
+                        FileUtils.rm_rf(pindo_env_dir)
+                    end  
+                    clone_pindo_env_config_repo(force_delete:true)
+
+                end
+                
+            end
+        end
+    end
+end