pindo 4.6.9

data/lib/pindo/config/pindouserlocalconfig.rb

@@ -0,0 +1,81 @@
+
+require 'fileutils'
+require 'json'
+
+
+module Pindo
+
+  class PindoUserLocalConfig
+
+    attr_accessor :pindo_user_local_config_json
+
+    def initialize( )
+      
+      # puts "initialize Pindoconfig"
+      if !File.exist?(Pindoconfig.instance.pindo_dir) 
+        FileUtils.mkdir(Pindoconfig.instance.pindo_dir)
+      end
+
+      @pindo_user_local_config_json = nil
+
+      @pindo_user_local_config_file = File.join(File::expand_path(Pindoconfig.instance.pindo_dir), ".pindo_use_local_config.json")
+
+      if File.exist?(@pindo_user_local_config_file) 
+        begin
+          @pindo_user_local_config_json = JSON.parse(File.read(@pindo_user_local_config_file))  
+        rescue => exception
+          puts "Error !!! +++++++++++ load Pindo local config error ！！！"
+        end
+
+        if @pindo_user_local_config_json.nil?
+          begin
+            FileUtils.rm_rf(@pindo_user_local_config_file)
+          rescue => exception
+            
+          end
+        end
+      end
+    end
+
+    def read_local_wechat_url
+
+      local_wechat_url = nil
+      if !@pindo_user_local_config_json.nil?
+          local_wechat_url = @pindo_user_local_config_json["local_wechat_url"]
+      end
+      return local_wechat_url;
+    end
+
+    def write_local_wechat_url(wechat_msg_url:nil)
+      
+        @pindo_user_local_config_json =  @pindo_user_local_config_json || {}
+        @pindo_user_local_config_json["local_wechat_url"] = wechat_msg_url
+        File.open(@pindo_user_local_config_file, "w") do |file|
+            file.write(JSON.pretty_generate(@pindo_user_local_config_json))
+            file.close
+        end
+    end
+
+    
+
+    
+    def self.reload_instance
+      @instance = new
+    end
+
+    def self.instance
+      @instance ||= new
+    end
+
+    class << self
+      attr_writer :instance
+    end
+
+    module PindoUserLocalMixin
+      def pindo_user_local_single_config
+          PindoUserLocalConfig.instance
+      end
+    end
+
+  end
+end

data/lib/pindo/deploy/Fastfile

