lhj-tools 0.2.21 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d92373d88f6e90f29c2308e3fbe6fd42903d5c7947f42828fbec672443b3b1c
-  data.tar.gz: '09ed5835f82cd5637fdf7b2c14e472f0db006f6ba27d2eff64573b8c1d8b0826'
+  metadata.gz: 253e532b62ca8fd6c1b10281d9dfc87cb2f1a40abbd185f66066abc72b7cd72d
+  data.tar.gz: 3b67e5cfb736805d1b078b72efe4cab2d8f28848c77e8b3d049fbf6dfc227648
 SHA512:
-  metadata.gz: 3d85f58abacfc19ce29a04e413a01342878e0a554e6cd676c6d66c7086385150d61fc37a2d98bc9414f364b8d1f6059a82fed1e03df3fd8d16802009039768dd
-  data.tar.gz: 04cac72389288dd69c0b88ed1cfa5e66a42e633829c6b2ccaf073afea1e4385fad401a35529d15d6cfd5e12ea89ef09a067ef25fddf3332b5de91f1abcc89224
+  metadata.gz: f23ae53bdd2047b055f1baec787b67a21684b42f23f1004c503ebcfc157670fd6d09c58f774a7a3fad374371ae474b534cc616835da73ea53595a40047fa321f
+  data.tar.gz: 7ddab83f382970b112d558ec7b410def3530281cc321dc3f77af73d5c342ade9f600779870e9ced7bfe78c6d3c6c15c58d205e4b1ef3a5f0c34f2f013258f5f3

data/lib/lhj/command/jenkins/jenkins_build.rb

@@ -30,11 +30,34 @@ module Lhj
       end
 
       def handle
-        client = JenkinsApi::Client.new(server_ip: '47.97.61.232', server_port: 8080, username: 'aomi', password: '11e5ddb4c71a61abf66ed0ab4c08090794')
+        d = {
+          "data": {
+            "attributes": {
+              "email": "878943972@qq.com",
+              "firstName": "li",
+              "lastName": "haijian"
+            },
+            "relationships": {
+              "builds": {
+                "data": [
+                  {
+                    "id": "0cd7ac82-b2d9-4772-bfa1-0ff6e8037f7d",
+                    "type": "builds"
+                  }
+                ]
+              }
+            },
+            "type": "betaTesters"
+          }
+        }
+        res = Lhj::ConnectAPI.post('https://api.appstoreconnect.apple.com/v1/betaTesters', d)
+        puts res.read_body
+
+        # client = JenkinsApi::Client.new(server_ip: 'ip', server_port: 0, username: 'xx', password: 'xx')
         # puts client.user.get('aomi')
         # puts client.job.list_all
         # client.job.build('aomi_uat')
-        puts client.job.get_console_output('aomi_uat', 253)
+        # puts client.job.get_console_output('aomi_uat', 253)
       end
     end
   end

data/lib/lhj/command/yapi.rb

@@ -66,7 +66,7 @@ module Lhj
           end
         end
         unless res_body['errcode'].to_i.zero?
-          puts '请执行 lhj yapi-init 初始化配置'.red
+          Actions.sh('lhj yapi-init', log: false)
           return
         end
         return unless res_body && !res_body.empty?

data/lib/lhj/helper/apple/apple_connect_api.rb

@@ -0,0 +1,48 @@
+require 'jwt'
+require 'openssl'
+
+module Lhj
+  class ConnectAPI
+
+    def self.token
+      key_file = File.binread(Lhj::AppleJWTConfig.private_key_file)
+      key = OpenSSL::PKey::EC.new(key_file)
+      expiration = Time.now + 500
+      header = { kid: Lhj::AppleJWTConfig.key_id }
+      payload = {
+        iss: Lhj::AppleJWTConfig.issuer_id,
+        exp: expiration.to_i,
+        aud: 'appstoreconnect-v1'
+      }
+      JWT.encode(payload, key, 'ES256', header)
+    end
+
+    def self.get(url)
+      uri = URI(url)
+
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Get.new(uri)
+      jwt_token = token
+      request['authorization'] = "Bearer #{jwt_token}"
+
+      https.request(request)
+    end
+
+    def self.post(url, data = {})
+      uri = URI(url)
+
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Post.new(uri)
+      jwt_token = token
+      request['authorization'] = "Bearer #{jwt_token}"
+      request['Content-Type'] = 'application/json'
+      request.body = JSON.dump(data)
+
+      https.request(request)
+    end
+  end
+end

