cocoapods-aomi-bin 0.0.7 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7481159dec769eae8103bda57cb36e305af85b987f1ef0599efe8d195d0d710
-  data.tar.gz: 51db4957eafd463de1746a986f66cf4e3e0c59dde020c16adfcff1facdf22b8e
+  metadata.gz: 761d8708d5a6a58529721f57a03176cc6b304a299d73786da206eb2a891b55d6
+  data.tar.gz: b74e89002309aa292a591e0a37af7cc2f02bb0064ee517d12cd86cfc03e17936
 SHA512:
-  metadata.gz: 2ffb92c51c36a24ea08db92b8d6e17b30536bb273f726e0f6a93b1e94326f51c07dcf975199c38e0ae397825fe5fdf25ca18a848355ecea4cda9845adc8b52e5
-  data.tar.gz: 2efcd36bbb1c8103b9cc7da90f6b2aa69939bcd5fa4d63c418c0e3da1867abcaf3a9ea7df601223790a4bfdbb267368f8cfc4cd04356d1a02eefc3485e002909
+  metadata.gz: 9a7eddbb8207315d61bda960964b0c051903f8d54c851959383a073a32786b2738a1b0eaf3e2c52ccf56db59fb6869f118b77ea4296ad0b71529f69966f8036f
+  data.tar.gz: d7e57971be1d7f009f5699c43ebd72a9191949cc30c051e3776592d72f5ec831bc0cb568933c4991bb746832079b36db1dcb15ad3f5212b3ab617d0e316136dc

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

@@ -7,6 +7,8 @@ require 'cocoapods-lhj-bin/command/bin/update'
 require 'cocoapods-lhj-bin/command/bin/install'
 require 'cocoapods-lhj-bin/command/bin/import'
 require 'cocoapods-lhj-bin/command/bin/local'
+require 'cocoapods-lhj-bin/command/bin/trans'
+require 'cocoapods-lhj-bin/command/bin/fetch'
 require 'cocoapods-lhj-bin/command/bin/lhj'
 require 'cocoapods-lhj-bin/command/bin/config/push'
 require 'cocoapods-lhj-bin/command/bin/oss/list'

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

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

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Fetch < Bin
+        self.summary = '提取源码的中文字符串，并生成中英文对照csv文件'
+
+        def self.options
+          [
+            %w[--file-type 从文件扩展名中查找中文字符串，默认为m,h],
+            %w[--file-name 生成csv文件名，默认为gen_cn_key.csv]
+          ]
+        end
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h')
+          @file_name = argv.option('file-name', 'gen_cn_key.csv')
+          @cn_keys = []
+          super
+        end
+
+        def run
+          handle_files
+          gen_csv
+        end
+
+        def gen_csv
+          file = File.join(@current_path, @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[:str], k[:fname], k[:dirname]]
+            end
+          end
+          UI.puts "生成csv文件完成.\n文件路径：#{File.absolute_path(file)}".green
+        end
+
+        def handle_files
+          Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+            handle_file f
+          end
+        end
+
+        def handle_file(file)
+          File.open(file, 'r') do |f|
+            f.each_line do |line|
+              handle_line(file, line) if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+            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) }
+        end
+      end
+    end
+  end
+end

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

@@ -1,38 +1,51 @@
 # frozen_string_literal: true
 
 require 'csv'
+require 'cocoapods-lhj-bin/helpers/trans_helper'
 
 module Pod
   class Command
     class Bin < Command
       class Local < Bin
-        self.summary = '生成国际化文件'
+        self.summary = '根据中英文对照csv文件，生成国际化配置, 及批量更新源码(使用国际化写法)'
 
         def self.options
           [
-            %w[--key Key在csv中第几列，默认为0],
-            %w[--cn 中文在csv中第几列，默认为1],
-            %w[--en 英文文在csv中第几列，默认为2]
+            %w[--key-col 国际化key在csv中第几列，默认为0],
+            %w[--cn-col 中文在csv中第几列，默认为1],
+            %w[--en-col 英文在csv中第几列，默认为2],
+            %w[--csv-file csv文件名，默认为当前目录下所有csv文件],
+            %w[--gen-file 生成配置文件名，默认名为: Localizable.strings],
+            %w[--modify-source 修改源码，使用国际化key代替中文字符串],
+            %w[--modify-file-type 需要修改源码的文件类型，默认为m,h],
+            %w[--modify-format-string 修改为国际化后的字符格式，默认为NSLocalizedString(%s, @"")]
           ]
         end
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
-          @key_col = argv.option('key').to_i || 0
-          @cn_col = argv.option('cn').to_i || 1
-          @en_col = argv.option('en').to_i || 2
+          @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
+          @csv_file = argv.option('csv-file', '*')
+          @gen_file_name = argv.option('gen-file', 'Localizable.strings')
+          @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, @"")')
           @key_map = {}
