lhj-tools 0.1.27 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a31460c814e1615aaefd473d2553acb40523e966f00ee37872db81d06466e0
-  data.tar.gz: d6f3348a4ce8c2a77e2a3d9e8ad6ce6393cbc4ae04b9c39d3c7cd31e19b5e45b
+  metadata.gz: d687a5f900925541da6435425f42e505ff3d80abcab177e1c5a619082da05b6a
+  data.tar.gz: 593fcf17a101528199b43cc9905865e94d185ba687e81f2733623a99c512981c
 SHA512:
-  metadata.gz: 1d722e7e3e748415b3a63e912940a2f5b84e5b4e4d7e87095a52e93204971851c9fa5decc5749d51e3b6ddafd23818844d9bb3090498b60239da0962c6a390ec
-  data.tar.gz: 22eb054aa18a58b9b926d55af8a76419efbc82569eb60cf4a34c1f5aa8ce6630b1de9545916c1dc6a132edbd9606a838d1fbf602f111426e1f622a3dd67cf328
+  metadata.gz: b4d2b8d1da73e9a0906501f26a419a7f7bde4195d428bd30b2c2e119d2c18882430e69015dacc9e88e1dc1a5c50ae986201cec584213230bc5c298bbe0331423
+  data.tar.gz: 1f1d936c41971b3ab3214c8eea90c49cbac6931e8c4b8174a11ae083d09cab9ad4ee0b3c05f718545d9763ffd07bb4b15c67f2c750bfa8a4dd2b8d53c1610ae0

data/lib/lhj/command/duplicate_imageset.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require 'csv'
+
+module Lhj
+  class Command
+    class DuplicateImageset < Command
+      self.summary = '查找重复的图片资源'
+
+      def initialize(argv)
+        @current_path = argv.shift_argument || Dir.pwd
+        super
+      end
+
+      def handle
+        write_to_file
+      end
+
+      def write_to_file
+        map = fetch_images
+        file = File.join(@current_path, 'images.cvs')
+        FileUtils.rm_rf(file) if File.exist?(file)
+        CSV.open(file, 'wb:utf-8') do |csv|
+          csv << ['所在模块']
+          map.each do |k, v|
+            csv << [v.join(', ')] if v.length > 1
+          end
+        end
+      end
+
+      def fetch_images
+        image_map = {}
+        Dir.glob("#{@current_path}/**/Assets.xcassets/**/*.imageset").each do |f|
+          image_name = File.basename(f, '.*')
+          models = image_map[image_name.to_sym]
+          unless models
+            models = []
+            image_map[image_name.to_sym] = models
+          end
+          models << model_name_with_path(f)
+        end
+        image_map
+      end
+
+      def model_name_with_path(path)
+        reg = %r{Code/([^/]*)/}
+        reg = %r{Pods/([^/]*)/} if path =~ /Pods/
+        ma = path.match(reg)
+        ma[1]
+      end
+
+    end
+  end
+end

data/lib/lhj/command.rb

@@ -26,6 +26,7 @@ module Lhj
     require 'lhj/command/sync_pod_repo'
     require 'lhj/command/sync_pod_version'
     require 'lhj/command/pgyer_upload'
+    require 'lhj/command/duplicate_imageset'
 
     self.abstract_command = true
     self.command = 'lhj'

data/lib/lhj/helper/dingtalk_config.rb

@@ -19,5 +19,9 @@ module Lhj
     def self.dingtalk_robot
       config['dingtalk_robot']
     end
+
+    def self.git_branch
+      config['git_branch']
+    end
   end
 end

data/lib/lhj/helper/dingtalk_helper.rb

@@ -8,7 +8,25 @@ module Lhj
     def self.post_message(title, message)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
       http_body = { 'msgtype' => 'markdown', 'markdown' => { 'title' => title, 'text' => message } }.to_json
+      http_post(robot_url, http_body)
+      post_branch_message(http_body)
+    end
+
+    def self.post_branch_message(http_body)
+      branch_name = fetch_branch
+      branch_map = Lhj::DingTalkConfig.git_branch
+      branch_robot_key = branch_map[branch_name] if branch_map && branch_name
+      branch_robot_url = Lhj::DingTalkConfig.config[branch_robot_key] if branch_robot_key
+      http_post(branch_robot_url, http_body) if branch_robot_url
+    end
+
+    def self.http_post(robot_url, http_body)
       Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
     end
+
+    def self.fetch_branch
+      name = Lhj::Actions.git_branch || ''
+      name.split('/').last
+    end
   end
 end

