pindo 4.9.6 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1731c2ab77bdee7cfa10865db928c8b97344eee053ab5e636b6976875b7081
-  data.tar.gz: 5ec006fbfe270a055da4d716d823cd13820c96975758027773a233ca06d47b18
+  metadata.gz: 48f45a274d7bf7e99a3c76e791805e2138b556bf8953bb0bc57c65eeb7dbda06
+  data.tar.gz: b4a8afc25cc290bb596fa3c0061fe2ea75a604b7934bd7521f43e7ce9e003b41
 SHA512:
-  metadata.gz: 6f50bd7f5cbca0ab7ffc57e6b4ec6277b8c9a7ab6a10eb2f7fba50e79dacb392fcdba2c96fb2c5b46786a3a0058cb94d2c4c6dde7b2504ef59c8ad9742c209c4
-  data.tar.gz: f94c5d8264b77884aa15f6112cc8546fb2ba23de5eea03a5142bd312aadb46e60ec32de33ebfa6e00d65f6249a724c96fcc0c0be35105b08f2d83004ce210938
+  metadata.gz: 73bd11a9717893c06c35f731d36522c9e8a90936dbbc5cc86b679f31008e8f0046a211014fda1b24a90167b4c52884a386ef97c94626c80c688d91fa154c5a4d
+  data.tar.gz: b99da9f081dda86a6ae7184b4528bead3e4895f7d890d89783ff1b0dd4d523918dc728fd022f6b3f73aa444e2cd278650ef6bbe66fe9998e4e7c6f0929494210

data/lib/pindo/client/feishuclient.rb