-          @trans_map = {}
-          @trans_map_invert = {}
           super
         end
 
         def run
-          load_trans_map
           read_csv_file
-          write_en_strings
-          write_zh_cn_strings
-          write_zh_hk_strings
+          if @key_map.keys.length.positive?
+            # write_en_strings
+            # write_zh_cn_strings
+            # write_zh_hk_strings
+            handle_modify_source if @modify_source_flag
+          else
+            UI.puts "获取中英文映射文件失败, 检查参数--csv-file=xx是否正常\n".red
+          end
         end
 
         def en_dir_name
@@ -48,34 +61,67 @@ module Pod
         end
 
         def generate_file_name
-          'Localizable.strings'
+          @gen_file_name
         end
 
-        def yaml_file
-          File.join(Pod::Config.instance.home_dir, 'zh2hant.yml')
+        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?
+          end
+          UI.puts '开始修改源码结束'
         end
 
-        def load_trans_map
-          require 'yaml'
-          down_load_yaml unless File.exist?(yaml_file)
-          contents = YAML.safe_load(File.open(yaml_file))
-          @trans_map = contents.to_hash
-          @trans_map_invert = @trans_map.invert
+        def handle_modify_file(file)
+          str = modify_file_string(file)
+          File.open(file, 'w+') do |f|
+            f.write(str)
+          end
         end
 
-        def down_load_yaml
-          require 'open-uri'
-          UI.puts "开始下载简繁配置文件...\n"
-          URI.open('http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml') do |i|
-            File.open(yaml_file, 'w+') do |f|
-              f.write(i.read)
+        def modify_file_string(file)
+          str = ''
+          File.open(file, 'r') do |f|
+            f.each_line do |line|
+              str += modify_format_string(f, line)
             end
           end
+          str
+        end
+
+        def modify_format_string(file, line)
+          result = line
+          result = handle_modify_line line if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+          result
+        end
+
+        def handle_modify_line(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)
+          end
+          result
+        end
+
+        def find_key_by_cn_val(val)
+          cn_key = val[2, val.length - 3]
+          index = @key_map.values.find_index do |obj|
+            /^#{cn_key}$/ =~ obj[:zh]
+          end
+          @key_map.values[index][:key] if index
         end
 
         def read_csv_file
-          Dir.glob("#{@current_path}/**/*.csv").each do |p|
-            CSV.foreach(p) { |row| @key_map[row[@key_col]] = { zh: row[@cn_col], en: row[@en_col] } unless row[0] =~ /[\u4e00-\u9fa5]/ }
+          path = "#{@current_path}/#{@csv_file}.csv"
+          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]/
+            end
           end
         end
 
@@ -85,31 +131,15 @@ module Pod
             val = v[type]
             case area
             when :hk
-              val = trans_zh_hk_str val
+              val = CBin::Trans::Helper.instance.trans_zh_hk_str val
             when :cn
-              val = trans_zh_cn_str val
+              val = CBin::Trans::Helper.instance.trans_zh_cn_str val
             end
             str += "\"#{k}\" = \"#{val}\";\n"
           end
           str
         end
 
-        def trans_zh_cn_str(input)
-          out = []
-          input.each_char do |c|
-            out << (@trans_map_invert[c] || c)
-          end
-          out.join('')
-        end
-
-        def trans_zh_hk_str(input)
-          out = []
-          input.each_char do |c|
-            out << (@trans_map[c] || c)
-          end
-          out.join('')
-        end
-
         def write_to_file(file, contents)
           FileUtils.rm_rf(file) if File.exist?(file)
           FileUtils.mkdir_p(File.dirname(file)) unless File.exist?(File.dirname(file))
@@ -126,17 +156,20 @@ module Pod
         def write_en_strings
           file = File.join(@current_path, en_dir_name, generate_file_name)
           generate_file(file, :en)
+          UI.puts "生成英文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end
 
         def write_zh_cn_strings
           file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
           generate_file(file, :zh)