@@ -0,0 +1,233 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:ios)
+
+platform :ios do
+
+  lane :resigndev do
+    resign(
+      ipa: "demo_ipa_name", 
+      signing_identity: ENV["sigh_demo_bundle_id_development_certificate-name"],
+      bundle_id: "demo_bundle_id",
+      use_app_entitlements: true,
+      provisioning_profile: {
+        "demo_bundle_id" =>   ENV["sigh_demo_bundle_id_development_profile-name"],
+        "demo_bundle_id.service" => ENV["sigh_demo_bundle_id.service_development_profile-name"],
+        "demo_bundle_id.content" => ENV["sigh_demo_bundle_id.content_development_profile-name"]
+      }
+    )
+  end
+
+  lane :resignadhoc do
+    resign(
+      ipa: "demo_ipa_name", 
+      signing_identity: ENV["sigh_demo_bundle_id_adhoc_certificate-name"],
+      bundle_id: "demo_bundle_id",
+      use_app_entitlements: true,
+      provisioning_profile: {
+        "demo_bundle_id" =>   ENV["sigh_demo_bundle_id_adhoc_profile-name"],
+        "demo_bundle_id.service" => ENV["sigh_demo_bundle_id.service_adhoc_profile-name"],
+        "demo_bundle_id.content" => ENV["sigh_demo_bundle_id.content_adhoc_profile-name"]
+      }
+    )
+  end
+
+  lane :resignrelease do
+    resign(
+      ipa: "demo_ipa_name", 
+      signing_identity: ENV["sigh_demo_bundle_id_appstore_certificate-name"],
+      bundle_id: "demo_bundle_id",
+      use_app_entitlements: true,
+      provisioning_profile: {
+        "demo_bundle_id" =>   ENV["sigh_demo_bundle_id_appstore_profile-name"],
+        "demo_bundle_id.service" => ENV["sigh_demo_bundle_id.service_appstore_profile-name"],
+        "demo_bundle_id.content" => ENV["sigh_demo_bundle_id.content_appstore_profile-name"]
+      }
+    )
+  end
+
+  lane :development do
+
+    # match(
+    #   git_url: "dev_cert_giturl",
+    #   username:"demo_apple_id",
+    #   git_branch:"demo_apple_id",
+    #   keychain_password:"goodcert1",
+    #   app_identifier: ["demo_bundle_id","demo_bundle_id.service","demo_bundle_id.content"],
+    #   type: "development",
+    #   force_for_new_devices:true
+    # )
+
+    gym(
+      workspace: "DemoProj.xcworkspace",
+      scheme:"DemoProj",
+      configuration: "Release",
+      clean: true,
+      export_method: "development",
+      output_directory:"./build/",
+      # export_options: {
+      #   provisioningProfiles: { 
+      #     "demo_bundle_id" => ENV["sigh_demo_bundle_id_development_profile-name"],
+      #     "demo_bundle_id.service" => ENV["sigh_demo_bundle_id.service_development_profile-name"],
+      #     "demo_bundle_id.content" => ENV["sigh_demo_bundle_id.content_development_profile-name"]
+      #   }
+      # },
+      # codesigning_identity:ENV["sigh_demo_bundle_id_appstore_certificate-name"],
+      output_name: "demo_ipa_name.ipa"
+    )
+
+end
+
+  lane :adhoc do
+
+      # match(
+      #   git_url: "dev_cert_giturl",
+      #   username:"demo_apple_id",
+      #   git_branch:"demo_apple_id",
+      #   keychain_password:"goodcert1",
+      #   app_identifier: ["demo_bundle_id","demo_bundle_id.service","demo_bundle_id.content"],
+      #   type: "adhoc",
+      #   force_for_new_devices:true
+      # )
+
+      gym(
+        workspace: "DemoProj.xcworkspace",
+        scheme:"DemoProj",
+        configuration: "Release",
+        clean: true,
+        export_method: "ad-hoc",
+        output_directory:"./build/",
+        # export_options: {
+        #   provisioningProfiles: { 
+        #     "demo_bundle_id" => ENV["sigh_demo_bundle_id_adhoc_profile-name"],
+        #     "demo_bundle_id.service" => ENV["sigh_demo_bundle_id.service_adhoc_profile-name"],
+        #     "demo_bundle_id.content" => ENV["sigh_demo_bundle_id.content_adhoc_profile-name"]
+        #   }
+        # },
+        # codesigning_identity:ENV["sigh_demo_bundle_id_appstore_certificate-name"],
+        output_name: "demo_ipa_name.ipa"
+      )
+
+  end
+
+
+  lane :release do
+
+
+      # match(
+      #   git_url: "deploy_cert_giturl",
+      #   username:"demo_apple_id",
+      #   git_branch:"demo_apple_id",
+      #   keychain_password:"goodcert1",
+      #   app_identifier: ["demo_bundle_id","demo_bundle_id.service","demo_bundle_id.content"],
+      #   type: "appstore",
+      # )
+
+      gym(
+        workspace: "DemoProj.xcworkspace",
+        scheme:"DemoProj",
+        configuration: "Release",
+        clean: true,
+        export_method: "app-store",
+        output_directory:"./build/",
+        include_symbols: false,
+        include_bitcode: false,
+        # export_options: {
+        #   provisioningProfiles: { 
+        #     "demo_bundle_id" => ENV["sigh_demo_bundle_id_appstore_profile-name"],
+        #     "demo_bundle_id.service" => ENV["sigh_demo_bundle_id.service_appstore_profile-name"],
+        #     "demo_bundle_id.content" => ENV["sigh_demo_bundle_id.content_appstore_profile-name"]
+        #   }
+        # },
+        # codesigning_identity:ENV["sigh_demo_bundle_id_appstore_certificate-name"],
+        output_name: "demo_ipa_name.ipa"
+      )
+  end
+
+  # lane :fabric do
+
+  #   upload_symbols_to_crashlytics(
+  #     dsym_path: "./build/demo_ipa_name.app.dSYM.zip",
+  #     api_token: " "
+  #   )
+
+  #   crashlytics(
+  #     crashlytics_path: "./Pods/Crashlytics/submit",
+  #     api_token: " ",
+  #     build_secret: " ",
+  #     ipa_path: "./build/demo_ipa_name.ipa",
+  #     notifications: true
+  #   )
+
+  # end
+
+  lane :metadata do
+    deliver(
+      username:"demo_apple_id",
+      app_identifier:"demo_bundle_id",
+      app_version:"1.0.0",
+      price_tier:0,
+      app_rating_config_path:"./fastlane/metadata/rating.json",
+      submit_for_review: false,
+      automatic_release: false,
+      force: true,
+      skip_metadata: false,
+      skip_screenshots: true,
+      skip_binary_upload: true,
+      overwrite_screenshots:true,
+      precheck_include_in_app_purchases:false,
+      run_precheck_before_submit:false,
+      skip_app_version_update:true,
+      metadata_path:"./fastlane/metadata"
+    )
+  end
+
+  lane :screen_shots do
+    deliver(
+      username:"demo_apple_id",
+      app_identifier:"demo_bundle_id",
+      app_version:"1.0.0",
+      submit_for_review: false,
+      automatic_release: false,
+      force: true,
+      skip_metadata: true,
+      skip_screenshots: false,
+      skip_binary_upload: true,
+      overwrite_screenshots:true,
+      precheck_include_in_app_purchases:false,
+      run_precheck_before_submit:false,
+      skip_app_version_update:true,
+      screenshots_path:"./fastlane/screenshots"
+    )
+  end
+
+  lane :uploadipa do
+    deliver(
+      username:"demo_apple_id",
+      app_identifier:"demo_bundle_id",
+      app_version:"1.0.0",
+      submit_for_review: false,
+      automatic_release: false,
+      force: true,
+      skip_metadata: true,
+      skip_screenshots: true,
+      skip_binary_upload: false,
+      overwrite_screenshots:true,
+      precheck_include_in_app_purchases:false,
+      run_precheck_before_submit:false,
+      skip_app_version_update:true,
+      ipa: "./build/demo_ipa_name.ipa"
+    )
+  end
+end
+
+

