ykfastlane 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06f98bcfa28e321039c0dd5286884f0df2c68e3524c000c613dcd77cb1a0735
-  data.tar.gz: b8efb63fbf7bb0133e54c496ba5963d3a565ae228a1d1e33c360182500f0480f
+  metadata.gz: 7959ecb85d8b27a4bf726afeed53e243cb4616b8c64aa035a2ceddd49b31d08c
+  data.tar.gz: a6e024e21c19776d1d38458b821c616a3fbf0f624b02a8224f1ae8192bee75e9
 SHA512:
-  metadata.gz: 1697f0ff64666028c08fb9cc6a2e2e6ced80516c013fabce2d619c47135eb6ae0288a763abd4fcd34fc630db5b5a890ea09b83c00930b260fd986e9fb9ae227c
-  data.tar.gz: fbb93bf62301a2774171ae82b0bf0c20f3e974b2c5ec6d2ca3355eb0f40f25325111427663e03f1105483b1534b044947428b9c58cf727deb6ffffa0233f0dd6
+  metadata.gz: d1baf606d3b195439495c2f04de26a1139290a1ada1d582fba5cd53a2c09ac3a92169c5ac9a598fa7afd091a17b5ee66dbd0850af9498d3ff09ee2281f664b98
+  data.tar.gz: 4a7fad8bacaa36d0578f59cd61deda876f026ffb36a84a5a6dd4d836a6ebf3b381d70f478ae64e3e6c08499973630151e03f9195ccdd4ef3ff0b440353196b48

data/lib/actions/YKFastlaneExecute.rb

@@ -23,8 +23,8 @@ module YKFastlane
   class YKFastlaneExecute
     def self.executeCommand(commandShell_pre, commandShell, workTitle)
       excuteStr = " "
-      excuteStr << "#{commandShell_pre} && " unless commandShell_pre.blank?
-      excuteStr << commandShell unless commandShell.blank?
+      excuteStr << "#{commandShell_pre}" unless commandShell_pre.blank?
+      excuteStr << " && #{commandShell}" unless commandShell.blank?
 
       puts "START COMMAND:#{excuteStr}"
       code = 1

data/lib/actions/archive.rb

@@ -14,53 +14,36 @@ module YKFastlane
       YKFastlane::Tools.UI(YKARCHIVE_PRODUCT_PATH)
     end
 