@@ -0,0 +1,254 @@
+require 'net/http'
+require 'uri'
+require 'json'
+require 'net/http'
+require 'uri'
+require 'json'
+require 'openssl'
+require 'base64'
+
+module Pindo    
+  class FeishuClient
+    
+    def initialize(webhook_url, secret = nil)
+      @webhook_url = webhook_url
+      @secret = secret
+    end
+    
+    private
+    
+    def generate_sign(timestamp)
+      return nil unless @secret
+      
+      # 构造密钥字符串：timestamp + "\n" + secret
+      string_to_sign = "#{timestamp}\n#{@secret}"
+      
+      # 添加调试信息
+    #   puts "密钥字符串: #{string_to_sign.inspect}"
+      
+      # 使用string_to_sign作为密钥，对空字节数组进行签名
+      hmac_code = OpenSSL::HMAC.digest(
+        OpenSSL::Digest.new('sha256'),
+        string_to_sign,  # 使用 timestamp\n + secret 作为密钥
+        ""  # 使用空字符串作为待签名数据，对应Go代码中的空data
+      )
+      
+      sign = Base64.strict_encode64(hmac_code)
+      
+      # 添加调试信息
+    #   puts "生成的签名: #{sign}"
+      
+      sign
+    end
+    
+    def send_request(payload)
+      uri = URI.parse(@webhook_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request['Content-Type'] = 'application/json'
+      
+      # 如果设置了密钥，添加签名
+      if @secret
+        # 使用秒级时间戳（飞书要求）
+        timestamp = Time.now.to_i
+        
+        # 添加更多调试信息
+        # puts "\n签名信息:"
+        # puts "Secret: #{@secret}"
+        # puts "当前UTC时间: #{Time.now.utc}"
+        # puts "当前本地时间: #{Time.now}"
+        # puts "使用的时间戳(秒): #{timestamp}"
+        
+        # 生成签名
+        sign = generate_sign(timestamp)
+        
+        # 添加时间戳和签名
+        payload = payload.merge({
+          timestamp: timestamp,
+          sign: sign
+        })
+      end
+      
+      # 打印完整的请求信息
+    #   puts "\n发送请求详情:"
+    #   puts "URL: #{@webhook_url}"
+    #   puts "Headers: #{request.to_hash}"
+    #   puts "Payload: #{JSON.pretty_generate(payload)}\n"
+      
+      request.body = payload.to_json
+      response = http.request(request)
+      
+      result = JSON.parse(response.body)
+
+      result
+    rescue => e
+      puts "请求发送失败: #{e.message}"
+      puts e.backtrace
+      raise
+    end
+    
+    public
+    
+    def send_message(message)
+      payload = {
+        msg_type: "text",
+        content: {
+          text: message
+        }
+      }
+      
+      response = send_request(payload)
+      puts "发送结果: #{response['msg']}" if response['msg']
+      response
+    end
+    
+    def send_rich_text(title, content)
+      payload = {
+        msg_type: "post",
+        content: {
+          post: {
+            zh_cn: {
+              title: title,
+              content: [
+                [
+                  {
+                    tag: "text",
+                    text: content
+                  }
+                ]
+              ]
+            }
+          }
+        }
+      }
+      
+      response = send_request(payload)
+    #   puts "发送结果: #{response['msg']}" if response['msg']
+      response
+    end
+
+    def send_card_message(title, content)
+      payload = {
+        msg_type: "interactive",
+        card: {
+          config: {
+            wide_screen_mode: true
+          },
+          header: {
+            title: {
+              tag: "plain_text",
+              content: title
+            }
+          },
+          elements: [
+            {
+              tag: "div",
+              text: {
+                tag: "plain_text",
+                content: content
+              }
+            }
+          ]
+        }
+      }
+      
+      response = send_request(payload)
+      puts "发送结果: #{response['msg']}" if response['msg']
+      response
+    end
+
+    def send_markdown(title, markdown_content)
+      # 提取一级标题作为消息标题
+      lines = markdown_content.split("\n")
+      title_match = lines.find { |line| line.strip =~ /^# (.+)/ }
+      message_title = title_match ? $1.strip : title
+      
+      # 移除原始的一级标题
+      content_without_title = lines.reject { |line| line.strip =~ /^# / }.join("\n")
+      
+      # 格式化剩余内容
+      formatted_content = format_markdown_content(content_without_title)
+      
+      payload = {
+        msg_type: "interactive",
+        card: {
+          config: {
+            wide_screen_mode: true
+          },
+          header: {
+            title: {
+              tag: "plain_text",
+              content: message_title,
+              style: {
+                bold: true,
+                size: 32  # 增大标题字体到32
+              }
+            }
+          },
+          elements: [
+            {
+              tag: "div",
+              text: {
+                tag: "lark_md",
+                content: formatted_content
+              }
+            }
+          ]
+        }
+      }
+      
+      response = send_request(payload)
+      puts "发送结果: #{response['msg']}" if response['msg']
+      response
+    end
+
+    private
+
+    def format_markdown_content(markdown)
+      lines = markdown.split("\n")
+      formatted_lines = []
+      
+      lines.each_with_index do |line, index|
+        original_line = line  # 保存原始行（包含缩进）
+        line = line.strip
+        next if line.empty? && (index == 0 || lines[index-1].strip.empty?)  # 跳过连续的空行
+        
+        # 检查是否需要跳过这个空行
+        next if line.empty? && index > 0 && (
+          lines[index-1].strip =~ /^### / ||  # 跳过三级标题后的空行
+          lines[index-1].strip =~ /^## \[.+?\]/ ||  # 跳过二级标题后的空行
+          lines[index-1].strip =~ /^- /  # 跳过列表项后的空行
+        )
+        
+        # 获取缩进级别
+        indent_level = original_line[/^\s*/].length / 4  # 假设每级缩进是4个空格
+        indent = "    " * indent_level  # 使用4个空格作为一级缩进
+        
+        formatted_line = case line
+        when /^## \[(.+?)\] - (.+)/  # 版本标题
+          "\n**【#{$1}】**#{$2}"  # 版本号加粗，前面加空行
+        when /^### (.)(.+)/  # 分类标题
+          "#{$1}**#{$2}**"  # emoji 不加粗，文字加粗
+        when /^- (.+?) \((.+?)\)/  # 列表项带commit
+          "#{indent}• #{$1} (#{$2})"  # 添加缩进
+        when /^- (.+)/  # 普通列表项
+          "#{indent}• #{$1}"  # 添加缩进
+        when ''  # 空行
+          line
+        else
+          "#{indent}#{line}"  # 其他内容也保持缩进
+        end
+        
+        formatted_lines << formatted_line if formatted_line
+      end
+      
+      # 移除开头和结尾的空行，并确保段落之间只有一个空行
+      content = formatted_lines.join("\n").strip
+      content.gsub!(/\n{3,}/, "\n\n")  # 将连续的3个或更多换行替换为2个
+      content
+    end
+  end
+end
+

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

@@ -0,0 +1,110 @@
+require 'highline/import'
+require 'fileutils'
+require 'pindo/client/feishuclient'
+require 'pindo/module/build/buildhelper'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  class Command
+    class Dev < Command
+      class Feishu < Dev
+        self.summary = '发送飞书消息'
+
+        # 命令的详细说明,包含用法示例
+        self.description = <<-DESC
+            发送飞书消息到指定的飞书群。
+
+            使用示例:
+                $ pindo dev feishu "要发送的消息"
+                $ pindo dev feishu -w WEBHOOK_URL -s SECRET "要发送的消息"
+        DESC
+
+        # 命令的参数列表
+        self.arguments = []
+
+        # 命令的选项列表
+        def self.options
+          [
+            ['--webhook',  '使用feishu 机器人的webhook url'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          super
+          @webhook_url = argv.option('webhook')
+          # @webhook_url = 'https://open.feishu.cn/open-apis/bot/v2/hook/dbffda6e-a809-4e79-9652-c427c93ffe62'
+          # @secret = 'VoC4vVmhwWs676zK62NK8d'
+          @secret = nil
+          @message = argv.shift_argument || "测试消息"
+        end
+
+        def validate!
+          super
+          help! '请提供要发送的消息内容' unless @message
+        end
+        
+        def run
+
+          pindo_project_dir = Dir.pwd
+          if @webhook_url.nil? || @webhook_url.empty?
+            if is_git_directory?(local_repo_dir: pindo_project_dir)
+              current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
+              if File.exist?(File.join(current_git_root_path, 'feishu.json'))
+                feishu_config = JSON.parse(File.read(File.join(current_git_root_path, 'feishu.json')))
+                @webhook_url = feishu_config['webhook_url']
+                @secret = feishu_config['secret']
+              end
+            end
+
+            if @webhook_url.nil? || @webhook_url.empty?
+              @webhook_url = ask("请输入飞书webhook url:")
+              if is_git_directory?(local_repo_dir: pindo_project_dir)
+                current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
+                feishu_config = {webhook_url: @webhook_url, secret: @secret}
+                File.write(File.join(current_git_root_path, 'feishu.json'), JSON.pretty_generate(feishu_config))
+                Dir.chdir(current_git_root_path)
+                current_branch = git!(%W(-C #{current_git_root_path} rev-parse --abbrev-ref HEAD)).strip
+                git!(%W(-C #{current_git_root_path} add feishu.json))
+                commit_message = "docs: 添加飞书webhook url".encode('UTF-8')
+                git!(%W(-C #{current_git_root_path} commit -m #{commit_message}))
+                git!(%W(-C #{current_git_root_path} push origin #{current_branch}))
+                puts "添加飞书webhook url成功"
+              end
+            end
+
+          end
+          puts "webhook_url: #{@webhook_url}"
+          puts "secret: #{@secret}"
+          puts
+          puts "正在发送飞书消息..."
+
+
+          build_helper = Pindo::BuildHelper.share_instance
+          build_helper.check_check_and_install_cliff(pindo_project_dir)
+          is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+          if is_need_add_tag
+              Pindo::Command::Dev::Tag::run(tag_action_parms) 
+          end
+
+          unless @webhook_url.nil? || @webhook_url.empty?
+            @client = Pindo::FeishuClient.new(@webhook_url, @secret)
+          end
+
+          markdown_content = PgyerHelper.share_instace.get_description_from_git(current_project_dir:pindo_project_dir)
+          puts
+          puts "#{markdown_content}"  
+          puts
+          if !markdown_content.nil? && !markdown_content.empty?
+            @client.send_markdown(nil, markdown_content)
+            # @client.send_rich_text("1111", markdown_content)
+          end
+
+        end
+
+
+
+
+      end
+    end
+  end
+end

data/lib/pindo/command/dev.rb

@@ -6,7 +6,7 @@ require 'pindo/command/dev/debug'
 require 'pindo/command/dev/autobuild'
 require 'pindo/command/dev/build'
 require 'pindo/command/dev/repoinit'
-
+require 'pindo/command/dev/feishu'
 
 module Pindo
     class Command

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

@@ -211,7 +211,7 @@ module Pindo
                         end
                     end
                     
-                    system "open #{project_dir}"
+                    system "open #{pindo_project_dir}"
 
                 end
 

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

@@ -126,6 +126,8 @@ module Pindo
                             end
                         end
                     end
+
+                    system "open #{pindo_project_dir}"
                 end
 
             end

data/lib/pindo/module/build/buildhelper.rb

@@ -37,6 +37,7 @@ module Pindo
           gitignore_content = <<~GITIGNORE
             # Build logs
             build_ios.log
+            feishu.json
             CHANGELOG.md
 
             # Platform specific directories

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.9.6"
+  	VERSION = "5.0.0"
 
   	class VersionCheck
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.9.6
+  version: 5.0.0
 platform: ruby
 authors:
 - wade
@@ -235,6 +235,7 @@ files:
 - lib/pindo/client/aws3sclient.rb
 - lib/pindo/client/bossclient.rb
 - lib/pindo/client/bossconfigclient.rb
+- lib/pindo/client/feishuclient.rb
 - lib/pindo/client/giteeclient.rb
 - lib/pindo/client/httpclient.rb
 - lib/pindo/client/pgyerclient.rb
@@ -277,6 +278,7 @@ files:
 - lib/pindo/command/dev/autobuild.rb
 - lib/pindo/command/dev/build.rb
 - lib/pindo/command/dev/debug.rb
+- lib/pindo/command/dev/feishu.rb
 - lib/pindo/command/dev/repoinit.rb
 - lib/pindo/command/dev/tag.rb
 - lib/pindo/command/env.rb