+          UI.puts "生成简体中文配置完成.文件路径：#{File.absolute_path(file)}\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)
           write_to_file(file, content)
+          UI.puts "生成繁体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end
       end
     end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+require 'cocoapods-lhj-bin/helpers/trans_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Trans < Bin
+        self.summary = '源码中的简繁体转换'
+
+        def self.options
+          [
+            %w[--file-type 文件扩展名，默认为m,h,pch,xib],
+            %w[--zh-cn 转成简体中文，默认转成繁体]
+          ]
+        end
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h,pch,xib')
+          @zh_cn = argv.flag?('zh-cn', false)
+          super
+        end
+
+        def run
+          handler_files
+        end
+
+        def handler_files
+          Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+            handler_file f
+          end
+        end
+
+        def handler_file(file)
+          str = format_file_string(file)
+          File.open(file, 'w+') do |f|
+            f.write(str)
+          end
+        end
+
+        def format_file_string(file)
+          str = ''
+          File.open(file, 'r+') do |f|
+            f.each_line do |line|
+              str += format_line_string(line)
+            end
+          end
+          str
+        end
+
+        def format_line_string(line)
+          result = line
+          if line =~ /[\u4e00-\u9fa5]/
+            result = CBin::Trans::Helper.instance.trans_zh_cn_str(line) if @zh_cn
+            result = CBin::Trans::Helper.instance.trans_zh_hk_str(line) unless @zh_cn
+          end
+          result
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.0.7'
+  VERSION = '0.1.3'
 end
 
 module Pod

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

@@ -0,0 +1,49 @@
+
+module CBin
+  class Trans
+    class Helper
+
+      def self.instance
+        @instance ||= new
+      end
+
+      def yaml_file
+        File.join(Pod::Config.instance.home_dir, 'zh2hant.yml')
+      end
+
+      def load_trans_map
+        require 'yaml'
+        down_load_yaml unless File.exist?(yaml_file)
+        contents = YAML.safe_load(File.open(yaml_file))
+        contents.to_hash
+      end
+
+      def down_load_yaml
+        require 'open-uri'
+        URI.open('http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml') do |i|
+          File.open(yaml_file, 'w+') do |f|
+            f.write(i.read)
+          end
+        end
+      end
+
+      def trans_zh_cn_str(input)
+        @trans_map_invert ||= load_trans_map.invert
+        out = []
+        input.each_char do |c|
+          out << (@trans_map_invert[c] || c)
+        end
+        out.join('')
+      end
+
+      def trans_zh_hk_str(input)
+        @trans_map ||= load_trans_map
+        out = []
+        input.each_char do |c|
+          out << (@trans_map[c] || c)
+        end
+        out.join('')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.3
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -42,16 +42,16 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,7 @@ files:
 - lib/cocoapods-lhj-bin/command/bin/code.rb
 - lib/cocoapods-lhj-bin/command/bin/config/push.rb
 - lib/cocoapods-lhj-bin/command/bin/dup.rb
+- lib/cocoapods-lhj-bin/command/bin/fetch.rb
 - lib/cocoapods-lhj-bin/command/bin/import.rb
 - lib/cocoapods-lhj-bin/command/bin/init.rb
 - lib/cocoapods-lhj-bin/command/bin/initHotKey.rb
@@ -123,6 +124,7 @@ files:
 - lib/cocoapods-lhj-bin/command/bin/repo/update.rb
 - lib/cocoapods-lhj-bin/command/bin/spec/create.rb
 - lib/cocoapods-lhj-bin/command/bin/spec/push.rb
+- lib/cocoapods-lhj-bin/command/bin/trans.rb
 - lib/cocoapods-lhj-bin/command/bin/update.rb
 - lib/cocoapods-lhj-bin/config/config.rb
 - lib/cocoapods-lhj-bin/config/config_asker.rb
@@ -143,6 +145,7 @@ files:
 - lib/cocoapods-lhj-bin/helpers/spec_creator.rb
 - lib/cocoapods-lhj-bin/helpers/spec_files_helper.rb
 - lib/cocoapods-lhj-bin/helpers/spec_source_creator.rb
+- lib/cocoapods-lhj-bin/helpers/trans_helper.rb
 - lib/cocoapods-lhj-bin/helpers/upload_helper.rb
 - lib/cocoapods-lhj-bin/native.rb
 - lib/cocoapods-lhj-bin/native/acknowledgements.rb