lhj-tools 0.1.24 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8a3955d41955a54ce3ca861519c4333245dacd4c4b14477f73fc7061707c1f3
-  data.tar.gz: 630fc37529847a893022bd49226e2bd1bd44794f71618458d7e7620d3ad3f265
+  metadata.gz: 30a31460c814e1615aaefd473d2553acb40523e966f00ee37872db81d06466e0
+  data.tar.gz: d6f3348a4ce8c2a77e2a3d9e8ad6ce6393cbc4ae04b9c39d3c7cd31e19b5e45b
 SHA512:
-  metadata.gz: 0e3c30af417e17bd237c0bc114ed48d8e9fd46e39263085ef1743398e702c510ee9bd5212eaa2e06446a659a33d47089fbdc865dfcf284307538b9b6edb5abc4
-  data.tar.gz: e0d7853fb9f18c5785fa570c3e23c212f29e5aa935fcf437224f0f9db24c03221e3ff88efa91c8a63eb6eac8057cba5bc4ef4a0d3c798057754482c50a2e6642
+  metadata.gz: 1d722e7e3e748415b3a63e912940a2f5b84e5b4e4d7e87095a52e93204971851c9fa5decc5749d51e3b6ddafd23818844d9bb3090498b60239da0962c6a390ec
+  data.tar.gz: 22eb054aa18a58b9b926d55af8a76419efbc82569eb60cf4a34c1f5aa8ce6630b1de9545916c1dc6a132edbd9606a838d1fbf602f111426e1f622a3dd67cf328

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/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,6 +24,7 @@ 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'
 
     self.abstract_command = true

data/lib/lhj/helper/pgyer_config.rb

@@ -19,9 +19,11 @@ module Lhj
     def self.api_key(env = :uat)
       case env
       when :release
-        'release.....'
+        config['release_api_key']
       when :gray
-        'gray.....'
+        config['gray_api_key']
+      when :uat
+        config['uat_api_key']
       else
         config['api_key']
       end
@@ -30,23 +32,18 @@ module Lhj
     def self.user_key(env = :uat)
       case env
       when :release
-        config['user_key']
+        config['release_user_key']
       when :gray
-        config['user_key']
+        config['gray_user_key']
+      when :uat
+        config['uat_user_key']
       else
         config['user_key']
       end
     end
 
     def self.password(env = :uat)
-      case env
-      when :release
-        config['password']
-      when :gray
-        config['password']
-      else
-        config['password']
-      end
+      config['password']
     end
   end
 end

data/lib/lhj/helper/pgyer_helper.rb

@@ -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/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