pindo 4.8.7 → 4.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b5673e6e6b22077a55006939dc549e2b545537d935c6a004bed385dd936014
-  data.tar.gz: 699659aa13cff6c29fd5cbf63ba1a16707cb1ba6e8811f913094c968d4fcd09a
+  metadata.gz: 3d618bb3feb5391c7e4c64105f4f34e72fd542421da102a97e7436ed5d02261c
+  data.tar.gz: 829babd10a742d61b622e248aa79429c6930f084dfcf90206540fe0fd9b64cf5
 SHA512:
-  metadata.gz: 1ae0851cb8497f852602e3fe26c49f6a1e69e0ba922c44833cf43abe12c186b6d1fec343ac29c3d62c1299c841dda8b0a0782caec8c952885a2fb9c1b0bd4805
-  data.tar.gz: 7ba1a294c60d4d1633e0f136a04d24712f7b01aec7c0702e890b8d7325e0261497897a67fbe55e1a9f63faaec566e70e8f98d52081c75c134bfbd3bd6953077a
+  metadata.gz: f443d03a4934fc8ac2d31ec39bb3ad861a62c28bdd6542a434511cfe1d92f0cb8a6e35736809414e5b564fcec86b0d6393e65d70cec686cd64e518a334ac0277
+  data.tar.gz: dd3b27fbcbc5b0392371d6e84feb14a9ece7241b940d7bfc162651d3eee3dd0a74998a5631bb5bb6d9c3115c222d4efff7de3f7df9cb24e85835ba101676ee46

data/lib/pindo/base/githelper.rb

@@ -19,6 +19,27 @@ module Pindo
 
       end
 
