cocoapods-aomi-bin 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d60564dc2567c05414925657a0bfcc79c03e29346af7799a236e824a48b522b
-  data.tar.gz: c58a951a5261bd33adff5d05e133385a3cc225059b103769a0fb8af333072917
+  metadata.gz: 5ae3af0a13e50fda02f0dc94b7167bcc90dfbaeb4dbf7e41dacbbf473adbf584
+  data.tar.gz: cf58dc5598b22637808983c72c38d7051d9c927aa34769c7a8cf8429c970e90a
 SHA512:
-  metadata.gz: a21bb3fff848840bf1a72671bfc09fadec1dbf67c2103a1958a897065f6fd3d2f69332715bc0afe2e64ed4fc39f2ae3490a3a5b8c3e9eb4df155bf718b522c85
-  data.tar.gz: 352d771b8a7731af97c00ac7f83753178f2a8d7bbab02d188d1e4f45f31246f8cb523e2b6d26167034a6766eae96a2ce83b8b95675d37a443cf8c7304898dd48
+  metadata.gz: 3837f523f1839690351f4d660a2735daf00bd50641175c9bf95c77f8e4c2f851ec4f171e52ebbfedcaa0fb8bffd54285493ee31443c844834700f8b1f5b4b30b
+  data.tar.gz: 83f0c980b2e5a8459dd4e406b86ec68fb7b6dd55e79d282659d52cd936ef6595bd391a40f47430eb3aa863a7a14fa54ee575eb392f30641764d412639b888c2a

data/lib/cocoapods-lhj-bin/command/bin.rb

@@ -8,6 +8,8 @@ require 'cocoapods-lhj-bin/command/bin/install'
 require 'cocoapods-lhj-bin/command/bin/import'
 require 'cocoapods-lhj-bin/command/bin/local/local'
 require 'cocoapods-lhj-bin/command/bin/local/fetch'
+require 'cocoapods-lhj-bin/command/bin/local/filter'
+require 'cocoapods-lhj-bin/command/bin/local/micro_service'
 require 'cocoapods-lhj-bin/command/bin/local/upload'
 require 'cocoapods-lhj-bin/command/bin/trans'
 require 'cocoapods-lhj-bin/command/bin/lhj'

data/lib/cocoapods-lhj-bin/command/bin/config/push.rb

@@ -18,8 +18,8 @@ module Pod
           end
 
           def push_cn_hk
-            file = File.expand_path("#{Pod::Config.instance.home_dir}/zh2hant.yml")
-            CBin::OSS::Helper.instance.upload('zh2hant.yml', file)
+            file = File.expand_path("#{Pod::Config.instance.home_dir}/localizable_config.yml")
+            CBin::OSS::Helper.instance.upload('localizable_config.yml', file)
           end
 
           def push

data/lib/cocoapods-lhj-bin/command/bin/init.rb

@@ -35,9 +35,13 @@ module Pod
           require 'open-uri'
 
           UI.puts "开始下载配置文件...\n"
-          file = open(url)
-          contents = YAML.safe_load(file.read)
-
+          str = ''
+          URI.open(url) do |f|
+            f.each_line do |line|
+              str += line
+            end
+          end
+          contents = YAML.safe_load(str)
           UI.puts "开始同步配置文件...\n"
           CBin.config.sync_config(contents.to_hash)
           UI.puts "设置完成.\n".green

data/lib/cocoapods-lhj-bin/command/bin/local/fetch.rb

@@ -50,7 +50,13 @@ module Pod
 
         def handle_files
           Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
-            handle_file f
+            dir_name = File.dirname(f)
+            if /Pods/ =~ f
+              mod_name = framework_name(dir_name)
+              handle_file f if /^ML/ =~ mod_name
+            else
+              handle_file f
+            end
           end
         end
 
@@ -61,7 +67,7 @@ module Pod
         def handle_file(file)
           File.open(file, 'r') do |f|
             f.each_line do |line|
