lhj-tools 0.2.24 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253e532b62ca8fd6c1b10281d9dfc87cb2f1a40abbd185f66066abc72b7cd72d
-  data.tar.gz: 3b67e5cfb736805d1b078b72efe4cab2d8f28848c77e8b3d049fbf6dfc227648
+  metadata.gz: 16224374a128ff4316f5553b1d5baa614e23d4e13bc1deadbbf3ca2e2e891dd8
+  data.tar.gz: d312a877fc8e1e32964b985aa9d302ff903a36aad3da75cc20796000582771cb
 SHA512:
-  metadata.gz: f23ae53bdd2047b055f1baec787b67a21684b42f23f1004c503ebcfc157670fd6d09c58f774a7a3fad374371ae474b534cc616835da73ea53595a40047fa321f
-  data.tar.gz: 7ddab83f382970b112d558ec7b410def3530281cc321dc3f77af73d5c342ade9f600779870e9ced7bfe78c6d3c6c15c58d205e4b1ef3a5f0c34f2f013258f5f3
+  metadata.gz: f69613a09746ac7ab39733e3a1fc657ddbc463a7bcc0efaf6954fb32edff46120b6d819d354e641b450ad45a57630a50d1944c6f8091cf3a589d6e16faeb0544
+  data.tar.gz: 3e4c95527e71b21d3612aa31ea8dd549f268c7a6e6e0d8076a91a57163deed8f5658c8043bc6321b47674939927f1e91019f7f22b34c40113b4139805a8248b4

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

@@ -1,4 +1,5 @@
 require 'jenkins_api_client'
+require 'nokogiri'
 
 module Lhj
   class Command
@@ -30,34 +31,99 @@ module Lhj
       end
 
       def handle
-        d = {
-          "data": {
-            "attributes": {
-              "email": "878943972@qq.com",
-              "firstName": "li",
-              "lastName": "haijian"
+        job_name = 'aom_uat_haijian'
+        # job_name = 'aom_uat_haijian'
+        server_ip = Lhj::JenkinsConfig.server_ip
+        server_port = Lhj::JenkinsConfig.server_port
+        username = Lhj::JenkinsConfig.username
+        password = Lhj::JenkinsConfig.password
+        client = JenkinsApi::Client.new(server_ip: server_ip, server_port: server_port, username: username, password: password)
+
+        client.job.list_all.each do |a|
+          add_property(client, a, 'WEBHOOK', 'https://oapi.dingtalk.com/robot/sendBySession?session=bd640dea6cd28b6c880c4f3cc0945c8f', 'Webhook url')
+        end
+        # puts client.job.get_config('aomi_uat')
+        #
+      end
+
+      def update_job(client, job_name, param_key, param_value, param_desc)
+        xml = client.job.get_config(job_name)
+        n_xml = Nokogiri::XML(xml)
+        params = n_xml.xpath('//parameterDefinitions').first
+        string_params = params.children.select { |p| p.name.eql?('hudson.model.StringParameterDefinition') }
+        param = string_params.find { |p| p.children.find { |c| c.name.eql?('name') && c.content.eql?(param_key) } }
+        has_desc = false
+        param.children.each do |p|
+          has_desc = true if p.name.eql?('description')
+          p.content = param_value if p.name.eql?('defaultValue')
+          p.content = param_desc if p.name.eql?('description')
+          p.content = 'true' if p.name.eql?('trim')
+        end
+        param.add_child("<description>#{param_desc}</description>") unless has_desc
+        xml_modified = n_xml.to_xml
+        client.job.post_config(job_name, xml_modified)
+      end
+
+      def add_property(client, job_name, param_key, param_value, param_desc)
+        xml = client.job.get_config(job_name)
+        n_xml = Nokogiri::XML(xml)
+        params = n_xml.xpath('//parameterDefinitions').first
+        return if params
+
+        pro = n_xml.xpath('//properties').first
+        c_xml = <<~DESC
+          <hudson.model.ParametersDefinitionProperty>
+              <parameterDefinitions>
+                <hudson.model.StringParameterDefinition>
+                  <name>WEBHOOK</name>
+                  <description>webhook url</description>
+                  <defaultValue>https://oapi.dingtalk.com/robot/sendBySession?session=cd8539f8472e2f5d39a6beef94ffc569</defaultValue>
+                  <trim>true</trim>
+                </hudson.model.StringParameterDefinition>
+              </parameterDefinitions>
+            </hudson.model.ParametersDefinitionProperty>
+        DESC
+        pro.add_child(c_xml)
+        xml_modified = n_xml.to_xml
+        client.job.post_config(job_name, xml_modified)
+      end
+
+      def create_tester(email, id)
+        names = email.split('@') if email =~ /@/
+        first_name = names[1] if names && names.length > 1
+        last_name = names[0] if names&.length&.positive?
+        first_name ||= 'first'
+        last_name ||= 'last'
+        post_data = {
+          'data' => {
+            'attributes' => {
+              'email' => email,
+              'firstName' => first_name,
+              'lastName' => last_name
             },
-            "relationships": {
-              "builds": {
-                "data": [
+            'relationships' => {
+              'betaGroups' => {
+                'data' => [
                   {
-                    "id": "0cd7ac82-b2d9-4772-bfa1-0ff6e8037f7d",
-                    "type": "builds"
+                    'id' => id,
+                    'type' => 'betaGroups'
                   }
                 ]
               }
             },
-            "type": "betaTesters"
+            'type' => 'betaTesters'
           }
         }
-        res = Lhj::ConnectAPI.post('https://api.appstoreconnect.apple.com/v1/betaTesters', d)
-        puts res.read_body
+        res = Lhj::ConnectAPI.post('https://api.appstoreconnect.apple.com/v1/betaTesters', post_data)
+        res_body = JSON.parse(res.body)
+        puts 'success' if res_body['data']
+      end
 
-        # 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)
+      def all_group
+        res = Lhj::ConnectAPI.get('https://api.appstoreconnect.apple.com/v1/betaGroups')
+        res_body = JSON.parse(res.body)
+        names =  res_body['data'].map { |item| { id: item['id'], name: item['attributes']['name'] } }
+        names.each { |a| puts a[:name] + '---' + a[:id]  }
       end
     end
   end

data/lib/lhj/command/yapi.rb

@@ -30,6 +30,7 @@ module Lhj
         @id = argv.option('id')
         @model_pre_name = argv.option('model-pre')
         @model_result_name = argv.option('model-name')
+        @webhook = argv.option('webhook')
         @language = argv.option('lan', 'oc')
         @save = argv.flag?('save', false)
         @sync = argv.flag?('sync', false)
@@ -241,7 +242,7 @@ module Lhj
       end
 
       def robot_url
-        @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+        @webhook || @config_robot_url || 'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
       end
 
       def property_mapper

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.26
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-02-22 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: 2.3.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement