pindo 5.19.5 → 5.20.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/lib/pindo/base/git_handler.rb +55 -10
  3. data/lib/pindo/command/android/autobuild.rb +1 -1
  4. data/lib/pindo/command/appstore/autobuild.rb +1 -1
  5. data/lib/pindo/command/appstore/iap.rb +2 -2
  6. data/lib/pindo/command/appstore/updateid.rb +1 -1
  7. data/lib/pindo/command/ios/autobuild.rb +1 -1
  8. data/lib/pindo/command/ios/podpush.rb +1 -1
  9. data/lib/pindo/command/jps/apptest.rb +6 -3
  10. data/lib/pindo/command/jps/bind.rb +7 -3
  11. data/lib/pindo/command/jps/config.rb +354 -0
  12. data/lib/pindo/command/jps/download.rb +3 -2
  13. data/lib/pindo/command/jps/media.rb +7 -3
  14. data/lib/pindo/command/jps/upload.rb +7 -3
  15. data/lib/pindo/command/jps.rb +1 -0
  16. data/lib/pindo/command/unity/autobuild.rb +1 -1
  17. data/lib/pindo/command/unity/packbuild.rb +1 -1
  18. data/lib/pindo/command/utils/copyconfig.rb +1 -1
  19. data/lib/pindo/command/utils/renewbundleid.rb +1 -1
  20. data/lib/pindo/command/utils/tag.rb +1 -1
  21. data/lib/pindo/command/web/autobuild.rb +1 -1
  22. data/lib/pindo/config/build_info_manager.rb +2 -2
  23. data/lib/pindo/module/appstore/itcapp_helper.rb +1 -1
  24. data/lib/pindo/module/build/swark_helper.rb +1 -1
  25. data/lib/pindo/module/cert/cert_helper.rb +1 -1
  26. data/lib/pindo/module/cert/pem_helper.rb +1 -1
  27. data/lib/pindo/module/pgyer/pgyerhelper.rb +259 -100
  28. data/lib/pindo/module/source_files_guard.rb +83 -0
  29. data/lib/pindo/module/task/model/build/ios_build_adhoc_task.rb +1 -1
  30. data/lib/pindo/module/task/model/build/ios_build_appstore_task.rb +1 -1
  31. data/lib/pindo/module/task/model/build/ios_build_dev_task.rb +3 -3
  32. data/lib/pindo/module/task/model/git/git_commit_task.rb +14 -4
  33. data/lib/pindo/module/task/model/git/git_tag_task.rb +66 -10
  34. data/lib/pindo/module/utils/git_repo_helper.rb +2 -2
  35. data/lib/pindo/module/xcode/applovin_xcode_helper.rb +1 -1
  36. data/lib/pindo/module/xcode/cocoapods_helper.rb +2 -2
  37. data/lib/pindo/module/xcode/xcode_build_helper.rb +3 -3
  38. data/lib/pindo/module/xcode/xcode_swark_helper.rb +1 -1
  39. data/lib/pindo/options/groups/jps_options.rb +43 -0
  40. data/lib/pindo/version.rb +1 -1
  41. metadata +3 -1
@@ -44,7 +44,7 @@ module Pindo
44
44
  # 定义此命令使用的参数项
45
45
  def self.option_items
46
46
  @option_items ||= Pindo::Options::OptionGroup.merge(
47
- Pindo::Options::JPSOptions.select(:conf),
47
+ Pindo::Options::JPSOptions.select(:conf, :proj, :workflow_name),
48
48
  Pindo::Options::TaskOptions.select(:select),
49
49
  Pindo::Options::GitOptions.all
50
50
  )
@@ -66,6 +66,8 @@ module Pindo
66
66
 
67
67
  # JPS 参数
68
68
  @args_conf = @options[:conf]
69
+ @args_proj = @options[:proj]
70
+ @args_workflow_name = @options[:workflow_name]
69
71
 
70
72
  # Task 参数
71
73
  @args_select_flag = @options[:select] || false
@@ -106,7 +108,9 @@ module Pindo
106
108
  working_directory: project_path,
