cocoapods-aomi-bin 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554bc02daf76ce2c1ff292e42d014d21f20278a2514f48d799c458db509e9865
-  data.tar.gz: f1f818abd7656a5d88996c54975a14e3f65ca31be61bf54e615917f72766b174
+  metadata.gz: 64f241532f973a1e5903475c7b395bda5e20c234aae56f570785f68e3e6f7911
+  data.tar.gz: 10b05f2cf2f632d8db9fa4298ee76f6df6b11f4eca036dded2e6c4890e4aaee9
 SHA512:
-  metadata.gz: 87a3ff4a95188fbdcb2e22860791fba9d5e55ec6eb1a49289f09aab9f08f34ae5f76cb3aa7c650279a2b29c66ddc1c031c89527ccefc3e0fc0735f1dcf6fb09d
-  data.tar.gz: 70cd528a6c20c68043e5fc9c51b2bc2e0f5a387250f082a92f2af899610bf523963212c950d46eea3cf86d5317de3c6ba1b2091c4f4c8e1a9baa234a4dae6ab4
+  metadata.gz: ffb72bdc8ae5cd1f604e4ccd03f98710f180dd15ae1a96ceb02c273f07dcf783f4a40da828ac124faafa6b234cfe81820a1ad3541d42ec8a45ebb9f0a0ce5ac1
+  data.tar.gz: 2a0cd1ca1db7712681c6b626f5ef87e1c5c0db90c7c0557e16670af5fd013d35e9b732b9c35e26f9f1f918569671a617f9e8c897e70608a9bdfac95389b226c6

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

@@ -20,12 +20,14 @@ module Pod
           @file_type = argv.option('file-type', 'm,h')
           @file_name = argv.option('file-name', 'gen_cn_key.csv')
           @cn_keys = []
+          @key_map = {}
           super
         end
 
         def run
           handle_files
           gen_csv
+          # update_source_header
         end
 
         def csv_file_name
@@ -38,9 +40,9 @@ module Pod
           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 中文 英文 原字符 所在文件 文件路径]
+            csv << %w[国际化key 中文 英文 所在文件 文件路径]
             @cn_keys.each do |k|
-              csv << [k[:key], k[:cn], k[:en], k[:str], k[:fname], k[:dirname]]
+              csv << [k[:key], k[:cn], k[:en], k[:fname], k[:dirname]]
             end
           end
           UI.puts "生成csv文件完成.\n文件路径：#{File.absolute_path(file)}".green
@@ -52,22 +54,93 @@ module Pod
           end
         end
 
+        def zh_ch_reg
+          /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+        end
+
         def handle_file(file)
           File.open(file, 'r') do |f|
             f.each_line do |line|
-              handle_line(file, line) if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+              handle_line(file, line) if zh_ch_reg =~ line
             end
           end
         end
 
         def handle_line(file, line)
-          reg = /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
-          ma = reg.match(line)
-          str = ma[0]
-          key = "#{File.basename(file, '.*')}.#{rand(36**8).to_s(36)}"
-          @cn_keys << { key: key, cn: str[2, str.length - 3], en: '', str: str, dirname: File.dirname(file),
-                        fname: File.basename(file) }
+          line.scan(zh_ch_reg) do |str|
+            fname = File.basename(file)
+            dir_name = File.dirname(file)
+            mod_name = framework_name(dir_name)
+            key = "#{mod_name}.#{File.basename(file, '.*')}.#{rand(36**8).to_s(36)}"
+            cn_str = str[2, str.length - 3]
+            en_str = cn_str.gsub(/[\u4e00-\u9fa5]/, 'x')
+            @cn_keys << { key: key, cn: cn_str, en: en_str, fname: fname, dirname: dir_name }
+          end
+        end
+
+        def framework_name(path)
+          mod_name = 'Main'
+          if /pods/i =~ path
+            ary = path.split('/')
+            index = ary.find_index { |p| p.eql?('Pods') }
+            if index
+              i = index + 1
+              mod_name = ary[i]
+            end
+          end
+          mod_name
+        end
+
+        def handle_static_line(file, line)
+          line.scan(zh_ch_reg) do |str|
+            ma = line.match(/\*.*=/)
+            key = ma[0][1, ma[0].length - 2].strip
+            @key_map[key.to_sym] = str
+          end
+        end
+
+        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}
+            else
+              handler_file(f)
+            end
+          end
         end
+
+        def handler_file(file)
+          puts "#{File.absolute_path(file)} \n"
+          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
+          unless /static/ =~ line
+            @key_map.each_key do |key|
+              n_key = /#{key.to_s}\s/
+              n_val = "#{@key_map[key]}\s"
+              result = result.gsub(n_key, n_val)
+            end
+          end
+          result
+        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
+          down_load_csv_file if need_download
           read_csv_file
           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
@@ -75,33 +84,33 @@ module Pod
         end
 
         def down_load_csv_file
-          UI.puts '下载中英对照csv文件...'.green
           ary = get_download_keys
           ary.each do |key|
-            file_name = key.split(%r{/})[2] || key
+            file_name = File.basename(key)
             file = File.join(@current_path, file_name)
             backup_csv_file file if File.exist?(file)
-            UI.puts "下载csv文件:#{key} 到目录#{file}".green
+            UI.puts "下载csv文件:#{CBin::OSS::Helper.instance.object_url(key)} 到目录#{file}\n".green
             CBin::OSS::Helper.instance.down_load(key, file)
           end
+          UI.puts "下载云端csv文件完成 \n".green
         end
 
         def backup_csv_file(file)
           dest_file = bak_file(file)
+          FileUtils.mkdir_p(File.dirname(dest_file)) unless File.exist?(File.dirname(dest_file))
           UI.puts "备份csv文件:#{file} 到目录#{dest_file}".green
           FileUtils.cp file, dest_file
           FileUtils.rm_rf file
         end
 
         def bak_file(file)
-          bak_name = "bak_#{File.basename(file)}"
-          dest_file = File.join(File.dirname(file), bak_name)
+          dest_file = File.join(File.dirname(file), 'csv_bak', File.basename(file))
           File.exist?(dest_file) ? bak_file(dest_file) : dest_file
         end
 
         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 }
@@ -126,16 +135,23 @@ module Pod
         def handle_modify_source
           UI.puts '修改源码开始'
           Dir.glob("#{@current_path}/**/*.{#{@modify_file_type}}").each do |f|
-            handle_modify_file f if File.stat(f).writable?
+            # handle_modify_file f if File.stat(f).writable?
+            if f =~ /Pods/
+              handle_modify_file(f) if f =~ %r{Pods/ML}
+            else
+              handle_modify_file(f)
+            end
           end
           UI.puts '修改源码结束'
         end
 
         def handle_modify_file(file)
+          File.chmod(0o644, file)
           str = modify_file_string(file)
           File.open(file, 'w+') do |f|
             f.write(str)
           end
+          File.chmod(0o444, file) if file =~ /Pods/
         end
 
         def modify_file_string(file)
@@ -148,33 +164,37 @@ module Pod
           str
         end
 
+        def zh_ch_reg
+          /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+        end
+
         def modify_format_string(file, line)
           result = line
-          result = handle_modify_line line if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+          result = handle_modify_line(file, line) if zh_ch_reg =~ line
           result
         end
 
-        def handle_modify_line(line)
+        def handle_modify_line(file, line)
           result = line
-          reg = /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
-          ma = reg.match(line)
-          key = find_key_by_cn_val(ma[0])
-          if key
-            val = format(@modify_format_string, "@\"#{key}\"")
-            result = line.gsub(ma[0], val)
+          line.scan(zh_ch_reg) do |m|
+            key = find_key_by_cn_val(file, m)
+            if key
+              val = format(@modify_format_string, "@\"#{key}\"")
+              result = result.gsub(m, val)
+            end
           end
           result
         end
 
-        def find_key_by_cn_val(val)
+        def find_key_by_cn_val(file, val)
+          file_name = File.basename(file, '.*')
           cn_key = val[2, val.length - 3]
-          index = @key_map.values.find_index do |obj|
-            /^#{cn_key}$/ =~ obj[:zh]
-          end
+          index = @key_map.values.find_index { |obj| cn_key.eql?(obj[:zh]) && /#{file_name}/ =~ obj[:key] }
+          index ||= @key_map.values.find_index { |obj| cn_key.eql?(obj[:zh]) }
           @key_map.values[index][:key] if index
         end
 
-        def format_str(type, area = :cn)
+        def format_str(type, area = :origin)
           str = ''
           @key_map.each do |k, v|
             val = v[type]
@@ -209,14 +229,34 @@ module Pod
         end
 
         def write_zh_cn_strings
+          if CBin::LocalConfig.instance.config['gen_zh_cn']
+            gen_zh_cn_strings_file
+          else
+            copy_hk_to_cn_file
+          end
+        end
+
+        def gen_zh_cn_strings_file
           file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
-          generate_file(file, :zh)
+          area = :origin
+          area = :cn if CBin::LocalConfig.instance.config['trans_zh_cn']
+          content = format_str(:zh, area)
+          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)
+          area = :origin
+          area = :hk if CBin::LocalConfig.instance.config['trans_zh_hk']
+          content = format_str(:zh, area)
           write_to_file(file, content)
           UI.puts "生成繁体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end

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

@@ -0,0 +1,52 @@
+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
+      if File.exist?(config_file)
+        YAML.load_file(config_file)
+      else
+        default_config
+      end
+    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.5'
+  VERSION = '0.1.10'
 end
 
 module Pod

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -132,6 +132,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