-              handle_line(file, line) if zh_ch_reg =~ line
+              handle_line(file, line) if zh_ch_reg =~ line && !((/DDLog/ =~ line) || (/NSLog/ =~ line))
             end
           end
         end
@@ -102,9 +108,11 @@ module Pod
         def update_source_header
           Dir.glob("#{@current_path}/**/*.{m,h}").each do |f|
             if f =~ /Pods/
-              handler_file(f) if f =~ %r{Pods/MLF} || f =~ %r{Pods/MLU} || f =~ %r{Pods/MLN}
+              dir_name = File.dirname(f)
+              mod_name = framework_name(dir_name)
+              handle_file f if /^ML/ =~ mod_name
             else
-              handler_file(f)
+              handler_file f
             end
           end
         end
@@ -140,7 +148,6 @@ module Pod
           end
           result
         end
-
       end
     end
   end

data/lib/cocoapods-lhj-bin/command/bin/local/filter.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Filter < Bin
+        self.summary = '过滤重复对象'
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h')
+          @file_name = argv.option('file-name', 'MaucaoLife_zh_en.csv')
+          @cn_keys = []
+          @key_map = {}
+          @used_keys = []
+          super
+        end
+
+        def run
+          fetch_keys
+          read_csv
+          gen_csv
+        end
+
+        def csv_file_name
+          file_name = @file_name
+          file_name = "#{@file_name}.csv" unless /.csv$/ =~ @file_name
+          file_name
+        end
+
+        def read_csv
+          path = File.join(@current_path, csv_file_name)
+          Dir.glob(path).each do |p|
+            CSV.foreach(p) do |row|
+              key = row[0]
+              if @used_keys.any? { |k| k.eql?(key) }
+                @cn_keys << { key: key, cn: row[1], en: row[2], fname: row[3], dirname: row[4] }
+              end
+            end
+          end
+        end
+
+        def gen_csv
+          file = File.join(@current_path, csv_file_name)
+          FileUtils.rm_rf(file) if File.exist?(file)
+          CSV.open(file, 'wb:utf-8') do |csv|
+            csv << %w[国际化key 中文 英文 所在文件 文件路径]
+            @cn_keys.each do |k|
+              csv << [k[:key], k[:cn], k[:en], k[:fname], k[:dirname]]
+            end
+          end
+          UI.puts "生成csv文件完成.\n文件路径：#{File.absolute_path(file)}".green
+        end
+
+        def fetch_keys
+          Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+            handle_file f
+          end
+        end
+
+        def zh_ch_reg
+          /MLLocalizedString\([^)]+\)/
+        end
+
+        def handle_file(file)
+          File.open(file, 'r') do |f|
+            f.each_line do |line|
+              handle_line(file, line) if zh_ch_reg =~ line
+            end
+          end
+        end
+
+        def handle_line(file, line)
+          line.scan(zh_ch_reg) do |str|
+            str[20, str.length - 22]
+            @used_keys << str[20, str.length - 22]
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-lhj-bin/command/bin/local/local.rb

@@ -3,6 +3,7 @@
 require 'csv'
 require 'cocoapods-lhj-bin/helpers/trans_helper'
 require 'cocoapods-lhj-bin/helpers/oss_helper'
+require 'cocoapods-lhj-bin/config/local_config'
 
 module Pod
   class Command
@@ -26,26 +27,26 @@ module Pod
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
-          @key_col = argv.option('key-col', 0).to_i
-          @cn_col = argv.option('cn-col', 1).to_i
-          @en_col = argv.option('en-col', 2).to_i
+          @key_col = argv.option('key-col', CBin::LocalConfig.instance.config['csv_key_col']).to_i
+          @cn_col = argv.option('cn-col', CBin::LocalConfig.instance.config['csv_cn_col']).to_i
+          @en_col = argv.option('en-col', CBin::LocalConfig.instance.config['csv_en_col']).to_i
           @download_csv_files = argv.option('download-csv')
