lhj-tools 0.2.20 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69527af7e6d31836627134b3476c1edb79e592cc1563618470fc9555c2a9278a
-  data.tar.gz: bb04571a3ea807688bc5c740eac5ff7002fb8482e62a1aab26a4bdecb9a2996a
+  metadata.gz: 913995d83466a643c887e8ffe02fa7789b36992f53db19188711f845ad81c1e0
+  data.tar.gz: e21d8840c06763330eac1878bc823cac0fb678826feaea7ff76ce2c662043c06
 SHA512:
-  metadata.gz: 1ca7a1305f8c7409180e51b9d844e64f082fc798ce9cec6dc4e751dae395699da10e2e6024ea284819fe98e356ebc1046dbfd73b3a24e729dc678a966b3423ff
-  data.tar.gz: 25e245b12c8ab42bf98e317cb5c61c6842729cbef8460386c2e6543f54c2f160e88cb7dcf0da237b12da245cd427148e0ed7a3913996804287bacab33c36ddea
+  metadata.gz: 8b8ea86ee8c5ffb0f40e9ee60f39d1ee73713420fa5e31462ab067c3fbc2fed1057dfaa446762bda09c379306a1095ee14abf9e06a46ed4fad6d59ba6d83ef96
+  data.tar.gz: 9d978201993f562cdda911ba7662ac19000f83a4b5af3e0f8e69484f6c9fec7026b4294a44a69f03e03105dfdc9d6cd7308ef691e684f4eb01eb73de2a94217d

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

@@ -1,4 +1,5 @@
 require 'jenkins_api_client'
+require 'lhj/helper/apple/token'
 
 module Lhj
   class Command
@@ -30,11 +31,14 @@ module Lhj
       end
 
       def handle
-        client = JenkinsApi::Client.new(server_ip: '47.97.61.232', server_port: 8080, username: 'aomi', password: '11e5ddb4c71a61abf66ed0ab4c08090794')
+        res = Lhj::ConnectAPI.get('https://api.appstoreconnect.apple.com/v1/apps')
+        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_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/apple/token.rb

@@ -0,0 +1,33 @@
+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
+  end
+end

data/lib/lhj/lhj.rb

@@ -8,6 +8,7 @@ module Lhj
   require 'lhj/ui/ui'
   require 'lhj/config'
   require 'lhj/helper/jenkins_config'
+  require 'lhj/helper/apple/apple_jwt_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.20'
+  VERSION = '0.2.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.23
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -252,16 +252,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -381,6 +381,8 @@ files:
 - lib/lhj/config.rb
 - lib/lhj/env.rb
 - lib/lhj/helper/app_version_info.rb
+- lib/lhj/helper/apple/apple_jwt_config.rb
+- lib/lhj/helper/apple/token.rb
 - lib/lhj/helper/bugly_helper.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb