pindo 4.6.9

data/lib/pindo/deploy/resign.rb

@@ -0,0 +1,338 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+require 'sigh'
+require 'zip'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Resign < Deploy
+        
+                
+                extend Plistbuddyexecutable
+                plistbuddyexecutable :plistbuddy
+
+                extend Executable
+                executable :security
+
+                include Command::DeployOptions
+                
+                self.summary = '重签名ipa'
+
+                self.description = <<-DESC
+                    重签名ipa.
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def self.options
+                    [
+                      ['--ipa=', 'iap file name.']
+                    ].concat(super)
+                  end
+
+                def initialize(argv)
+                    
+                    @ipa_file_name = argv.option('ipa')
+                    super 
+                    
+
+                    @build_type = "appstore"
+                    if  @args_adhoc_flag
+                      @build_type = "adhoc"
+                    end
+                    if  @args_dev_flag
+                      @build_type = "development"
+                    end
+
+                end
+
+                def run
+
+
+                    args_temp = []
+                    args = get_build_type_args()
+                    args_temp = args_temp | args
+
+
+                    Pindo::Command::Deploy::Cert::run(args_temp)
+
+                    if @ipa_file_name
+                        new_ipa_filename = File.expand_path(@ipa_file_name)
+                    else
+                        current_dir = Dir.pwd
+                                new_project_fullname = ""
+                                Dir.foreach(current_dir) do |file|  
+                                    if file =~ /(.*).ipa/
+                                        new_ipa_filename = File.join(current_dir, file)
+                                        break;
+                                    end
+                                end 
+                        end
+                    if new_ipa_filename && new_ipa_filename != "" then
+                        resign_ipa_name = get_resign_ipa_name(ipa_name: new_ipa_filename)
+                        sign_ipa_with_new_cert(ipa_name: resign_ipa_name)
+                    end
+
+
+                end
+
+                def modify_ipa_info_plist(modify_content_path: nil)
+
+
+                    main_info_plist = File.join(modify_content_path, "Info.plist")
+                    puts main_info_plist
+                    
+                    if !File.exist?("/usr/local/bin/PlistBuddy")
+                        command = 'ln -s /usr/libexec/PlistBuddy /usr/local/bin/PlistBuddy'
+                        system command
+                    end                
+                    
+                    old_bundle_id_command = '/usr/local/bin/PlistBuddy -c "Print :CFBundleIdentifier" ' +main_info_plist
+                    puts old_bundle_id_command
+                    old_bundle_id = ""
+                    IO.popen(old_bundle_id_command) { |f| old_bundle_id = f.gets }
+                    puts old_bundle_id
+
+
+                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + @bundle_id + '" ' +  main_info_plist
+                    puts exchange_bundleid_command
+                    system exchange_bundleid_command
+
+                    plugin_path = File.join(modify_content_path, "PlugIns")
+                    if File.exist?(plugin_path)
+                        Dir.foreach(plugin_path) do |file|  
+                            if file =~ /(.*).appex/
+                                
+                                appex_path = File.join(plugin_path, file);
+                                tmp_info_plist = File.join(appex_path, "Info.plist");
+
+                                old_bundle_id_command = '/usr/local/bin/PlistBuddy -c "Print :CFBundleIdentifier" ' +tmp_info_plist
+                                puts old_bundle_id_command
+                                old_plugin_bundle_id = ""
+                                IO.popen(old_bundle_id_command) { |f| old_plugin_bundle_id = f.gets }
+                                puts old_plugin_bundle_id
+
+                                puts "puts old_bundle_id = #{old_plugin_bundle_id}"
+                                if old_plugin_bundle_id.include?(".content")
+                                    new_plugin_bundle_id = @bundle_id + ".content"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".service")
+                                    new_plugin_bundle_id = @bundle_id + ".service"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".imessage")
+                                    new_plugin_bundle_id = @bundle_id + ".imessage"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".keyboard")
+                                    new_plugin_bundle_id = @bundle_id + ".keyboard"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".siri")
+                                    new_plugin_bundle_id = @bundle_id + ".siri"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".widget")
+                                    new_plugin_bundle_id = @bundle_id + ".widget"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".siriui")
+                                    new_plugin_bundle_id = @bundle_id + ".siriui"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+
+                                if old_plugin_bundle_id.include?(".extension")
+                                    new_plugin_bundle_id = @bundle_id + ".extension"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".extensionad")
+                                    new_plugin_bundle_id = @bundle_id + ".extensionad"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+
+                                if old_plugin_bundle_id.include?(".extensionporn")
+                                    new_plugin_bundle_id = @bundle_id + ".extensionporn"
+                                    exchange_bundleid_command = '/usr/local/bin/PlistBuddy -c "Set :CFBundleIdentifier ' + new_plugin_bundle_id + '" ' +  tmp_info_plist
+                                    puts exchange_bundleid_command
+                                    system exchange_bundleid_command
+                                end
+                  
+
+                            end
+                        end
+                        
+                    end
+
+                end
+
+                def get_resign_ipa_name(ipa_name: nil)
+                    
+                    ipa_base_name = File.basename(ipa_name, ".ipa")
+                    ipa_dir = File.dirname(ipa_name)
+        
+                    resign_ipa_name =  ipa_base_name + "_resigned.ipa"
+                    resign_ipa_full_name = File.join(ipa_dir, resign_ipa_name)
+                    FileUtils.cp_r(ipa_name, resign_ipa_full_name)
+                    puts resign_ipa_full_name
+
+                    tmp_time = "tmp_" +Time.now.strftime('%y%m%d_%H%M%S')
+                    tmp_dir = File.join(ipa_dir, tmp_time)
+                    if !File.exist?(tmp_dir)
+                        FileUtils.mkdir(tmp_dir) 
+                    end
+
+                    command = "unzip -q \"#{resign_ipa_full_name}\" -d #{tmp_dir}"
+
+                    puts command
+                    system command
+
+                    payload_path = File.join(tmp_dir, "Payload")
+                    if File.exist?(payload_path)
+                        FileUtils.rm_rf(resign_ipa_full_name)
+                    end
+
+                    
+                    modify_content_path = ""
+                    Dir.foreach(payload_path) do |file|  
+                        if file =~ /(.*).app/
+                            modify_content_path = File.join(payload_path, file);
+                            break;
+                        end
+                    end
+
+                    modify_ipa_info_plist(modify_content_path:modify_content_path)
+
+                    current_dir = Dir.pwd
+                    if File.exist?(payload_path)
+                        Dir.chdir(tmp_dir)
+                        command = "zip -qry \"#{resign_ipa_full_name}\" * "
+                        puts command
+                        system command
+                        Dir.chdir(current_dir)
+                    end
+
+                    if File.exist?(resign_ipa_full_name)
+                        FileUtils.rm_rf(tmp_dir)
+                    end
+
+                    return resign_ipa_full_name
+                end 
+
+                def sign_ipa_with_new_cert(ipa_name: nil)
+
+                    bundle_id_dict = pindo_single_config.get_cert_info
+                    bundle_id_signing_identity = bundle_id_dict["bundle_id_cert_common_name"]
+                    puts "bundle_id_signing_identity : #{bundle_id_signing_identity}"
+
+                    profile_dict = resign_profile_dict()
+
+                    puts 
+                    puts "profile_dict :"
+                    puts
+                    puts profile_dict
+
+                
+                    # resign(ipa, signing_identity, provisioning_profiles, entitlements, ççç, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path)
+
+                    Sigh::Resign.resign(ipa_name, bundle_id_signing_identity, profile_dict, nil, nil, nil, nil, nil, @bundle_id, true, nil)
+             
+                end
+
+
+                def extract_zip(file, destination)
+                    FileUtils.mkdir_p(destination)
+                    Zip::File.open(file) do |zip_file|
+                      zip_file.each do |f|
+                        fpath = File.join(destination, f.name)
+                        zip_file.extract(f, fpath) unless File.exist?(fpath)
+                      end
+                    end
+                end
+
+                def resign_profile_dict
+
+                    bundle_id_dict = pindo_single_config.get_cert_info
+
+                    resign_dict = {}
+                    resign_dict[@bundle_id] = bundle_id_dict['bundle_id']['bundle_id_profile_path']
+
+                    if @bundle_id_pushcontent then
+                        resign_dict[@bundle_id_pushcontent] = bundle_id_dict['bundle_id_pushcontent']['bundle_id_pushcontent_profile_path']
+                    end
+                    
+                    if @bundle_id_pushservice then
+                        resign_dict[@bundle_id_pushservice] = bundle_id_dict['bundle_id_pushservice']['bundle_id_pushservice_profile_path']
+                    end
+
+                    if @bundle_id_keyboard then
+                        resign_dict[@bundle_id_keyboard] = bundle_id_dict['bundle_id_keyboard']['bundle_id_keyboard_profile_path']
+                    end
+
+                    if @bundle_id_imessage then
+                        resign_dict[@bundle_id_imessage] = bundle_id_dict['bundle_id_imessage']['bundle_id_imessage_profile_path']
+                    end
+
+                    if @bundle_id_siri then
+                        resign_dict[@bundle_id_siri] = bundle_id_dict['bundle_id_siri']['bundle_id_siri_profile_path']
+                    end
+
+                    if @bundle_id_siriui then
+                        resign_dict[@bundle_id_siriui] = bundle_id_dict['bundle_id_siriui']['bundle_id_siriui_profile_path']
+                    end
+
+                    if @bundle_id_widget then
+                        resign_dict[@bundle_id_widget] = bundle_id_dict['bundle_id_widget']['bundle_id_widget_profile_path']
+                    end
+
+                    if @bundle_id_extension then
+                        resign_dict[@bundle_id_extension] = bundle_id_dict['bundle_id_extension']['bundle_id_extension_profile_path']
+                    end
+
+                    if @bundle_id_extensionad then
+                        resign_dict[@bundle_id_extensionad] = bundle_id_dict['bundle_id_extensionad']['bundle_id_extensionad_profile_path']
+                    end
+
+                    if @bundle_id_extensionpron then
+                        resign_dict[@bundle_id_extensionpron] = bundle_id_dict['bundle_id_extensionpron']['bundle_id_extensionpron_profile_path']
+                    end
+
+                    return resign_dict
+                    
+                  end
+
+            end
+        end
+    end
+end

