lhj-tools 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 052fc9182b82f2f6595458752a58cbf368d4ecad37c40300e6b837b5d257aa8d
-  data.tar.gz: 5e5110997bc75ab7612047d54d3828e6190cbfc666f700bf2c399c0f2ecb4819
+  metadata.gz: e98ba9e3b82c4ba4d49cef41166bdd1f8c32a36376f9987712a48e674af350ca
+  data.tar.gz: 68e482442564ebfb85ce6ed64be267c83c92f4c7aa40db1b60db7a58ad1a292d
 SHA512:
-  metadata.gz: 52b51878b4c58abbc55c3a8a991d1a8b75c42e92b49ef3af3828c03478b890e9fac6a102421b9fc2b8bdb694fb1bb788070147c774be376e670eb9c0a39acfb9
-  data.tar.gz: d92a4ff5ce3f8eb74c9fdf79da7faa43f5c7a3f0ccae11d93032eb69efdf0338aabf44768457afc25c599466f704fa9170c9c1a99dbaac834739ab7dac75f2e1
+  metadata.gz: c0295568b128c55159b956c306005ffdf895dfe90174c49bae6698fdb965bd6478976cbaf6ead1ae0f9222b242422eaefbeb81183b73aab1eb2fcbaff95c1fd1
+  data.tar.gz: 10632f0e6ed6aadc73d7e7a4d87a0eb0677c77cfc3ab18b91404e42ef3bd6cedfbd3f5f8315c167b64805a2416880ce67d8fb7cef5d2e7e8ff5498a6628451cc

data/lib/lhj/command/{jenkins_build.rb → jenkins/jenkins_build.rb}

@@ -1,3 +1,4 @@
+require 'jenkins_api_client'
 
 module Lhj
   class Command
@@ -29,8 +30,11 @@ module Lhj
       end
 
       def handle
-        client = Lhj::JenkinsApi::Client.new(:server_url => @server_url)
-        client.job.build(@job)
+        client = JenkinsApi::Client.new(server_ip: '47.97.61.232', server_port: 8080, username: 'aomi', password: '11e5ddb4c71a61abf66ed0ab4c08090794')
+        # puts client.user.get('aomi')
+        # puts client.job.list_all
+        # client.job.build('aomi_uat')
+        puts client.job.get_console_output('aomi_uat', 253)
       end
     end
   end

data/lib/lhj/command.rb

@@ -34,7 +34,7 @@ module Lhj
     require 'lhj/command/sync_pod_code'
     require 'lhj/command/pgyer_upload'
     require 'lhj/command/duplicate_imageset'
-    require 'lhj/command/jenkins_build'
+    require 'lhj/command/jenkins/jenkins_build'
 
     self.abstract_command = true
     self.command = 'lhj'

data/lib/lhj/helper/bugly_helper.rb

@@ -3,7 +3,7 @@ module Lhj
   # bugly helper
   class BuglyHelper
 
-    BUGLY_JAR = 'buglyqq-upload-symbol.jar'
+    BUGLY_JAR = 'buglyqq-upload-symbol.jar'.freeze
 
     def self.upload_sym(app_id, app_key, bundle_id, version, input_symbol)
       file = File.join(Lhj::Config.instance.home_dir, BUGLY_JAR)
@@ -11,6 +11,8 @@ module Lhj
 
       # zip_path = Dir['*.app.dSYM.zip'].first
       # Action.sh("unzip -qo '#{zip_path}' -d dsym") if zip_path
+      sym_path = input_symbol
+      sym_path = input_symbol.shellescape if %r{[^A-Za-z0-9_\-.,:+/@\n]} =~ input_symbol
 
       command = %w[java -jar]
       command << "#{Lhj::Config.instance.home_dir}/#{BUGLY_JAR}"
@@ -19,7 +21,7 @@ module Lhj
       command << "-bundleid #{bundle_id}"
       command << "-version #{version}"
       command << '-platform IOS'
-      command << "-inputSymbol #{input_symbol}"
+      command << "-inputSymbol #{sym_path}"
       # puts command.join(' ')
       Actions.sh(command.join(' '), log: true)
     end

data/lib/lhj/helper/traditional_check_helper.rb

