lhj-tools 0.1.21 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d54687e0ef1aa1c34630063f84c35e517de500cedf0f33f28029e0c7f025d59
-  data.tar.gz: eb96a26b4f8ade67457eee980d7f5c0f0c0dc0c3bc881b970898fb8e5c864cca
+  metadata.gz: 223ddca466520ca7090669cd355c86c0e62d32d39404ea4cc13f65967f22a541
+  data.tar.gz: 26b194fa297f41e60e9f16f4f204644007b3b793cb2a7a3bc625a5b46f7b062b
 SHA512:
-  metadata.gz: b281d02e9d3aa94b134dd1f11b7073c5e340d618c512e136eb53a94e14e151a716b68d4bc9117194688624d3c8bdf4d1604d17fa175b9f2b29fb09951f0a31bf
-  data.tar.gz: 12b78a7a8bab022741a0f756858dab5230de0d0f9bf7f09d4e1f4c765096b150e53a8ead7df8c0052d9de68758510d12fcade268bfa0e3d8ecae642ff746f0a5
+  metadata.gz: 0643a43dc5c7c85b533b56245acfd822fe683e50ef763b18790e26199685e4d0d12d456b7c1c5c693ddda7fc9c64823be7a4536e96426feb7bff85117e181336
+  data.tar.gz: 4ac4c6329d2e4b654d4ef1f4f7afe613f65fb3068a9f9192f374aa20ea13a01b700a33b71c858565b988e5eea0e4c17c9c05bb23a9d08eab02ac764d67e7af9d

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

@@ -0,0 +1,9 @@
+module Lhj
+  class Env
+    def self.truthy?(env)
+      return false unless ENV[env]
+      return false if ["no", "false", "off", "0"].include?(ENV[env].to_s)
+      return true
+    end
+  end
+end

data/lib/lhj/helper/git_helper.rb

@@ -60,11 +60,11 @@ module Lhj
       return nil if last_git_commit_formatted_with('%an').nil?
 
       {
-          author: last_git_commit_formatted_with('%an'),
-          author_email: last_git_commit_formatted_with('%ae'),
-          message: last_git_commit_formatted_with('%B'),
-          commit_hash: last_git_commit_formatted_with('%H'),
-          abbreviated_commit_hash: last_git_commit_formatted_with('%h')
+        author: last_git_commit_formatted_with('%an'),
+        author_email: last_git_commit_formatted_with('%ae'),
+        message: last_git_commit_formatted_with('%B'),
+        commit_hash: last_git_commit_formatted_with('%H'),
+        abbreviated_commit_hash: last_git_commit_formatted_with('%h')
       }
     end
 
@@ -118,10 +118,15 @@ module Lhj
     # Returns the current git branch, or "HEAD" if it's not checked out to any branch
     # Can be replaced using the environment variable `GIT_BRANCH`
     def self.git_branch
-      begin
-        Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
-      rescue => err
-        nil
+      env_name = SharedValues::GIT_BRANCH_ENV_VARS.find { |env_var| Lhj::Env.truthy?(env_var) }
+      ENV.fetch(env_name.to_s) do
+        # Rescues if not a git repo or no commits in a git repo
+        begin
+          Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
+        rescue => err
+          UI.verbose("Error getting git branch: #{err.message}")
+          nil
+        end
       end
     end
 

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

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.21"
+    VERSION = "0.1.25"
   end
 end

data/lib/lhj/tools.rb

@@ -3,8 +3,10 @@ require_relative "tools/version"
 require 'colored'
 
 module Lhj
+  require 'lhj/env'
   require 'lhj/ui/ui'
   require 'lhj/config'
+  require 'lhj/helper/pod_repo_config'
   require 'lhj/helper/pgyer_helper'
   require 'lhj/helper/dingtalk_helper'
   require 'lhj/helper/tb_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.25
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -326,6 +326,7 @@ files:
 - lib/lhj/command/yapi/formatters/template/pgyer.erb
 - lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
+- lib/lhj/env.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/git_helper.rb
@@ -335,8 +336,10 @@ files:
 - lib/lhj/helper/oss_helper.rb
 - lib/lhj/helper/pgyer_config.rb
 - lib/lhj/helper/pgyer_helper.rb
+- lib/lhj/helper/pod_repo_config.rb
 - lib/lhj/helper/tb_config.rb
 - lib/lhj/helper/tb_helper.rb
+- lib/lhj/helper/team_member_config.rb
 - lib/lhj/helper/trans_helper.rb
 - lib/lhj/tools.rb
 - lib/lhj/tools/version.rb