-    desc 'platform_edit_user', "edit or update platform user"
-    option :pgyer_user, :type => :string, :aliases => :u, :required => false, :desc => 'pgyer 平台 user'
-    option :pgyer_api, :type => :string, :aliases => :a, :required => false, :desc => 'pgyer 平台 api, 配置链接: https://appleid.apple.com/account/manage'
-    option :fir_api_token, :type => :string, :aliases => :f, :required => false, :desc => 'fir 平台 api token'
-    option :apple_account, :type => :string, :aliases => :c, :required => false, :desc => 'apple id'
-    option :apple_password, :type => :string, :aliases => :p, :required => false, :desc => 'apple id 专属app密钥, 配置链接: https://appleid.apple.com/account/manage'
-
-    def platform_edit_user()
-      puts "archive platform_edit_user"
-      if options[:pgyer_user].blank? == false && options[:pgyer_api].blank? == false # pgyer
-        pgyerinfo = {
-          K_archiveEnv_pgyer_api => options[:pgyer_api],
-          K_archiveEnv_pgyer_user => options[:pgyer_user]
-        }
-        self.update_archive_map(YKFastlane::ArchiveHelper::K_archiveEnv_config_pgyer, pgyerinfo)
-        puts "archive update pgyer info success"
-      end
+    no_commands {
+      def platform_edit_user_execute(options)
+        puts("#{method(:platform_edit_user_execute)}:#{options}")
+        if options[:pgyer_user].blank? == false && options[:pgyer_api].blank? == false # pgyer
+          pgyerinfo = {
+            K_archiveEnv_pgyer_api => options[:pgyer_api],
+            K_archiveEnv_pgyer_user => options[:pgyer_user]
+          }
+          self.update_archive_map(YKFastlane::ArchiveHelper::K_archiveEnv_config_pgyer, pgyerinfo)
+          puts "archive update pgyer info success"
+        end
 
-      if options[:fir_api_token].blank? == false #fir
-        fir_info = {
-          K_archiveEnv_firApiToken => options[:fir_api_token]
-        }
-        self.update_archive_map(YKFastlane::ArchiveHelper::K_archiveEnv_config_fir, fir_info)
-        puts "archive update fir info success"
-      end
+        if options[:fir_api_token].blank? == false #fir
+          fir_info = {
+            K_archiveEnv_firApiToken => options[:fir_api_token]
+          }
+          self.update_archive_map(YKFastlane::ArchiveHelper::K_archiveEnv_config_fir, fir_info)
+          puts "archive update fir info success"
+        end
 
-      if options[:apple_password].blank? == false && options[:apple_password].blank? == false # tf
-        tf_info = {
-          K_archiveEnv_tf_account => options[:apple_account],
-          K_archiveEnv_tf_password => options[:apple_password]
-        }
-        self.update_archive_map(YKFastlane::ArchiveHelper::K_archiveEnv_config_tf, tf_info)
-        puts "archive update tf info success"
+        if options[:apple_password].blank? == false && options[:apple_password].blank? == false # tf
+          tf_info = {
+            K_archiveEnv_tf_account => options[:apple_account],
+            K_archiveEnv_tf_password => options[:apple_password]
+          }
+          self.update_archive_map(YKFastlane::ArchiveHelper::K_archiveEnv_config_tf, tf_info)
+          puts "archive update tf info success"
+        end
       end
-    end
-
-    desc "list_platform_user", "display the ipa bump platform user map"
-
-    def list_platform_user()
-      self.list_user_map()
-    end
-
-    desc "list_profiles", "print archive profiles info"
-    def list_profiles()
-      code = YKFastlaneExecute.executeFastlaneLane("list_profile_configs", options)
-      exit(code)
-    end
+    }
 
     desc "upload_tf", "upload ipa to test flight, will send failed message to enterprise robot \'#{Helper::YKWECHAT_ROBOT_TOKEN}\'"
     option :ipa, :required => true, :type => :string, :aliases => :i, :desc => 'scheme name'
@@ -77,7 +60,7 @@ module YKFastlane
       end
 
       code = YKFastlaneExecute.executeFastlaneLane("upload_ipa_to_tf", options)
-      exit(code)
+      exit(code) unless code == 0
     end
 
     desc "tf", "archive ios project and upload to TF, will send failed message to enterprise robot \'#{Helper::YKWECHAT_ROBOT_TOKEN}\'"
@@ -101,7 +84,7 @@ module YKFastlane
       end
 
       code = YKFastlaneExecute.executeFastlaneLane("archive_tf", options)
-      exit(code)
+      exit(code) unless code == 0
     end
 
     desc "pgyer", "archive ios project and upload to pgyer, will send failed message to enterprise robot \'#{Helper::YKWECHAT_ROBOT_TOKEN}\'"
@@ -113,7 +96,7 @@ module YKFastlane
     option :xcworkspace, :type => :string, :aliases => :x, :desc => '.xcworkspace 文件相对于指令工作目录的相对路径, 如果.xcworkspace文件在工程根目录，则可以不传递此参数'
     option :cocoapods, :type => :numeric, :aliases => :c, :desc => '是否需要执行pod install, 默认不执行pod install 指令, 1:执行， 非1：不执行'
     option :flutter_directory, :type => :string, :aliases => :d, :desc => '如果有flutter混编, 此参数是 flutter项目的相对路径.'
-    option :export, :type => :string, :aliases => :e, :desc => '包的类型, app-store, validation,ad-hoc, package, enterprise, development, developer-id, mac-application, 默认为enterprise'
+    option :export, :type => :string, :aliases => :e, :desc => '包的类型, app-store, ad-hoc, enterprise 默认为enterprise'
 
     def pgyer()
       puts "archive_pgyer"