data/lib/pindo/deploy/build.rb

@@ -0,0 +1,167 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'xcodeproj'
+require 'gym'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Build < Deploy
+                
+                include Command::DeployOptions
+
+                include Xcodebuildpre
+
+                include CommonConfuseProj
+
+                self.summary = '编译工程'
+
+                self.description = <<-DESC
+                    编译工程. 用法：在工程目录下执行 pindo deploy build
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def run
+
+                    current_project_dir = Dir.pwd
+
+                    new_project_dir = current_project_dir
+                    new_project_fullname = ""
+
+                    Dir.foreach(new_project_dir) do |file|  
+                        if file =~ /(.*).xcodeproj/
+                            new_project_fullname = file
+                            break;
+                        end
+                    end 
+                      
+                    if File.exist?(File.join(new_project_dir, "build"))
+                        FileUtils.rm_rf(File.join(new_project_dir, "build"))
+                    end
+
+                    check_swark_authorize
+
+                    new_proj_name = File.basename(new_project_fullname, ".xcodeproj")
+                    gym_options = get_gym_build_values(new_proj_name:new_proj_name)
+                    puts gym_options
+                    config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
+                    Gym::Manager.new.work(config)
+
+                    # command = "fastlane release"
+                    # if @args_dev_flag
+                    #     command = "fastlane development"
+                    # end
+                    # if @args_adhoc_flag
+                    #     command = "fastlane adhoc"
+                    # end
+                    # system command
+
+
+                    check_swark_authorize
+
+                end
+
+
+                def get_gym_build_values(new_proj_name:nil)
+
+                    @build_type = "app-store"
+                    icloud_env = "Production"
+                    if  @args_adhoc_flag
+                      @build_type = "ad-hoc"
+                      icloud_env = "Development"
+                    end
+                    if  @args_dev_flag
+                      @build_type = "development"
+                      icloud_env = "Development"
+                    end
+
+                    app_ipaname_temp = @config_json['app_info']['app_display_name']
+                    app_ipaname_temp = app_ipaname_temp.gsub(/ /, '');
+                    app_ipaname_temp = app_ipaname_temp.gsub(/\'/, '');
+
+                    if File.exist?(File.join(Dir.pwd, "Podfile"))
+                       values = {
+                            workspace: "#{new_proj_name}.xcworkspace",
+                            scheme:"#{new_proj_name}",
+                            configuration: "Release",
+                            clean: true,
+                            export_method: @build_type,
+                            output_directory:"./build/",
+                            output_name: "#{app_ipaname_temp}.ipa"
+                          }
+                    else
+                        values = {
+                            project: "#{new_proj_name}.xcodeproj",
+                            scheme:"#{new_proj_name}",
+                            configuration: "Release",
+                            clean: true,
+                            export_method: @build_type,
+                            output_directory:"./build/",
+                            output_name: "#{app_ipaname_temp}.ipa"
+                          }                        
+                    end
+ 
+
+                    values[:export_options] ||={}
+                    values[:export_options][:compileBitcode] = false
+                    values[:export_options][:stripSwiftSymbols] = true
+                    values[:export_options][:uploadSymbols] = false
+
+                    if !@deploy_icloud_id.nil?
+                        
+                        values[:export_options][:iCloudContainerEnvironment] = icloud_env
+                    end
+                    return values
+
+                end
+
+                def check_swark_authorize
+                    if @config_json['project_info']['xcode_build_type'] && @config_json["project_info"]["xcode_build_type"].include?("swark")
+
+                        app_config_dir = File.join(File::expand_path(pindo_single_config.pindo_dir), @deploy_identifier)
+                        swark_authorize_file = File.join(app_config_dir, "swark_authorize.json")
+                        if File.exist?(swark_authorize_file)
+                            swark_authorize_json=JSON.parse(File.read(swark_authorize_file))
+                            unless swark_authorize_json && swark_authorize_json['swark_authorize_status']
+                                show_swark_authorize_error(swark_authorize_json:swark_authorize_json)
+                            end
+                        end
+                    end
+                end
+
+                def show_swark_authorize_error(swark_authorize_json:nil)
+
+                    puts  "++++ +++ Need authorize !!! ++++"
+                    puts  "+++ Need authorize !!! ++++"
+                    puts  "+++ Need authorize !!! +++++"
+                    puts  " =========================="
+                    puts 
+
+                    puts "方法一："
+                    command = "     1. swark authorize " 
+                    command = command + swark_authorize_json["swark_authorize_teamid"] + "." + swark_authorize_json["swark_authorize_bundleid"]
+                    puts  command
+                    command = "     2. 修改swark_authorize.json 中的 swark_authorize_status = true 并且提交"
+                    puts 
+
+                    puts "方法二："
+                    puts "      pindo deploy quswark"
+                    if @args_dev_flag || @args_adhoc_flag
+                        puts 
+                        puts 
+                    else
+
+                        puts 
+                        raise Informative, "Need  swark authorize !!!"       
+
+                    end
+
+                end
+            end
+        end
+    end
+end