data/lib/pindo/deploy/tag.rb

@@ -0,0 +1,108 @@
+
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Deploy < Command
+      class Tag < Deploy
+        
+
+        include Command::DeployOptions
+
+        self.summary = '发布完成创建tag'
+
+        self.description = <<-DESC
+          发布完成创建tag
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('path/to/config.json', true),
+        ]
+
+        def self.options
+          [
+            ['--d', '删除当前tag']
+          ].concat(super)
+        end
+
+          def initialize(argv)
+            @delete_tag_name = argv.option('d')
+            super
+          end
+
+        def run
+
+            pindo_new_project_dir = Dir.pwd
+            pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
+            app_config_dir = File.join(pindo_dir, @deploy_identifier)
+
+
+            if !@delete_tag_name.nil? 
+                result = remove_tag(local_repo_dir:pindo_new_project_dir, tag_name:@delete_tag_name)
+                if result
+                  puts
+                  puts "代码仓库路径#{pindo_new_project_dir}"
+                  puts "已删除tag : #{@delete_tag_name}"
+                  puts
+                  puts
+                end
+
+               result = remove_tag(local_repo_dir:app_config_dir, tag_name:@delete_tag_name)
+                if result
+                  puts
+                  puts "配置仓库路径#{app_config_dir}"
+                  puts "已删除tag : #{@delete_tag_name}"
+                  puts
+                  puts
+                end
+            end
+
+
+            time_str =  Time.now.strftime('%y%m%d') + "_"
+            if @config_json && @config_json["app_info"] && @config_json["app_info"]["app_version"]
+              temp_version = @config_json["app_info"]["app_version"]
+            end 
+            tag_name = "ios_release_" + temp_version
+            puts tag_name
+
+            remove_tag(local_repo_dir:pindo_new_project_dir, tag_name:tag_name)
+            result = add_tag(local_repo_dir:pindo_new_project_dir, tag_name:tag_name)
+            if result
+              puts
+              puts "代码仓库路径#{pindo_new_project_dir}"
+              puts "已添加tag : #{tag_name}"
+              puts
+              puts
+            end
+
+            remove_tag(local_repo_dir:app_config_dir, tag_name:tag_name)
+            result = add_tag(local_repo_dir:app_config_dir, tag_name:tag_name)
+
+            if result
+              puts
+              puts "配置仓库路径#{app_config_dir}"
+              puts "已添加tag : #{tag_name}"
+              puts
+              puts
+            end
+
+            # branch_name = "branch_"  + temp_version
+            # puts branch_name
+
+            # add_branch(local_repo_dir: pindo_new_project_dir, branch: branch_name)
+            # git!(%W(-C #{pindo_new_project_dir} checkout master)) 
+            # remove_branch(local_repo_dir: pindo_new_project_dir, branch: branch_name)
+
+
+            
+        end
+
+
+
+
+
+      end
+    end
+  end
+end
+  