data/lib/lhj/helper/git_branch_feature_config.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # Git BranchFeature Config
+  class GitBranchFeatureConfig
+
+    CONFIG_NAME = 'git_branch_feature.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.feature(branch)
+      config[branch] if config
+    end
+  end
+end

data/lib/lhj/helper/log_helper.rb

@@ -1,9 +1,10 @@
 require 'lhj/helper/team_member_config'
+require 'lhj/helper/git_branch_feature_config'
 
 module Lhj
   # log helper
   class LogHelper
-    attr_reader :branch, :env, :log
+    attr_reader :branch, :env, :log, :feature
 
     def self.instance
       @instance ||= new
@@ -13,6 +14,7 @@ module Lhj
       @branch = fetch_branch
       @env = fetch_env(env)
       @log = fetch_log
+      @feature = fetch_feature
       save_last_commit_hash
       render_template
     end
@@ -22,6 +24,10 @@ module Lhj
       name.split('/').last
     end
 
+    def fetch_feature
+      Lhj::GitBranchFeatureConfig.feature(@branch)
+    end
+
     def fetch_env(env)
       case env
       when :release

data/lib/lhj/helper/tb_helper.rb

@@ -14,8 +14,11 @@ module Lhj
       str = note
       if /#.+#/ =~ note
         note.scan(/#[^#]+#/) do |m|
-          res_body = req_with_task(m.match(/\d+/)[0])
-          if res_body['code'].to_i == 200
+          ma = m.match(/\d+/)
+          next if !ma || !ma[0] || ma[0].length <= 0
+
+          res_body = req_with_task(ma[0])
+          if res_body && res_body['code'].to_i == 200
             url_str = "[#{res_body['result'][0]['content']}](https://www.teambition.com/task/#{res_body['result'][0]['taskId']})"
             str = str.gsub(m, url_str)
           end

data/lib/lhj/helper/vika_config.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # Ding Talk Config
+  class VikaConfig
+
+    CONFIG_NAME = 'vika_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.datasheet_id
+      config['datasheet_id']
+    end
+
+    def self.view_id
+      config['view_id']
+    end
+
+    def self.record_id
+      config['record_id']
+    end
+
+    def self.authorization
+      config['authorization']
+    end
+  end
+end

data/lib/lhj/helper/vika_helper.rb

@@ -0,0 +1,29 @@
+require 'lhj/helper/vika_config'
+require 'json'
+require 'lhj/config'
+
+module Lhj
+  # pgyer upload
+  class VikaHelper
+
+    RECORDS_API_URL = 'https://api.vika.cn/fusion/v1/datasheets/dstmDXBooTe1Wj0QqE/views'.freeze
+
+    def self.records
+      url = URI(RECORDS_API_URL)
+
+      https = Net::HTTP.new(url.host, url.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Get.new(url)
+      request["Authorization"] = "Bearer usk3cvEicoXG84y32J61BRg"
+
+      response = https.request(request)
+      File.write(File.join(Lhj::Config.instance.home_dir, 'vika_all_records.json'), JSON.parse(response.read_body))
+    end
+
+    def self.all_records
+      map = {'v6.2.0' => '月底发版分支'}
+      puts map.to_yaml
+    end
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.27"
+    VERSION = "0.1.30"
   end
 end

data/lib/lhj/tools.rb

@@ -12,12 +12,14 @@ module Lhj
   require 'lhj/ui/ui'
   require 'lhj/config'
   require 'lhj/helper/pod_repo_config'
+  require 'lhj/helper/git_branch_feature_config'
   require 'lhj/helper/pgyer_helper'
   require 'lhj/helper/dingtalk_helper'
   require 'lhj/helper/tb_helper'
   require 'lhj/action/sh_helper'
   require 'lhj/helper/git_helper'
   require 'lhj/helper/log_helper'
+  require 'lhj/helper/vika_helper'
 
   class Error < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.30
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -296,6 +296,7 @@ files:
 - lib/lhj/command.rb
 - lib/lhj/command/config.rb
 - lib/lhj/command/config/info.rb
+- lib/lhj/command/duplicate_imageset.rb
 - lib/lhj/command/file_path.rb
 - lib/lhj/command/head_import.rb
 - lib/lhj/command/http.rb
@@ -330,6 +331,7 @@ files:
 - lib/lhj/env.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
+- lib/lhj/helper/git_branch_feature_config.rb
 - lib/lhj/helper/git_helper.rb
 - lib/lhj/helper/local_config.rb
 - lib/lhj/helper/log_helper.rb
@@ -342,6 +344,8 @@ files:
 - lib/lhj/helper/tb_helper.rb
 - lib/lhj/helper/team_member_config.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