data/lib/lhj/helper/apple/apple_jwt_config.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'yaml'
+
+module Lhj
+  # Apple jwt Config
+  class AppleJWTConfig
+
+    CONFIG_NAME = 'apple_jwt_config.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+    def self.login_email
+      config['login_email']
+    end
+
+    def self.login_password
+      config['login_password']
+    end
+
+    def self.issuer_id
+      config['issuer_id']
+    end
+
+    def self.key_id
+      config['key_id']
+    end
+
+    def self.private_key
+      config['private_key']
+    end
+
+    def self.private_key_url
+      config['private_key_url']
+    end
+
+    def self.private_key_file
+      File.expand_path(File.join(Lhj::Config.instance.home_dir, "AuthKey_#{key_id}.p8"))
+    end
+  end
+end

data/lib/lhj/helper/bugly_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Lhj
   # bugly helper

data/lib/lhj/helper/chat_gpt_config.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'yaml'
+
+module Lhj
+  # chat gpt Config
+  class ChatGptConfig
+
+    CONFIG_NAME = 'chat_gpt_config.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+    def self.api_key(idx)
+      i = idx % config.length
+      config[i]['api_key']
+    end
+
+    def self.org_id(idx)
+      i = idx % config.length
+      config[i]['org_id']
+    end
+  end
+end

data/lib/lhj/helper/ios_robot_config.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require 'yaml'
+
+module Lhj
+  # ios Robot Config
+  class IOSRobotConfig
+
+    CONFIG_NAME = 'robot_notify_config.yml'
+
+    def self.config_file
+      File.join(Lhj::Config.instance.home_dir, CONFIG_NAME)
+    end
+
+    def self.config
+      @yaml ||= YAML.load_file(config_file)
+    end
+
+    def self.fetch_robot_url(conversation)
+      url = config[0]['robot_url']
+      robot = config.find { |r| r['conversation_title'].eql?(conversation) } if conversation
+      url = robot['robot_url'] if robot && robot['robot_url']
+      url
+    end
+
+    def self.fetch_robot_title(conversation)
+      title = '信息来自iOS机器人'
+      robot = config.find { |r| r['conversation_title'].eql?(conversation) } if conversation
+      title = robot['message_title'] if robot && robot['message_title']
+      title
+    end
+
+    def self.fetch_robot_message_type(conversation)
+      type = :markdown
+      robot = config.find { |r| r['conversation_title'].eql?(conversation) } if conversation
+      type = :text if robot && robot['message_type'] && robot['message_type'].eql?('text')
+      type
+    end
+  end
+end

data/lib/lhj/lhj.rb

@@ -8,6 +8,10 @@ module Lhj
   require 'lhj/ui/ui'
   require 'lhj/config'
   require 'lhj/helper/jenkins_config'
+  require 'lhj/helper/apple/apple_jwt_config'
+  require 'lhj/helper/apple/apple_connect_api'
+  require 'lhj/helper/ios_robot_config'
+  require 'lhj/helper/chat_gpt_config'
   require 'lhj/helper/pod_repo_config'
   require 'lhj/helper/git_branch_feature_config'
   require 'lhj/helper/erb_template_helper'

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.21'
+  VERSION = '0.2.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.24
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -381,12 +381,16 @@ files:
 - lib/lhj/config.rb
 - lib/lhj/env.rb
 - lib/lhj/helper/app_version_info.rb
+- lib/lhj/helper/apple/apple_connect_api.rb
+- lib/lhj/helper/apple/apple_jwt_config.rb
 - lib/lhj/helper/bugly_helper.rb
+- lib/lhj/helper/chat_gpt_config.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/erb_template_helper.rb
 - lib/lhj/helper/git_branch_feature_config.rb
 - lib/lhj/helper/git_helper.rb
+- lib/lhj/helper/ios_robot_config.rb
 - lib/lhj/helper/jenkins_config.rb
 - lib/lhj/helper/local_config.rb
 - lib/lhj/helper/log_helper.rb