107
109
  conf: @args_conf,
108
110
  package_type: nil, # package_type 在 manage_type=git 时会被忽略
109
- manage_type: "git"
111
+ manage_type: "git",
112
+ proj_name: @args_proj,
113
+ workflow_name: @args_workflow_name
110
114
  )
111
115
 
112
116
  if app_info_obj.nil?
@@ -131,7 +135,7 @@ module Pindo
131
135
  project_path,
132
136
  {
133
137
  process_type: process_type,
134
- commit_message: "feat: jps media 上传前提交"
138
+ commit_message: "chore(jps): pindo media 上传前提交"
135
139
  }
136
140
  )
137
141
  tasks << git_commit_task
@@ -67,7 +67,7 @@ module Pindo
67
67
  def self.option_items
68
68
  @option_items ||= Pindo::Options::OptionGroup.merge(
69
69
  Pindo::Options::BuildOptions.select(:types),
70
- Pindo::Options::JPSOptions.select(:conf, :send, :desc, :resign, :login, :file, :attach),
70
+ Pindo::Options::JPSOptions.select(:conf, :send, :desc, :resign, :login, :file, :attach, :proj, :workflow_name),
71
71
  Pindo::Options::GitOptions.all
72
72
  )
73
73
  end
@@ -97,6 +97,8 @@ module Pindo
97
97
 
98
98
  # JPS 参数
99
99
  @args_conf = @options[:conf]
100
+ @args_proj = @options[:proj]
101
+ @args_workflow_name = @options[:workflow_name]
100
102
  @args_send_flag = @options[:send] || false
101
103
  @args_resign_flag = @options[:resign] || false
102
104
  @args_upload_desc = @options[:desc]
@@ -181,7 +183,7 @@ module Pindo
181
183
 
182
184
  git_options_with_process = git_options.merge({
183
185
  process_type: process_type,
184
- commit_message: "feat: jps upload 构建前提交"
186
+ commit_message: "chore(jps): pindo upload 构建前提交"
185
187
  })
186
188
 
187
189
  # 1.1 Git 提交任务
@@ -503,7 +505,9 @@ module Pindo
503
505
  app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
504
506
  working_directory: Dir.pwd,
505
507
  conf: @args_conf,
506
- package_type: package_type
508
+ package_type: package_type,
509
+ proj_name: @args_proj,
510
+ workflow_name: @args_workflow_name
507
511
  )
508
512
 
509
513
  if app_info_obj.nil?
@@ -5,6 +5,7 @@ require 'pindo/command/jps/download'
5
5
  require 'pindo/command/jps/apptest'
6
6
  require 'pindo/command/jps/resign'
7
7
  require 'pindo/command/jps/bind'
8
+ require 'pindo/command/jps/config'
8
9
 
9
10
  module Pindo
10
11
  class Command
@@ -252,7 +252,7 @@ module Pindo
252
252
  tag_type: @args_tag_type,
253
253
  tag_pre: @args_tag_pre,
254
254
  process_type: process_type,
255
- commit_message: "feat: unity autobuild 构建前提交"
255
+ commit_message: "chore(unity): pindo autobuild 构建前提交"
256
256
  )
257
257
  all_tasks << git_commit_task
258
258
 
@@ -188,7 +188,7 @@ module Pindo
188
188
  tag_type: @args_tag_type,
189
189
  tag_pre: @args_tag_pre,
190
190
  process_type: process_type,
191
- commit_message: "chore(nuget): 更新 nuget v#{confirmed_version} Release Notes",
191
+ commit_message: "chore(nuget): pindo 更新 nuget v#{confirmed_version} Release Notes",
192
192
  fixed_version: confirmed_version # 传入确认后的版本号
193
193
  )
194
194
  tasks << git_commit_task
@@ -170,7 +170,7 @@ module Pindo
170
170
  # 只提交 config.json
171
171
  Pindo::GitHandler.git_addpush_repo(
172
172
  path: new_config_dir,
173
- message: "chore(config): 初始化 #{@from_bundle_id} 的配置"
173
+ message: "chore(config): pindo 初始化 #{@from_bundle_id} 的配置"
174
174
  )