@@ -124,7 +107,7 @@ module YKFastlane
       end
 
       code = YKFastlaneExecute.executeFastlaneLane("archive_pgyer", options)
-      exit(code)
+      exit(code) unless code == 0
     end
 
     desc "fir", "archive ios project and upload to fir, will send failed message to enterprise robot \'#{Helper::YKWECHAT_ROBOT_TOKEN}\'"
@@ -135,7 +118,7 @@ module YKFastlane
     option :xcworkspace, :type => :string, :aliases => :x, :desc => '.xcworkspace 文件相对于指令工作目录的相对路径, 如果.xcworkspace文件在工程根目录，则可以不传递此参数'
     option :cocoapods, :type => :numeric, :aliases => :c, :desc => '是否需要执行pod install, 默认不执行pod install 指令, 1:执行， 非1：不执行'
     option :flutter_directory, :type => :string, :aliases => :d, :desc => '如果有flutter混编, 此参数是 flutter项目的相对路径.'
-    option :export, :type => :string, :aliases => :e, :desc => '包的类型, 包的类型, app-store, validation,ad-hoc, package, enterprise, development, developer-id, mac-application, 默认为enterprise'
+    option :export, :type => :string, :aliases => :e, :desc => '包的类型, app-store, ad-hoc, enterprise 默认为enterprise'
 
     def fir()
       puts "archive_fir"
@@ -145,7 +128,18 @@ module YKFastlane
       end
 
       code = YKFastlaneExecute.executeFastlaneLane("archive_fir", options)
-      exit(code)
+      exit(code) unless code == 0
+    end
+
+    no_commands do
+      def list_platform_user_execute()
+        self.list_user_map()
+      end
+
+      def list_profiles_execute()
+        code = YKFastlaneExecute.executeFastlaneLane("list_profile_configs", options)
+        exit(code) unless code == 0
+      end
     end
 
   end

data/lib/actions/certificate.rb

@@ -28,7 +28,7 @@ module YKFastlane
 
       puts "options_formatter:#{options}"
       code = YKFastlaneExecute.executeFastlaneLane("sync_apple_profile", options)
-      exit! code
+      exit! code unless  code == 0
     end
 
     desc "update_profile", "Update one profile"
@@ -50,7 +50,7 @@ module YKFastlane
       options[:profile_path] = str unless str.blank?
       puts "options:#{options}"
       code = YKFastlaneExecute.executeFastlaneLane("update_profiles", options)
-      exit! code
+      exit! code unless  code == 0
     end
 
     desc "update_cer", "edit certificate & profile for project schem or target"
@@ -68,25 +68,28 @@ module YKFastlane
       para[:password] = options[:cer_password]
 
       code = YKFastlaneExecute.executeFastlaneLane("update_certificate_p12", para)
-      exit! code
+      exit! code unless  code == 0
     end
 
-    desc "sync_git", "sync certificate & profile git, and will overwrite the existed files once pass the remote_url"
-    option :remote_url, :require => false, :type => :string, :aliases => :r, :desc => "git remote url, example:#{YKFastlane::Helper.default_certificate_git_remote}"
-
+    desc "sync_git", "sync certificate & profile git"
     def sync_git()
       puts "#{method(:sync_git)}--options:#{options}"
-      code = YKFastlaneExecute.executeFastlaneLane("sync_certificate_profile", options)
-      exit! code
+      self.sync_git_execute({})
     end
 
-    desc "list_details", "list certificate details"
+    no_commands {
+      def sync_git_execute(options)
+        puts "#{method(:sync_git_execute)}--options:#{options}"
+        code = YKFastlaneExecute.executeFastlaneLane("sync_certificate_profile", options)
+        exit! code unless  code == 0
+      end
 
-    def list_details()
-      puts("certificate list_details")
-      code = YKFastlaneExecute.executeFastlaneLane("list_profile_certificate_config", options)
-      exit! code
-    end
+      def list_details_execute()
+        puts("certificate list_details")
+        code = YKFastlaneExecute.executeFastlaneLane("list_profile_certificate_config", options)
+        exit! code unless  code == 0
+      end
+    }
 
   end
 end

data/lib/actions/init.rb

