lhj-tools 0.1.26 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f89a71391e6b1fde204d1f60f8de9f53c9c2fbef9719f71c389be011dc81525f
-  data.tar.gz: 45381e21de6e280cf07c28bc1beb45da1e81f736d3db455c46f74bd24f80e80c
+  metadata.gz: e3afdfb3713841a23a3cd431741fa3a2add9acefdec7c7adeda320eead551100
+  data.tar.gz: 56366dee80c13449fef8ca7d06958950796cf580decc9344b2e8504dd8c30c73
 SHA512:
-  metadata.gz: 6ae36d611435d72feccbde3e516c692977cb4cbaa3a68dd3c7720ee7b58744bfb0da83d18f32a465e97abc75e6668d1a0a75a1b31e2d32973d18bc3cfcfb5210
-  data.tar.gz: e2bf9d372ba3f47fbabff55575930cbb5c56c2f987b0714185ccf01058e8b1ba50435326b07640768cc06e6060e9e9f6b3714a2ac397c2a3aa4d093c1854a9e1
+  metadata.gz: f7a81af5dd316ea322f40edd1b6c40baf8fea27a397383e392ced1ac2d95325c23c66504a83313ff1998ada24d08b85bcb900e080ae7c956e3ab1c6a1e4af07d
+  data.tar.gz: 67ef0b91969fd2d517d0f8ee319e681e61d0da8239d7dc2e6b93a95e39f3914b030a69b455eed66838dc53681e6c8ede3426653c298664c49ff94bd660a82f79

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/sync_pod_version.rb

@@ -0,0 +1,91 @@
+require 'lhj/config'
+require 'highline'
+require 'lhj/helper/pod_repo_config'
+
+module Lhj
+  class Command
+    # sync code to pod
+    class SyncPodVersion < Command
+      self.summary = '同步主工程的库的版本号'
+
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def begin_title
+        '读取映射文件~/.lhj/pod_config.yml'
+      end
+
+      def handle
+        sync
+      end
+
+      def sync
+        config_file = File.join(Lhj::Config.instance.home_dir, 'pod_config.yml')
+        arr = YAML.load_file(config_file)
+        arr.each_index { |i| puts "#{i}.#{arr[i]['pod']}".yellow }
+        idx = @cli.ask('请选择哪一个库同步: '.green).strip.to_i
+        pod_name = arr[idx]['pod']
+        src = arr[idx]['main_path']
+        dest = arr[idx]['pod_path']
+
+        ma = nil
+        Dir.chdir(dest) do
+          Dir.glob('*.podspec').each do |p|
+            version_line = IO.readlines(p).find{ |line| (/\.version/ =~ line) && (version_regex =~ line) }
+            ma = version_line.match(version_regex)
+          end
+          puts '获取版本号成功'.green
+
+        end
+
+        # find src root dir
+        src_root_dir = find_src_root_dir(src)
+        Dir.chdir(src_root_dir) do
+          if ma
+            pod_version = ma[0]
+            update_all_pod_dependency(pod_name, pod_version)
+            puts '更新主工程引用pod版本号成功'.green
+          end
+        end
+      end
+
+      def find_src_root_dir(src)
+        ps = []
+        src.scan(%r{(/[^/]*)}).flatten.each do |path|
+          path =~ /Code/ ? break : ps << path
+        end
+        File.join(ps)
+      end
+
+      def version_regex
+        /\d+\.\d+\.(\d+)/
+      end
+
+      def update_all_pod_dependency(pod_name, pod_version)
+        Dir.glob(%w[./**/*.podspec ./**/Podfile]).each do |p|
+          next if /Example/ =~ p || /temp/ =~ p
+
+          update_main_version(p, pod_name, pod_version)
+        end
+      end
+
+      def update_main_version(file, pod_name, pod_version)
+        cont = ''
+        File.readlines(file).each do |l|
+          if (/#{pod_name}/ =~ l) && (/\d+\.\d+\.\d+/ =~ l)
+            path = File.absolute_path(file)
+            puts "更新文件:#{path}".magenta
+            l.scan(/\d+\.\d+\.\d+/).each do |key|
+              cont += l.gsub(key, pod_version)
+            end
+          else
+            cont += l.dup
+          end
+        end
+        File.write(file, cont)
+      end
+    end
+  end
+end

data/lib/lhj/command.rb

@@ -24,7 +24,9 @@ module Lhj
     require 'lhj/command/file_path'
     require 'lhj/command/http'
     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/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.26"
+    VERSION = "0.1.29"
   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.26
+  version: 0.1.29
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-04-14 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
@@ -314,6 +315,7 @@ files:
 - lib/lhj/command/rename_image.rb
 - lib/lhj/command/reverse_import.rb
 - lib/lhj/command/sync_pod_repo.rb
+- lib/lhj/command/sync_pod_version.rb
 - lib/lhj/command/template.rb
 - lib/lhj/command/trans.rb
 - lib/lhj/command/view.rb
@@ -329,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
@@ -341,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