data/lib/pindo/deploy/updateconfig.rb

@@ -0,0 +1,129 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'highline'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Updateconfig < Deploy
+                
+                include Command::DeployOptions
+                include Hashhelper
+                include Appselect
+
+                self.summary = '根据模板更新发布配置的版本'
+                self.description = <<-DESC
+                    根据模板更新发布配置的版本
+                DESC
+        
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def run
+                    
+                    update_common_struct
+
+                    
+                end
+
+
+                def update_common_struct
+                    app_default_config_dir = clong_buildconfig_repo(repo_name: pindo_single_config.demo_bundle_id)
+                    default_config_file = File.join(app_default_config_dir, "config.json")
+                    default_config_json = nil
+                    if !default_config_file.empty? && File::file?(default_config_file)   
+                        default_config_json=JSON.parse(File.read(default_config_file))
+                        unless default_config_json
+                            puts "Default json not found !!!"
+                        end
+                    else
+                        puts "Default json not found !!!"
+                    end
+                    
+                    puts "\n\n=========用新模板更新后的config=============="
+                    empty_new_config = deepcopy_hash_struct(src_hash:default_config_json, key_value:"__________config_")
+                    new_config_json = init_hash_value_wihtout_add_key(hash1:empty_new_config, hash2:@config_json)                    
+                    new_config_json['config_version'] = default_config_json['config_version']
+
+                    puts JSON.pretty_generate(new_config_json)
+                    if !@args_appconfig_fullname.empty? && File::file?(@args_appconfig_fullname)  
+                        File.open(@args_appconfig_fullname, "w") do |f|
+                            f.write(JSON.pretty_generate(new_config_json))
+                        end
+                    else
+                        puts "Update config.json error!!!"
+                    end
+
+                    puts "\n\n=========删除的Key=============="
+                    del_key_json = minus_hash(hash1:@config_json, hash2:new_config_json)
+                    puts JSON.pretty_generate(del_key_json)
+
+                    puts "\n\n=========新增的Key=============="
+                    add_key_json = minus_hash(hash1:new_config_json, hash2:@config_json)
+                    puts JSON.pretty_generate(add_key_json)
+
+                end
+
+                def update_mainapp_config
+
+                    cli = HighLine.new
+
+                    menu_choice = select_main_app
+    
+                    if menu_choice == "None" || menu_choice == "IdeaApp"
+                        puts "Do not need fixed config!"
+                    else
+
+                        deploy_repo_name = get_deploy_setting_repo(tagname:menu_choice)
+                        puts "deploy_repo_name: #{deploy_repo_name}"
+
+                        mainapp_config_dir = clong_buildconfig_repo(repo_name: deploy_repo_name)
+                        mainapp_config_file = File.join(mainapp_config_dir, "config.json")
+                        mainapp_config_json = nil
+                        if !mainapp_config_file.empty? && File::file?(mainapp_config_file)   
+                            mainapp_config_json=JSON.parse(File.read(mainapp_config_file))
+                            unless mainapp_config_json
+                                puts "Default json not found !!!"
+                            end
+                        else
+                            puts "Default json not found !!!"
+                        end
+
+                        if !@args_appconfig_fullname.empty? && File::file?(@args_appconfig_fullname)  
+
+                            currentapp_config_json=JSON.parse(File.read(@args_appconfig_fullname))
+
+                            currentapp_config_json['project_info']['ios_deployment_targe'] = mainapp_config_json['project_info']['ios_deployment_targe']
+                            currentapp_config_json['project_info']['app_type'] = mainapp_config_json['project_info']['app_type']
+                            currentapp_config_json['project_info']['build_type'] = mainapp_config_json['project_info']['build_type']
+                            currentapp_config_json['project_info']['project_module'] = mainapp_config_json['project_info']['project_module']
+                            
+                            currentapp_config_json['app_setting']['kGUKeyAppsFlyerDevKey'] = 'dN3s94tzJN3e8M3R9EMSbc'
+   
+
+                            if menu_choice == "AddMe" 
+                                desc_location_use = currentapp_config_json['app_info']['desc_location_use']
+                                if desc_location_use.nil? || desc_location_use == "" || desc_location_use.empty? || desc_location_use == "++++++++"
+                                    currentapp_config_json['app_info']['desc_location_use'] = "So that you can know people near you!"
+                                end
+                            end
+
+                            File.open(@args_appconfig_fullname, "w") do |f|
+                                f.write(JSON.pretty_generate(currentapp_config_json))
+                            end
+                            puts "Update config.json with #{menu_choice} !!!"
+                        else
+                            puts "Update config.json error!!!"
+                        end
+
+
+                    end
+                    
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/deploy/uploadipa.rb

