cocoapods-aomi-bin 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d60564dc2567c05414925657a0bfcc79c03e29346af7799a236e824a48b522b
-  data.tar.gz: c58a951a5261bd33adff5d05e133385a3cc225059b103769a0fb8af333072917
+  metadata.gz: 8fc461c5e823740442cc8c083a408a4acb93360fc6363a183a5679d070c79df0
+  data.tar.gz: '0397bd469fb875c69681e7c5739439a923bf31ef7846386f6d07f2f63952c122'
 SHA512:
-  metadata.gz: a21bb3fff848840bf1a72671bfc09fadec1dbf67c2103a1958a897065f6fd3d2f69332715bc0afe2e64ed4fc39f2ae3490a3a5b8c3e9eb4df155bf718b522c85
-  data.tar.gz: 352d771b8a7731af97c00ac7f83753178f2a8d7bbab02d188d1e4f45f31246f8cb523e2b6d26167034a6766eae96a2ce83b8b95675d37a443cf8c7304898dd48
+  metadata.gz: c963ee1a10a974416d2cd5525f539a905e79439bbf8680a9fe2cf44bf531de1782bfbe40e96fb0aeafe911ac833d2c7a88223cbaec1ff0dfca06803004e6fcdd
+  data.tar.gz: 171b50fc4a031baf5414c3a9641665e790d46c5a7bf0ea530ef45ab633ad50ee5035295d2b14e8f36d015b60cac0f35749aa6c2b709aa8da66a9feb80af4276b

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/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,25 +27,25 @@ 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_cn_strings if CBin::LocalConfig.instance.config['gen_zh_cn']
             write_zh_hk_strings
             handle_modify_source if @modify_source_flag
           else
@@ -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 }
@@ -185,7 +194,7 @@ module Pod
           @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]
@@ -221,13 +230,18 @@ module Pod
 
         def write_zh_cn_strings
           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 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.8'
+  VERSION = '0.1.9'
 end
 
 module Pod

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.9
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 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