@@ -9,59 +9,49 @@ module YKFastlane
   class Init < YKFastlane::SubCommandBase
     include Helper
 
-    desc "sync_script", "sync fast file from the remote"
+    desc "execute_configs", "execute configs that user defines"
+
+    option :all, :aliases => :a, :type => :boolean, :require => false, :desc => "execute all configs"
+    option :script, :aliases => :s, :type => :boolean, :require => false, :desc => "execute script config"
+    option :profile, :aliases => :p, :type => :boolean, :require => false, :desc => "execute profile config"
+
+    def execute_configs()
+      puts("options:#{options}")
+      self.execute_config_execute(options)
+    end
+
+    desc "edit_configs", "update all configurations"
     long_desc <<-LONGDESC
-    同步远端fastlane脚本，此处可以通过参数下载固定的fastlan仓库，也可以使用环境配置的仓库来下载。
+    本指令集只是一个门户指令，核心打包功能是通过调用fastlane脚本实现的。\n
+    需要配置:\n 
+    1. 配置fastlane脚本的远程仓库;\n
+    2. 配置任务失败时候的反馈企业微信机器人 企业微信机器人配置: \033[0;32m https://developer.work.weixin.qq.com/document/path/91770 \e[0m\n
+    3. p12 与 profile 的托管仓库\n
+    4. fir, pgyer, tf 的账号口令\n
     LONGDESC
-    option :fastfile_remote, :aliases => :f, :type => :string, :desc => "fastlane 文件仓库地址, 如果未传递，则使用env中配置的，#{Helper::YKCONFIG_PATH}"
 
-    def sync_script()
-      fastfile_remote = options[:fastfile_remote].blank? ? Helper::load_config_value(Helper::K_fastfile_remote) : options[:fastfile_remote]
+    option :fastfile_remote, :aliases => :l, :type => :string, :desc => "fastlane 文件的 git remote, 可用参数：#{Helper.default_fast_file_remote()}"
 
-      if fastfile_remote.blank?
-        puts "no remote, work failed"
-        exit false
-      end
+    option :wx_access_token, :aliases => :t, :type => :string, :desc => "enterprise wechat robot token"
 
-      p = Helper::YKFastlne_SCRIPT_PATH
-      p_temp = p + "_temp"
-      FileUtils.remove_dir(p_temp, force: true)
+    option :profile_remote_url, :aliases => :r, :require => false, :type => :string, :desc => "profile & certificate git remote url, example:#{YKFastlane::Helper.default_certificate_git_remote}"
 
-      cloneResult = YKFastlane::Tools.clone_git_repository(fastfile_remote, p_temp)
-      if cloneResult != 0
-        exit cloneResult
-      end
+    option :pgyer_user, :aliases => :u, :type => :string, :required => false, :desc => 'pgyer 平台 user'
+    option :pgyer_api, :aliases => :a, :type => :string, :required => false, :desc => 'pgyer 平台 api, 配置链接: \033[0;32m https://appleid.apple.com/account/manage \e[0m'
 
-      if Dir.exist?(p)
-        puts "directory exist, so we delete it:#{p}"
-        FileUtils.remove_dir(p, true)
-      end
-
-      if File.exist?(File.dirname(p)) == false
-        FileUtils.mkdir_p(File.dirname(p))
-      end
-      FileUtils.mv(p_temp, p, force: true, verbose: true)
+    option :apple_account, :aliases => :c, :type => :string, :required => false, :desc => 'apple id'
+    option :apple_password, :aliases => :p, :type => :string, :required => false, :desc => 'apple id 专属app密钥, 配置链接: \033[0;32m https://appleid.apple.com/account/manage \e[0m'
 
-      Dir.chdir(p) do
-        system("bundle install --verbose")
-      end
-      return 0
-    end
+    option :fir_api_token, :aliases => :f, :type => :string, :required => false, :desc => 'fir 平台 api token'
 
-    desc 'config', "update configuration file: #{Helper::YKCONFIG_PATH}"
-    long_desc <<-LONGDESC
-    本指令集只是一个门户指令，核心打包功能是通过调用fastlane脚本来实现的。
-    需要配置： 1.配置fastlane脚本的远程仓库； 2.配置任务失败时候的反馈企业微信机器人, [【企业微信机器人配置】](https://developer.work.weixin.qq.com/document/path/91770)
-    LONGDESC
-    option :fastfile_remote, :aliases => :f, :type => :string, :desc => "fastlane 文件的git remote, 可用参数：#{Helper.default_fast_file_remote()}"
-    option :wx_access_token, :aliases => :t, :type => :string, :desc => "enterprise wechat robot token"
+    def edit_configs()
+      require 'actions/certificate'
+      require 'actions/archive'
+      puts("all_config:#{options}")
 
-    def config()
-      puts "options:#{options}"
-      Helper.update_config('', Helper::K_fastfile_remote, options[:fastfile_remote]) unless options[:fastfile_remote].blank?
-      Helper.update_config('', Helper::K_wx_access_token, options[:wx_access_token]) unless options[:wx_access_token].blank?
-      YKFastlane::ArchiveHelper.update_archive_map(Helper::K_wx_access_token, options[:wx_access_token]) unless options[:wx_access_token].blank?
-      Helper.display_config_yml
+      YKFastlane::Init.new().config_execute(options)
+      YKFastlane::Archive.new().platform_edit_user_execute(options)
+      YKFastlane::Certificate.new().sync_git_execute(options) unless options[:profile_remote_url].blank?
     end
 
     desc 'define_fast_execute_path', "指定fastlane文件的路径，此处是为了调试fastlane脚本"
@@ -73,12 +63,83 @@ module YKFastlane
       Helper.update_config("execute path", Helper::K_YK_CONFIG_FASTLANE_SCRIPT, options[:fastfile_path].blank? ? "" : options[:fastfile_path])
     end
 
-    desc "list_config", "print the env config file: #{Helper::YKCONFIG_PATH}"
+    desc "list_all_configs", "print the env config file: #{Helper::YKCONFIG_PATH}"
+
+    def list_all_configs()
+      require 'actions/certificate'
+      require 'actions/archive'
 
-    def list_config()
+      YKFastlane::Certificate.new().list_details_execute()
+
+      YKFastlane::Archive.new().list_platform_user_execute()
       Helper.display_config_yml
+      YKFastlane::Archive.new().list_profiles_execute()
     end
 
+    no_commands {
+      def execute_config_execute(options)
+        require 'actions/certificate'
+
+        if options[:all_config] = true
+          self.sync_script_execute({})
+          YKFastlane::Certificate.new().sync_git_execute({})
+        else
+          if options[:script] == true
+            self.sync_script_execute({})
+          end
+          if options[:profile] == true
+            YKFastlane::Certificate.new().sync_git_execute({})
+          end
+        end
+      end
+
+      def sync_script_execute(options)
+        fastfile_remote = options[:fastfile_remote].blank? ? Helper::load_config_value(Helper::K_fastfile_remote) : options[:fastfile_remote]
+
+        if fastfile_remote.blank?
+          puts "no remote, work failed"
+          exit false
+        end
+
+        p = Helper::YKFastlne_SCRIPT_PATH
+        p_temp = p + "_temp"
+        FileUtils.remove_dir(p_temp, force: true)
+
+        cloneResult = YKFastlane::Tools.clone_git_repository(fastfile_remote, p_temp)
+        if cloneResult != 0
+          exit cloneResult
+        end
+
+        if Dir.exist?(p)
+          puts "directory exist, so we delete it:#{p}"
+          FileUtils.remove_dir(p, true)
+        end
+
+        if File.exist?(File.dirname(p)) == false
+          FileUtils.mkdir_p(File.dirname(p))
+        end
+        FileUtils.mv(p_temp, p, force: true, verbose: true)
+
+        Dir.chdir(p) do
+          system("bundle install --verbose")
+        end
+        return 0
+      end
+
+      def config_execute(options)
+        puts("#{method(:config_execute)}:#{options}")
+
+        if options[:fastfile_remote].blank? == false
+          Helper.update_config('', Helper::K_fastfile_remote, options[:fastfile_remote]) unless options[:fastfile_remote].blank?
+          self.sync_script_execute({})
+        end
+
+        Helper.update_config('', Helper::K_wx_access_token, options[:wx_access_token]) unless options[:wx_access_token].blank?
+        YKFastlane::ArchiveHelper.update_archive_map(Helper::K_wx_access_token, options[:wx_access_token]) unless options[:wx_access_token].blank?
+        Helper.display_config_yml
+      end
+    }
+
   end
 
 end

data/lib/interface.rb

@@ -20,24 +20,39 @@ module YKFastlane
       true
     end
 
-    desc "lanes", 'list all lanes'
-
-    def lanes()
-      puts "lanes"
-      code = YKFastlane::YKFastlaneExecute.executeFastlaneLane("lanes", options)
-      exit(code)
-    end
+    # desc "lanes", 'list all lanes'
+    #
+    # def lanes()
+    #   puts "lanes"
+    #   code = YKFastlane::YKFastlaneExecute.executeFastlaneLane("lanes", options)
+    #   exit(code)
+    # end
 
     desc "archive", "archive functions"
     subcommand "archive", YKFastlane::Archive
 
-    desc "pod", "cocoapods functions"
-    subcommand "pod", YKFastlane::Pod
+    # desc "pod", "cocoapods functions"
+    # subcommand "pod", YKFastlane::Pod
 
     desc "init", "init ykfastlane"
     subcommand "init", YKFastlane::Init
 
     desc "certificate", "manager ios certificate & profile files"
     subcommand "certificate", YKFastlane::Certificate
+
+    desc  "update", "update ykfastlane"
+    def update()
+      require 'actions/YKFastlaneExecute'
+      code = YKFastlane::YKFastlaneExecute.executeCommand("gem uninstall ykfastlane -a -x", "gem install ykfastlane", "")
+      exit! code unless code == 0
+    end
+
+    desc "uninstall", "uninstall self"
+    def uninstall()
+      require 'actions/YKFastlaneExecute'
+      code = YKFastlane::YKFastlaneExecute.executeCommand("gem uninstall ykfastlane -a -x", "", "")
+      exit! code unless code == 0
+    end
+
   end
 end

data/lib/ykfastlane/tools.rb

@@ -90,16 +90,16 @@ module YKFastlane
       re
     end
 
-    def self.update_yml(qustion, path, key, value)
+    def self.update_yml(question, path, key, value)
       yml = load_yml(path)
 
       updateFlag = :yes
       if value.blank? #外部未传该参数需要通过问答形式，获取该参数
-        value = Tools.yk_ask("please input #{Tools::green(qustion)}")
+        value = Tools.yk_ask("please input #{Tools::green(question)}")
 
         if yml[key].blank? == false #需要确认修改
           puts "#{key} existed:#{yml[key]}"
-          updateFlag = Tools.yk_ask_with_answers("Are you sure to update #{self.green(qustion)}", ["Yes", "No"]).to_sym
+          updateFlag = Tools.yk_ask_with_answers("Are you sure to update #{self.green(question)}", ["Yes", "No"]).to_sym
         end
       end
       yml[key] = value unless updateFlag != :yes
@@ -145,11 +145,11 @@ module YKFastlane
     def self.git_commit(path, msg)
       git = Git::open(path)
       git.add()
-      curbranch = git.current_branch
+      cur_branch = git.current_branch
       begin
         git.commit("update:#{msg}")
       rescue Git::GitExecuteError => e
-        puts "commit update execption:#{e}"
+        puts "commit update exception:#{e}"
       end
 
       status = git.status()
@@ -158,7 +158,7 @@ module YKFastlane
         return 1
       else
         puts "git clean, work success"
-        git.push('origin', curbranch)
+        git.push('origin', cur_branch)
         return 0
       end
     end

data/lib/ykfastlane/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module YKFastlane
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
   YKFASTLANE_ENV_PATH = File.expand_path(File.join(Dir.home, '.ykfastlane_config'))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ykfastlane
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - stephen.chen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git