@@ -0,0 +1,61 @@
+module Lhj
+  class TraditionalCheckHelper
+    def self.check(path, ignore_path, type = 'm,h,pch,xib')
+      ignore_file = File.join(ignore_path, '.checkignore')
+      ignore_list = []
+      ignore_list = File.readlines(ignore_file) if File.exist?(ignore_file)
+      check_ignore(path, type: type, ignore: ignore_list)
+    end
+
+    def self.check_ignore(path, type: 'm,h,pch,xib', ignore: [])
+      result = {}
+      all_files = Dir.glob("#{path}/**/*.{#{type}}").reject do |p|
+        p =~ /Pods/ || ignore.include?(File.basename(p))
+      end
+      all_files.each do |f|
+        infos = handle_file(f)
+        next unless infos.length.positive?
+
+        result[File.basename(f)] = infos
+      end
+      notify(result) if result.keys.length.positive?
+    end
+
+    def self.show_result(result)
+      result.each do |k, v|
+        puts k
+        v.each do |o|
+          puts "第#{o[:idx]}行:"
+          puts o[:cn]
+          puts o[:hk]
+        end
+      end
+    end
+
+    def self.handle_file(file)
+      result = []
+      File.open(file, 'r') do |f|
+        f.readlines.each_with_index do |line, idx|
+          next if line =~ %r{//}
+          next unless line =~ /[\u4e00-\u9fa5]/
+          next unless Lhj::Trans::Helper.instance.contain_zh_hk(line)
+
+          result << { idx: idx, cn: line.strip, hk: Lhj::Trans::Helper.instance.trans_zh_hk_str(line).strip }
+        end
+      end
+      result
+    end
+
+    def self.robot_url
+      'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+    end
+
+    def self.notify(result)
+      temp = Lhj::ErbTemplateHelper.load('traditional_code_notify')
+      temp_result = Lhj::ErbTemplateHelper.render(temp, { result: result })
+      puts temp_result
+      Lhj::Dingtalk.post_message_robot(robot_url, 'check code', temp_result)
+    end
+
+  end
+end

data/lib/lhj/helper/trans_helper.rb

@@ -32,6 +32,15 @@ module Lhj
         end
       end
 
+      # contain hk char
+      def contain_zh_hk(input)
+        @trans_map ||= load_trans_map
+        input.each_char do |c|
+          return true if @trans_map[c]
+        end
+        false
+      end
+
       def trans_zh_cn_str(input)
         @trans_map_invert ||= load_trans_map.invert
         out = []

data/lib/lhj/lhj.rb

@@ -4,17 +4,13 @@ require 'colored'
 require 'xcodeproj'
 
 module Lhj
-  require 'lhj/jenkins/urihelper'
-  require 'lhj/jenkins/exceptions'
-  require 'lhj/jenkins/client'
-  require 'lhj/jenkins/job'
-
   require 'lhj/env'
   require 'lhj/ui/ui'
   require 'lhj/config'
   require 'lhj/helper/pod_repo_config'
   require 'lhj/helper/git_branch_feature_config'
   require 'lhj/helper/erb_template_helper'
+  require 'lhj/helper/trans_helper'
   require 'lhj/helper/pgyer_helper'
   require 'lhj/helper/pgyer_shortcut_helper'
   require 'lhj/helper/dingtalk_helper'
@@ -25,6 +21,7 @@ module Lhj
   require 'lhj/helper/vika_helper'
   require 'lhj/helper/app_version_info'
   require 'lhj/helper/bugly_helper'
+  require 'lhj/helper/traditional_check_helper'
 
   class Error < StandardError; end
 

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -330,6 +330,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.6
+- !ruby/object:Gem::Dependency
+  name: jenkins_api_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 description: lhj tools.
 email:
 - sanan.li@qq.com
@@ -353,7 +367,7 @@ files:
 - lib/lhj/command/head_import.rb
 - lib/lhj/command/http.rb
 - lib/lhj/command/init.rb
-- lib/lhj/command/jenkins_build.rb
+- lib/lhj/command/jenkins/jenkins_build.rb
 - lib/lhj/command/local/fetch.rb
 - lib/lhj/command/local/filter.rb
 - lib/lhj/command/local/local.rb
@@ -398,13 +412,10 @@ files:
 - lib/lhj/helper/tb_config.rb
 - lib/lhj/helper/tb_helper.rb
 - lib/lhj/helper/team_member_config.rb
+- lib/lhj/helper/traditional_check_helper.rb
 - lib/lhj/helper/trans_helper.rb
 - lib/lhj/helper/vika_config.rb
 - lib/lhj/helper/vika_helper.rb
-- lib/lhj/jenkins/client.rb
-- lib/lhj/jenkins/exceptions.rb
-- lib/lhj/jenkins/job.rb
-- lib/lhj/jenkins/urihelper.rb
 - lib/lhj/lhj.rb
 - lib/lhj/tree/directory_renderer.rb
 - lib/lhj/tree/hash_walker.rb