+      def is_git_directory?(local_repo_dir: nil)
+        args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --is-inside-work-tree) : %w(rev-parse --is-inside-work-tree)
+        begin
+          git!(args)
+          true
+        rescue StandardError => e
+          false
+        end
+      end
+
+      def git_root_directory(local_repo_dir: nil)
+        return nil unless is_git_directory?(local_repo_dir: local_repo_dir)
+        
+        args = local_repo_dir ? %W(-C #{local_repo_dir} rev-parse --show-toplevel) : %w(rev-parse --show-toplevel)
+        begin
+          git!(args).strip
+        rescue StandardError => e
+          nil
+        end
+      end
+      
       def add_branch(local_repo_dir: nil, branch: nil)
 
           current=Dir.pwd

data/lib/pindo/client/pgyerclient.rb

@@ -180,7 +180,7 @@ module Pindo
           else
               Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
           end
-
+          puts "token: #{@token}"
           return @token
       end
 
@@ -494,5 +494,38 @@ module Pindo
 
       end
 
+      def post_message(appId:nil, appVersionId:nil, chatEnv: nil, receiveType:nil)
+
+          boss_url = @baseurl + @request_config["send_lark_message"]
+
+          body_params = {
+                appId:appId,
+                appVersionId:appVersionId,
+                chatEnv:chatEnv,
+                receiveType:receiveType
+            }
+
+
+          con = HttpClient.create_instance_with_proxy
+
+          res = con.post do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+              req.body = body_params.to_json
+          end
+
+
+          result_date = nil
+          if !res.body.nil?
+              result_date = JSON.parse(res.body)
+          end
+
+          puts JSON.pretty_generate(result_date)
+
+          return result_date
+
+      end
+
   end
 end

data/lib/pindo/client/unityhelper.rb

@@ -0,0 +1,179 @@
+require 'open3'
+require 'json'
+require 'singleton'
+
+module Pindo
+  module Client
+    class UnityHelper
+      include Singleton
+
+      UNITY_MAC_PATHS = [
+        "/Applications/Unity/Unity.app/Contents/MacOS/Unity",
+        "/Applications/Unity/Hub/Editor/*/Unity.app/Contents/MacOS/Unity"
+      ]
+
+      UNITY_WINDOWS_PATHS = [
+        "C:/Program Files/Unity/Editor/Unity.exe",
+        "C:/Program Files/Unity/Hub/Editor/*/Unity.exe"
+      ]
+
+      TARGET_UNITY_VERSION = "2021.3"
+
+      class << self
+        def share_instance
+          instance
+        end
+      end
+
+      def find_unity_path
+        paths = case RUBY_PLATFORM
+                when /darwin/
+                  UNITY_MAC_PATHS
+                when /mswin|mingw|windows/
+                  UNITY_WINDOWS_PATHS
+                else
+                  raise "Unsupported platform: #{RUBY_PLATFORM}"
+                end
+
+        unity_versions = []
+
+        paths.each do |path|
+          if path.include?("*")
+            Dir.glob(path).each do |expanded_path|
+              # 从路径中提取版本号
+              version = extract_version_from_path(expanded_path)
+              if version && version.start_with?(TARGET_UNITY_VERSION)
+                unity_versions << {
+                  path: expanded_path,
+                  version: version
+                }
+              end
+            end
+          elsif File.exist?(path)
+            version = extract_version_from_path(path)
+            if version && version.start_with?(TARGET_UNITY_VERSION)
+              unity_versions << {
+                path: path,
+                version: version
+              }
+            end
+          end
+        end
+
+        if unity_versions.empty?
+          raise "No Unity #{TARGET_UNITY_VERSION} found in standard locations"
+        end
+
+        # 按版本号排序，取最新的2021.3.x版本
+        selected_unity = unity_versions.sort_by { |v| Gem::Version.new(v[:version]) }.last
+        puts "Selected Unity version: #{selected_unity[:version]}"
+        selected_unity[:path]
+      end
+
+      private
+
+      def extract_version_from_path(path)
+        # macOS路径格式: /Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity
+        # Windows路径格式: C:/Program Files/Unity/Hub/Editor/2021.3.45f1/Editor/Unity.exe
+        if match = path.match(/Editor\/([\d.]+[a-zA-Z]\d+)\//)
+          match[1]
+        else
+          nil
+        end
+      end
+
+      public
+
+      def execute_unity_command(project_path, method_name, additional_args = {})
+        unity_path = find_unity_path
+        
+        cmd_args = [
+          unity_path,
+          "-batchmode",
+          "-quit",
+          "-projectPath",
+          project_path.to_s,
+          "-executeMethod",
+          method_name
+        ]
+
+        # Add any additional arguments
+        additional_args.each do |key, value|
+          cmd_args << "-#{key}"
+          cmd_args << value.to_s if value
+        end
+
+        puts "Executing Unity command: #{cmd_args.join(' ')}"
+        stdout, stderr, status = Open3.capture3(*cmd_args)
+        
+        {
+          success: status.success?,
+          stdout: stdout,
+          stderr: stderr,
+          exit_status: status.exitstatus,
+          unity_version: extract_version_from_path(unity_path)
+        }
+      end
+
+      def build_project(project_path, build_method, platform: nil, output_path: nil)
+        additional_args = {}
+        additional_args[:buildTarget] = platform if platform
+        additional_args[:outputPath] = output_path if output_path
+
+        result = execute_unity_command(project_path, build_method, additional_args)
+        
+        if result[:success]
+          puts "Unity build completed successfully"
+          puts "Using Unity version: #{result[:unity_version]}"
+          puts result[:stdout]
+        else
+          puts "Unity build failed"
+          puts "Unity version: #{result[:unity_version]}"
+          puts result[:stderr]
+          raise "Unity build failed with status: #{result[:exit_status]}"
+        end
+
+        result
+      end
+
+      def get_project_settings(project_path)
+        settings_path = File.join(project_path, "ProjectSettings", "ProjectSettings.asset")
+        if File.exist?(settings_path)
+          File.read(settings_path)
+        else
+          raise "Project settings file not found at #{settings_path}"
+        end
+      end
+
+      def get_unity_version(project_path)
+        version_path = File.join(project_path, "ProjectSettings", "ProjectVersion.txt")
+        if File.exist?(version_path)
+          content = File.read(version_path)
+          if content =~ /m_EditorVersion: (.*)/
+            version = $1.strip
+            unless version.start_with?(TARGET_UNITY_VERSION)
+              raise "Project Unity version (#{version}) does not match required version (#{TARGET_UNITY_VERSION}.x)"
+            end
+            version
+          else
+            raise "Could not parse Unity version from #{version_path}"
+          end
+        else
+          raise "Project version file not found at #{version_path}"
+        end
+      end
+
+      def verify_unity_version(project_path)
+        project_version = get_unity_version(project_path)
+        unity_path = find_unity_path
+        editor_version = extract_version_from_path(unity_path)
+        
+        if project_version != editor_version
+          raise "Project Unity version (#{project_version}) does not match Editor version (#{editor_version})"
+        end
+        
+        true
+      end
+    end
+  end
+end

data/lib/pindo/command/android/debug.rb

@@ -0,0 +1,73 @@
+require 'fileutils'
+
+module Pindo
+  class Command
+    class Android < Command
+      class Debug < Android
+
+        # Android Debug包编译和上传命令
+        self.summary = '编译Android Debug包并支持上传到测试平台'
+
+        # 详细说明
+        self.description = <<-DESC
+            编译Android Debug包并支持上传到测试平台。
+            
+            支持功能:
+
+                * 编译Debug包
+
+                * 上传到测试平台  
+
+                * 发送测试通知
+
+            使用示例:
+
+                $ pindo android debug                    # 编译Debug包
+
+                $ pindo android debug --upload           # 编译并上传
+
+                $ pindo android debug --send             # 编译上传并发送通知
+
+                $ pindo android debug --proj=myapp       # 指定项目名称
+
+        DESC
+
+        # 命令参数
+        self.arguments = [
+          # 暂无参数
+        ]
+
+        # 命令选项
+        def self.options
+          [
+            ['--proj',   '指定上传到测试平台的项目名称'],
+            ['--upload', '上传编译后的apk到测试平台'],
+            ['--send',   '上传成功后发送测试通知']
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @args_adhoc_flag = argv.flag?('adhoc', false)
+          @args_deploy_flag = argv.flag?('deploy', false)
+          @args_macos_flag = argv.flag?('macos', false)
+          @upload_flag = argv.flag?('upload', false)
+          @send_flag = argv.flag?('send', false)
+          @proj_name = argv.option('proj')
+          
+          if @send_flag
+            @upload_flag = true
+          end
+          
+          super
+        end
+
+        def run
+          # TODO: 实现编译和上传逻辑
+          puts "Android Debug包编译和上传命令"
+          
+        end
+
+      end
+    end
+  end
+end

data/lib/pindo/command/android.rb

@@ -0,0 +1,14 @@
+
+
+require 'pindo/command/android/debug'
+
+module Pindo
+  class Command
+    
+    class Android < Command
+      self.abstract_command = true
+      self.summary = 'Android相关命令'
+    end
+
+  end
+end

data/lib/pindo/command/deploy/build.rb

@@ -77,13 +77,12 @@ module Pindo
                     config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
                     Gym::Manager.new.work(config)
 
-
-
                     pindo_new_project_dir = Dir.pwd
                     build_path = File.join(pindo_new_project_dir, "build", "*.ipa")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
-
+                    
                     if !ipa_file_upload.nil? && !app_info_obj.nil?
+                        
                         description = nil
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?

data/lib/pindo/command/dev/autobuild.rb

@@ -69,6 +69,8 @@ module Pindo
 
                     args_temp = []
                     args_temp << mainapp_bundleid
+
+
                     Pindo::Command::Deploy::Pullconfig::run(args_temp)
 
                     project_dir = Dir.pwd

data/lib/pindo/command/dev/build.rb

@@ -53,12 +53,13 @@ module Pindo
                         app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
                     end
 
+
                     args_temp = []
                     Pindo::Command::Deploy::Build::run(args_temp)
 
 
                     pindo_new_project_dir = Dir.pwd
-                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app}")
+                    build_path = File.join(pindo_new_project_dir, "build", "*.{ipa,app,apk}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
 
                     if !ipa_file_upload.nil? && !app_info_obj.nil? 
@@ -74,9 +75,11 @@ module Pindo
                                 end
                             end
                         end
+
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
                             msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+
                             PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
                             if @args_send_flag
                                 PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)    

data/lib/pindo/command/dev/debug.rb

@@ -12,22 +12,38 @@ module Pindo
             self.summary = '更新证书并使用新证书设置工程'
     
             self.description = <<-DESC
+                更新证书并使用新证书设置工程。
                 
-                更新证书并使用新证书设置工程,如果在工程目录下执行,会自动给工程设置对应的证书。用法:pindo dev debug  默认使用开发bundle id, 使用dev证书。
-                使用发布相关bundle id 或者adhoc证书，用法如下:pindo dev debug --deploy --adhoc              
-                
+                支持功能:
+
+                    * 自动更新证书
+                    
+                    * 自动设置工程证书
+                    
+                    * 支持开发和发布证书
+                    
+                    * 支持iOS和macOS平台
+
+                使用示例:
+
+                    $ pindo dev debug                    # 使用开发证书
+                    
+                    $ pindo dev debug --deploy           # 使用发布bundle id
+                    
+                    $ pindo dev debug --adhoc           # 使用adhoc证书
+                    
+                    $ pindo dev debug --macos           # 使用macOS证书
             DESC
 
             self.arguments = [
-
+                # 暂无参数
             ]
   
             def self.options
               [
-                ['--deploy', '默认用开发的bundle id，使用--deploy设置使用发布bundle id'],
-                ['--adhoc', '默认用dev证书，使用--adhoc设置使用adhoc证书'],
-                ['--macos', 'macos平台证书'],
-                ['--upload', '生成上传pgyer的证书'],
+                ['--deploy', '使用发布bundle id(默认使用开发bundle id)'],
+                ['--adhoc',  '使用adhoc证书(默认使用dev证书)'],
+                ['--macos',  '使用macOS平台证书'],
               ].concat(super)
             end
 
@@ -35,7 +51,6 @@ module Pindo
               @args_adhoc_flag = argv.flag?('adhoc', false)
               @args_deploy_flag = argv.flag?('deploy', false)
               @args_macos_flag = argv.flag?('macos', false)
-              @upload_flag = argv.flag?('upload', false)
               super 
             end
 
@@ -80,10 +95,6 @@ module Pindo
               if @args_macos_flag
                 args_temp << "--macos"
               end
-
-              if @upload_flag
-                args_temp << "--upload"
-              end
               
               Pindo::Command::Deploy::Cert::run(args_temp)
 
@@ -145,5 +156,4 @@ module Pindo
       end
     end
   end
-end
-  
+end

data/lib/pindo/command/gplay/iap.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Iap < Appstore
+
+
+                self.summary = 'Appstore中iap相关操作'
+
+                self.description = <<-DESC
+                    Appstore中iap相关操作，配置目录下执行：pindo appstore iap, 默认创建iap购买项
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore iap --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_download_name = argv.option('download')
+                    
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/itcapp.rb

@@ -0,0 +1,41 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Itcapp < Appstore
+
+
+                self.summary = 'Appstore中创建app'
+
+                self.description = <<-DESC
+                    Appstore中创建app，配置目录下执行：pindo appstore itcapp
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/metadata.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Metadata < Appstore
+
+
+                self.summary = 'Appstore中metadata相关操作'
+
+                self.description = <<-DESC
+                    Appstore中metadata相关操作, 用法:pindo appstre metadata
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore metadata --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/gplay/screenshots.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Screenshots < Appstore
+
+
+                self.summary = 'Appstore中screenshots相关操作'
+
+                self.description = <<-DESC
+                    Appstore中screenshots相关操作, 用法:pindo appstre screenshots
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore screenshots --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end