-          @read_csv_file = argv.option('read-csv-file', '*')
-          @gen_file_name = argv.option('gen-file', 'Localizable.strings')
+          @read_csv_file = argv.option('read-csv-file', CBin::LocalConfig.instance.config['read_csv_file'])
+          @gen_file_name = argv.option('gen-file', CBin::LocalConfig.instance.config['gen_file_name'])
           @modify_source_flag = argv.flag?('modify-source', false)
           @modify_file_type = argv.option('modify-file-type', 'm,h')
-          @modify_format_string = argv.option('modify-format-string', 'NSLocalizedString(%s, @"")')
+          @modify_format_string = argv.option('modify-format-string', CBin::LocalConfig.instance.config['source_format_string'])
           @key_map = {}
           super
         end
 
         def run
-          down_load_csv_file if @download_csv_files
-          read_csv_file
+          down_load_csv_file if need_download
+          read_csv
           if @key_map.keys.length.positive?
             write_en_strings
-            write_zh_cn_strings
             write_zh_hk_strings
+            write_zh_cn_strings
             handle_modify_source if @modify_source_flag
           else
             UI.puts "获取中英文映射文件失败, 检查参数--read-csv-file=xx是否正常\n".red
@@ -53,21 +54,29 @@ module Pod
         end
 
         def en_dir_name
-          'local_gen/en.lproj'
+          CBin::LocalConfig.instance.config['gen_en_dir']
         end
 
         def zh_hk_dir_name
-          'local_gen/zh-hk.lproj'
+          CBin::LocalConfig.instance.config['gen_zh_hk_dir']
         end
 
         def zh_cn_dir_name
-          'local_gen/zh-cn.lproj'
+          CBin::LocalConfig.instance.config['gen_zh_cn_dir']
         end
 
         def generate_file_name
           @gen_file_name
         end
 
+        def need_download
+          @download_csv_files || CBin::LocalConfig.instance.config['download']
+        end
+
+        def download_cvs_str
+          @download_csv_files || CBin::LocalConfig.instance.config['download_csv']
+        end
+
         def read_csv_file_name
           file_name = @read_csv_file
           file_name = "#{@read_csv_file}.csv" unless /.csv$/ =~ @read_csv_file
@@ -101,7 +110,7 @@ module Pod
 
         def get_download_keys
           download_keys = []
