cocoapods-aomi-bin 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cfcbfeeae134c9aacd50c954533008ba3236e50fcafe6e15bfef70e4bbc3973
-  data.tar.gz: 864e6bc1e2a0f42ccff3794f19947cedbd4f8bde8115162f776e0017d4576ef1
+  metadata.gz: 5ae3af0a13e50fda02f0dc94b7167bcc90dfbaeb4dbf7e41dacbbf473adbf584
+  data.tar.gz: cf58dc5598b22637808983c72c38d7051d9c927aa34769c7a8cf8429c970e90a
 SHA512:
-  metadata.gz: 755402a04f78ef6a944739939c8ae4a193a255bbef817f2556e61a19659fb3b7e70d59ed5f50f79ccf4aa60f7c5f851b59bf0ed8494fc0b98b695958f211f28f
-  data.tar.gz: 174b6b7804b20c4a76d5805357e28a98360c4ff0d626cab0089b28f3252ecb62990aa3a736b23226983c775562ecb90ed58b7ac1c064f5aa2d130d27cfe8263b
+  metadata.gz: 3837f523f1839690351f4d660a2735daf00bd50641175c9bf95c77f8e4c2f851ec4f171e52ebbfedcaa0fb8bffd54285493ee31443c844834700f8b1f5b4b30b
+  data.tar.gz: 83f0c980b2e5a8459dd4e406b86ec68fb7b6dd55e79d282659d52cd936ef6595bd391a40f47430eb3aa863a7a14fa54ee575eb392f30641764d412639b888c2a

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

@@ -42,7 +42,7 @@ module Pod
 
         def run
           down_load_csv_file if need_download
-          read_csv_file
+          read_csv
           if @key_map.keys.length.positive?
             write_en_strings
             write_zh_hk_strings
@@ -122,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
@@ -194,17 +209,10 @@ module Pod
           @key_map.values[index][:key] if index
         end
 
-        def format_str(type, area = :origin)
+        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
@@ -229,18 +237,12 @@ 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
+          gen_zh_cn_strings_file
         end
 
         def gen_zh_cn_strings_file
           file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
-          area = :origin
-          area = :cn if CBin::LocalConfig.instance.config['trans_zh_cn']
-          content = format_str(:zh, area)
+          content = format_str(:cn)
           write_to_file(file, content)
           UI.puts "生成简体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end
@@ -254,9 +256,7 @@ module Pod
 
         def write_zh_hk_strings
           file = File.join(@current_path, zh_hk_dir_name, generate_file_name)
-          area = :origin
-          area = :hk if CBin::LocalConfig.instance.config['trans_zh_hk']
-          content = format_str(:zh, area)
+          content = format_str(:hk)
           write_to_file(file, content)
           UI.puts "生成繁体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end

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

@@ -33,11 +33,16 @@ module CBin
     end
 
     def load_config
-      if File.exist?(config_file)
-        YAML.load_file(config_file)
-      else
-        default_config
-      end
+      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

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.12'
+  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.12
+  version: 0.1.13
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods