lhj-tools 0.1.22 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d0b9e563d0ebfe15b800560545a987a274f9787522297f7721b2012ff132594
-  data.tar.gz: 61655a300019b6dc713a71053482ba03c5ac2bee09ccc4be8c3926217a38dada
+  metadata.gz: f89a71391e6b1fde204d1f60f8de9f53c9c2fbef9719f71c389be011dc81525f
+  data.tar.gz: 45381e21de6e280cf07c28bc1beb45da1e81f736d3db455c46f74bd24f80e80c
 SHA512:
-  metadata.gz: 8e56808aae097aa5aaab4204aae1ea2bce2306c0aa8607be0d0ec57046c44c98576aa3d1a4c8313792f0764e37dfa0c7dd6d70f02a084fd7ea4eb3ef79ecd82d
-  data.tar.gz: 88c51758d568b44ad2ea8bcd4bae0572ade581ee87a146100afa9cfce6f53665dd2bd9a864e531f4b50b9d3b8af2c89236d2c406a142ac1dd1935b61339d08fa
+  metadata.gz: 6ae36d611435d72feccbde3e516c692977cb4cbaa3a68dd3c7720ee7b58744bfb0da83d18f32a465e97abc75e6668d1a0a75a1b31e2d32973d18bc3cfcfb5210
+  data.tar.gz: e2bf9d372ba3f47fbabff55575930cbb5c56c2f987b0714185ccf01058e8b1ba50435326b07640768cc06e6060e9e9f6b3714a2ac397c2a3aa4d093c1854a9e1

data/lib/lhj/command/sync_pod_repo.rb

@@ -1,5 +1,6 @@
 require 'lhj/config'
 require 'highline'
+require 'lhj/helper/pod_repo_config'
 
 module Lhj
   class Command
@@ -113,9 +114,8 @@ module Lhj
       end
 
       def update_pod_repo
-        # pod repo push miguatech-aomi_ios-mlspecs *.podspec --sources=miguatech-aomi_ios-mlspecs,aliyun,trunk --allow-warnings --use-libraries --verbose
         cmd = ['pod repo push']
-        pod_repo_name = 'miguatech-aomi_ios-mlspecs'
+        pod_repo_name = Lhj::PodRepoConfig.pod_repo_name
         cmd << pod_repo_name
         cmd << '*.podspec'
         cmd << "--sources=#{pod_repo_name},aliyun,trunk"

data/lib/lhj/helper/log_helper.rb

@@ -1,3 +1,5 @@
+require 'lhj/helper/team_member_config'
+
 module Lhj
   # log helper
   class LogHelper
@@ -16,7 +18,8 @@ module Lhj
     end
 
     def fetch_branch
-      Lhj::Actions.git_branch || ''
+      name = Lhj::Actions.git_branch || ''
+      name.split('/').last
     end
 
     def fetch_env(env)
@@ -33,12 +36,25 @@ module Lhj
     def fetch_log
       from = last_commit_hash
       to = 'HEAD'
-      changelog = Lhj::Actions.git_log_between(' %an, %ar - %s;', from, to, :exclude_merges, 'short', false)
-      changelog ||= ''
-      changelog&.gsub("\n\n", "\n")
-      changelog = changelog.gsub('seconds ', '秒').gsub('minutes ', '分钟').gsub('hours ', '小时').gsub('days ', '天').gsub('ago ', '前')
-      changelog = '此次打包没代码更新' if changelog.empty?
-      changelog
+      message = Lhj::Actions.git_log_between(' %an %ar - %s;', from, to, :exclude_merges, 'short', false)
+      handle_message(message)
+    end
+
+    def handle_message(m)
+      message = m
+      if !message.nil? && !message.empty?
+        message = message.gsub('seconds ', '秒')
+        message = message.gsub('minutes ', '分钟')
+        message = message.gsub('hours ', '小时')
+        message = message.gsub('days ', '天')
+        message = message.gsub('ago ', '前')
+        Lhj::TeamMemberConfig.config.each do |key, value|
+          message = message.gsub(key, value) if message =~ /#{key}/
+        end
+      else
+        message = '此次打包没代码更新'
+      end
+      message
     end
 
     def save_last_commit_hash
@@ -56,7 +72,8 @@ module Lhj
     end
 
     def last_commit_file
-      File.join(Lhj::Config.instance.home_dir, ".#{@branch}_last_commit")
+      branch_name = @branch.gsub(%r{/}, '')
+      File.join(Lhj::Config.instance.home_dir, ".#{@env}_#{branch_name}_last_commit")
     end
 
     def render_template

data/lib/lhj/helper/pgyer_config.rb

@@ -16,15 +16,33 @@ module Lhj
       @yaml ||= YAML.load_file(config_file)
     end
 
-    def self.api_key
-      config['api_key']
+    def self.api_key(env = :uat)
+      case env
+      when :release
+        config['release_api_key']
+      when :gray
+        config['gray_api_key']
+      when :uat
+        config['uat_api_key']
+      else
+        config['api_key']
+      end
     end
 
-    def self.user_key
-      config['user_key']
+    def self.user_key(env = :uat)
+      case env
+      when :release
+        config['release_user_key']
+      when :gray
+        config['gray_user_key']
+      when :uat
+        config['uat_user_key']
+      else
+        config['user_key']
+      end
     end
 
-    def self.password
+    def self.password(env = :uat)
       config['password']
     end
   end

data/lib/lhj/helper/pgyer_helper.rb

@@ -13,10 +13,10 @@ module Lhj
 
     attr_reader :api_key, :user_key, :password, :result
 
-    def initialize
-      @api_key = Lhj::PgyerConfig.api_key
-      @user_key = Lhj::PgyerConfig.user_key
-      @password = Lhj::PgyerConfig.password
+    def initialize(env = :uat)
+      @api_key = Lhj::PgyerConfig.api_key(env)
+      @user_key = Lhj::PgyerConfig.user_key(env)
+      @password = Lhj::PgyerConfig.password(env)
       @result = { 'data' => {} }
     end
 
@@ -39,7 +39,7 @@ module Lhj
     def upload_file(file, des)
 
       update_description = @result[:update_description]
-      update_description = "" if update_description.nil?
+      update_description = '' if update_description.nil?
       params = {
         '_api_key' => @api_key,
         'uKey' => @user_key,
@@ -49,10 +49,11 @@ module Lhj
         'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
       }
       begin
-        puts 'begin upload'
+        puts 'begin upload...'
         response = http_client.post API_HOST, params
         @result = response.body
         puts @result
+        puts 'upload success'
         if @result['data'] && @result['data']['appUpdateDescription']
           @result['data']['appUpdateDescription'] = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
         end

data/lib/lhj/helper/pod_repo_config.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # pod repo config
+  class PodRepoConfig
+
+    CONFIG_NAME = 'pod_repo_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.pod_repo_name
+      config['pod_repo_name']
+    end
+
+  end
+end

data/lib/lhj/helper/team_member_config.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'lhj/config'
+
+module Lhj
+  # team member config
+  class TeamMemberConfig
+
+    CONFIG_NAME = 'team_member.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
+
+  end
+end

data/lib/lhj/helper/trans_helper.rb

@@ -1,4 +1,5 @@
 require 'lhj/config'
+require_relative 'oss_config'
 
 module Lhj
   class Trans
@@ -18,9 +19,13 @@ module Lhj
         contents.to_hash
       end
 
+      def down_load_path
+        "http://#{Lhj::OSSConfig.oss_bucket}.#{Lhj::OSSConfig.oss_endpoint}/zh2hant.yml"
+      end
+
       def down_load_yaml
         require 'open-uri'
-        URI.open('http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml') do |i|
+        URI.open(down_load_path) do |i|
           File.open(yaml_file, 'w+') do |f|
             f.write(i.read)
           end