-          csv_files = @download_csv_files.split(/,/).map(&:strip)
+          csv_files = download_cvs_str.split(/,/).map(&:strip)
           all_keys = CBin::OSS::Helper.instance.list.map(&:key)
           csv_files.each do |f|
             arr = all_keys.select { |k| %r{^csv/} =~ k && /#{f}/ =~ k }
@@ -113,12 +122,27 @@ module Pod
           download_keys
         end
 
-        def read_csv_file
+        def read_csv
           path = File.join(@current_path, read_csv_file_name)
-          Dir.glob(path).each do |p|
-            CSV.foreach(p) do |row|
-              key = row[@key_col]
-              @key_map[key] = { key: key, zh: row[@cn_col], en: row[@en_col] } unless key =~ /[\u4e00-\u9fa5]/
+          Dir.glob(path).each do |f|
+            read_csv_file f
+          end
+        end
+
+        def read_csv_file(file)
+          key_c = CBin::LocalConfig.instance.get_col_by_name(file, 'csv_key_col')
+          cn_c = CBin::LocalConfig.instance.get_col_by_name(file, 'csv_cn_col')
+          en_c = CBin::LocalConfig.instance.get_col_by_name(file, 'csv_en_col')
+          trans_hk = CBin::LocalConfig.instance.get_col_by_name(file, 'trans_zh_hk')
+          trans_cn = CBin::LocalConfig.instance.get_col_by_name(file, 'trans_zh_cn')
+          CSV.foreach(file) do |row|
+            if row.length > 2
+              key = row[key_c]
+              cn_str = row[cn_c]
+              hk_str = row[cn_c]
+              cn_str = CBin::Trans::Helper.instance.trans_zh_cn_str(cn_str) if trans_cn
+              hk_str = CBin::Trans::Helper.instance.trans_zh_hk_str(hk_str) if trans_hk
+              @key_map[key] = { key: key, cn: cn_str, hk: hk_str, en: row[en_c] } unless key =~ /[\u4e00-\u9fa5]/
             end
           end
         end
@@ -161,7 +185,7 @@ module Pod
 
         def modify_format_string(file, line)
           result = line
-          result = handle_modify_line(file, line) if zh_ch_reg =~ line
+          result = handle_modify_line(file, line) if zh_ch_reg =~ line && !((/DDLog/ =~ line) || (/NSLog/ =~ line))
           result
         end
 
@@ -185,17 +209,10 @@ module Pod
           @key_map.values[index][:key] if index
         end
 
-        def format_str(type, area = :cn)
+        def format_str(type)
           str = ''
           @key_map.each do |k, v|
-            val = v[type]
-            case area
-            when :hk
-              val = CBin::Trans::Helper.instance.trans_zh_hk_str val
-            when :cn
-              val = CBin::Trans::Helper.instance.trans_zh_cn_str val
-            end
-            str += "\"#{k}\" = \"#{val}\";\n"
+            str += "\"#{k}\" = \"#{v[type]}\";\n"
           end
           str
         end
@@ -220,14 +237,26 @@ module Pod
         end
 
         def write_zh_cn_strings
+          gen_zh_cn_strings_file
+        end
+
+        def gen_zh_cn_strings_file
           file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
-          generate_file(file, :zh)
+          content = format_str(:cn)
+          write_to_file(file, content)
           UI.puts "生成简体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end
 
+        def copy_hk_to_cn_file
+          source_file = File.join(@current_path, zh_hk_dir_name, generate_file_name)
+          dest_file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
+          FileUtils.cp source_file, dest_file
+          UI.puts "繁体中文配置覆盖简体中文配置\n".green
+        end
+
         def write_zh_hk_strings
           file = File.join(@current_path, zh_hk_dir_name, generate_file_name)
-          content = format_str(:zh, :hk)
+          content = format_str(:hk)
           write_to_file(file, content)
           UI.puts "生成繁体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end

data/lib/cocoapods-lhj-bin/command/bin/local/micro_service.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Service < Bin
+        self.summary = '微服务名变更'
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h')
+          @file_name = argv.option('file-name', 'service_map.csv')
+          @service_map = {}
+          super
+        end
+
+        def run
+          read_csv
+          update_source
+        end
+
+        def read_csv
+          path = File.join(@current_path, csv_file_name)
+          Dir.glob(path).each do |p|
+            CSV.foreach(p) do |row|
+              @service_map[row[0]] = row[1] if row[0]
+            end
+          end
+        end
+
+        def csv_file_name
+          file_name = @file_name
+          file_name = "#{@file_name}.csv" unless /.csv$/ =~ @file_name
+          file_name
+        end
+
+        def update_source
+          Dir.glob("#{@current_path}/**/*.{m,h}").each do |f|
+            if f =~ /Pods/
+              update_file(f) if f =~ %r{Pods/ML}
+            else
+              update_file(f)
+            end
+          end
+        end
+
+        def update_file(file)
+          File.chmod(0o644, file)
+          str = file_string(file)
+          File.open(file, 'w+') do |f|
+            f.write(str)
+          end
+          File.chmod(0o444, file) if file =~ /Pods/
+        end
+
+        def file_string(file)
+          str = ''
+          File.open(file, 'r+') do |f|
+            f.each_line do |line|
+              str += format_string(f, line)
+            end
+          end
+          str
+        end
+
+        def format_string(file, line)
+          result = line
+          if url_reg =~ line
+            line.scan(url_reg).flatten.each do |key|
+              result = result.gsub(key, @service_map[key]) if key && @service_map[key]
+            end
+          end
+          result
+        end
+
+        def url_reg
+          @url_key_reg ||= begin
+                             keys = @service_map.keys.join('|')
+                             /(#{keys})/
+                           end
+          @url_key_reg
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-lhj-bin/config/local_config.rb

@@ -0,0 +1,57 @@
+require 'yaml'
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+
+module CBin
+  class LocalConfig
+    def config_file
+      File.join(Pod::Config.instance.home_dir, config_file_name)
+    end
+
+    def config_file_name
+      'localizable_config.yml'
+    end
+
+    def syn_config_file
+      CBin::OSS::Helper.instance.down_load(config_file_name, config_file)
+    end
+
+    def default_config
+      { 'gen_en_dir' => 'local_gen/en.lproj',
+        'gen_zh_hk_dir' => 'local_gen/zh-Hant.lproj',
+        'gen_zh_cn_dir' => 'local_gen/zh-Hans.lproj',
+        'gen_file_name' => 'Localizable.strings',
+        'source_format_string' => 'NSLocalizedString(%s, @"")',
+        'csv_key_col' => 0,
+        'csv_cn_col' => 1,
+        'csv_en_col' => 2,
+        'read_csv_file' => '*.csv',
+        'gen_zh_cn' => true,
+        'trans_zh_hk' => false,
+        'trans_zh_cn' => false,
+        'download' => false,
+        'download_csv' => 'zh_en.csv' }
+    end
+
+    def load_config
+      syn_config_file unless File.exist?(config_file)
+      YAML.load_file(config_file)
+    end
+
+    def get_col_by_name(file_name, col_name = 'csv_key_col')
+      m = config
+      col = m[col_name]
+      fo = m['read_targets'].find{ |o| /#{o['csv_file']}/ =~ file_name }
+      col = fo[col_name] if fo
+      col
+    end
+
+    def config
+      @config ||= load_config
+    end
+
+    def self.instance
+      @instance ||= new
+    end
+
+  end
+end

data/lib/cocoapods-lhj-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.8'
+  VERSION = '0.1.13'
 end
 
 module Pod

data/lib/cocoapods-lhj-bin/helpers/oss_helper.rb

@@ -19,8 +19,8 @@ module CBin
         @bucket.put_object(key, :file => file)
       end
 
-      def down_load(key, file)
-        @bucket.get_object(key, :file => file)
+      def down_load(key, file, &block)
+        @bucket.get_object(key, :file => file, &block)
       end
 
       def object_url(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -118,7 +118,9 @@ files:
 - lib/cocoapods-lhj-bin/command/bin/lhj.rb
 - lib/cocoapods-lhj-bin/command/bin/lib/lint.rb
 - lib/cocoapods-lhj-bin/command/bin/local/fetch.rb
+- lib/cocoapods-lhj-bin/command/bin/local/filter.rb
 - lib/cocoapods-lhj-bin/command/bin/local/local.rb
+- lib/cocoapods-lhj-bin/command/bin/local/micro_service.rb
 - lib/cocoapods-lhj-bin/command/bin/local/upload.rb
 - lib/cocoapods-lhj-bin/command/bin/oss/del.rb
 - lib/cocoapods-lhj-bin/command/bin/oss/list.rb
@@ -132,6 +134,7 @@ files:
 - lib/cocoapods-lhj-bin/config/config_builder.rb
 - lib/cocoapods-lhj-bin/config/config_hot_key.rb
 - lib/cocoapods-lhj-bin/config/config_hot_key_asker.rb
+- lib/cocoapods-lhj-bin/config/local_config.rb
 - lib/cocoapods-lhj-bin/gem_version.rb
 - lib/cocoapods-lhj-bin/helpers.rb
 - lib/cocoapods-lhj-bin/helpers/Info.plist