@@ -0,0 +1,63 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Uploadipa < Deploy
+        
+                include Command::DeployOptions
+
+                self.summary = 'Upload ipa to iTunes Connect.'
+
+                self.description = <<-DESC
+                    Upload ipa to iTunes Connect.
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def run
+                    current_project_dir = Dir.pwd
+
+                    ipa_file = nil
+                    Find.find(File.join(current_project_dir, "build")) do |path|
+                        if path.to_s.end_with?(".ipa") then
+                            ipa_file = path
+                            puts "++++++++++"
+                            puts ipa_file
+                        end
+                    end
+
+                    if !ipa_file.nil? && File.exist?(ipa_file)
+
+                        command = "fastlane deliver --ipa " + %Q{"#{ipa_file}"} + " --skip_binary_upload false --skip_metadata true --skip_screenshots true --skip_app_version_update true -f"
+                        puts command
+                        system command
+
+                        # values = {
+                        #     username:@apple_id,
+                        #     app_identifier: @bundle_id,
+                        #     ipa:ipa_file,
+                        #     skip_binary_upload:false,
+                        #     skip_screenshots:true,
+                        #     skip_metadata:true,
+                        #     skip_app_version_update:true,
+                        #     force:true
+                        #   }
+
+                        #   puts Deliver::Options.available_options
+
+                        #   config = FastlaneCore::Configuration.create(Deliver::Options.available_options, values)
+                        #   Deliver::Runner.new.run(config)
+                    end
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/deploy.rb

@@ -0,0 +1,44 @@
+
+
+
+require 'pindo/deploy/updateconfig'
+require 'pindo/deploy/initconfig'
+require 'pindo/deploy/pullconfig'
+require 'pindo/deploy/reportbug'
+
+require 'pindo/deploy/bundleid'
+require 'pindo/deploy/itcapp'
+require 'pindo/deploy/cert'
+require 'pindo/deploy/pem'
+require 'pindo/deploy/build'
+
+require 'pindo/deploy/configproj'
+require 'pindo/deploy/confusecode'
+require 'pindo/deploy/confuseproj'
+require 'pindo/deploy/fabric'
+require 'pindo/deploy/resign'
+require 'pindo/deploy/iap'
+require 'pindo/deploy/itcinfo'
+require 'pindo/deploy/getitcinfo'
+require 'pindo/deploy/quswark'
+require 'pindo/deploy/quswauth'
+require 'pindo/deploy/check'
+require 'pindo/deploy/tag'
+
+# require 'pindo/deploy/uploadipa'
+
+module Pindo
+  class Command
+
+
+    class Deploy < Command
+      
+
+        self.abstract_command = true
+        self.summary = '发布阶段相关命令'  
+
+
+
+    end
+  end
+end