175
175
 
176
176
  puts
@@ -184,7 +184,7 @@ module Pindo
184
184
  # 提交到 Git 仓库
185
185
  Pindo::GitHandler.git_addpush_repo(
186
186
  path: app_config_dir,
187
- message: "chore(config): 同步 Apple Developer Portal 的 capabilities",
187
+ message: "chore(config): pindo 同步 Apple Developer Portal 的 capabilities",
188
188
  commit_file_params: ["config.json"]
189
189
  )
190
190
 
@@ -92,7 +92,7 @@ module Pindo
92
92
  tag_type: @args_tag_type,
93
93
  tag_pre: @args_tag_pre,
94
94
  process_type: process_type,
95
- commit_message: "feat: tag 操作前提交"
95
+ commit_message: "chore(git): pindo tag 操作前提交"
96
96
  )
97
97
  tasks << git_commit_task
98
98
 
@@ -268,7 +268,7 @@ module Pindo
268
268
  tag_type: @args_tag_type,
269
269
  tag_pre: @args_tag_pre,
270
270
  process_type: process_type,
271
- commit_message: "feat: web autobuild 构建前提交"
271
+ commit_message: "chore(web): pindo autobuild 构建前提交"
272
272
  )
273
273
  tasks << git_commit_task
274
274
 
@@ -220,7 +220,7 @@ module Pindo
220
220
  f.write(JSON.pretty_generate(git_repo_json))
221
221
  end
222
222
 
223
- Pindo::GitHandler.git_addpush_repo(path: pindo_setting_dir, message: "chore(config): 添加 #{repo_name} 仓库")
223
+ Pindo::GitHandler.git_addpush_repo(path: pindo_setting_dir, message: "chore(config): pindo 添加 #{repo_name} 仓库")
224
224
  end
225
225
 
226
226
  # 更新应用配置仓库(从模板复制)
@@ -252,7 +252,7 @@ module Pindo
252
252
  end
253
253
 
254
254
  # 提交并推送到远程仓库
255
- Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 初始化应用配置")
255
+ Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): pindo 初始化应用配置")
256
256
  end
257
257
  end
258
258
 
@@ -186,7 +186,7 @@ module Pindo
186
186
  if File.exist?(app_config_file)
187
187
  modify_appconfig_file(config_file: app_config_file, app_info_detail: app)
188
188
  Pindo::GitHandler.prepare_gitenv()
189
- Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 修改 apple id")
189
+ Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): pindo 修改 apple id")
190
190
  end
191
191
  rescue StandardError => e
192
192
  puts "更新远程配置仓库失败: #{e.message}"
@@ -127,7 +127,7 @@ module Pindo
127
127
  f.write(JSON.pretty_generate(swark_authorize_json))
128
128
  end
129
129
 
130
- Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): 添加 swark 授权配置")
130
+ Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(config): pindo 添加 swark 授权配置")
131
131
  end
132
132
 
133
133
  end
@@ -143,7 +143,7 @@ module Pindo
143
143
 
144
144
  # 提交并推送到远程仓库
145
145
  Pindo::GitHandler.prepare_gitenv()
146
- Pindo::GitHandler.git_addpush_repo(path: cert_repo_dir, message: "chore(cert): 删除 #{apple_id} 的证书")
146
+ Pindo::GitHandler.git_addpush_repo(path: cert_repo_dir, message: "chore(cert): pindo 删除 #{apple_id} 的证书")
147
147
 
148
148
  puts "✓ Git 仓库证书清理完成"
149
149
  end
@@ -65,7 +65,7 @@ module Pindo
65
65
  FileUtils.cp_r(File.join(push_path, "."), push_repo_dir)
66
66
 
67
67
  Pindo::GitHandler.prepare_gitenv()
68
- Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(cert): 添加推送证书")
68
+ Pindo::GitHandler.git_addpush_repo(path: app_config_dir, message: "chore(cert): pindo 添加推送证书")
69
69
 
70
70
  puts "✓ 证书已上传到配置仓库: #{push_repo_dir}"
71
71
  end