cocoapods-aomi-bin 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff454de568d2c55f94a01c7c5309403ce55484b1e249f93dff8e5f4d2444ba89
-  data.tar.gz: b8d6e9bca5a8be1808ba78bfc4a9cb4fba8c0cd5dd7599a4c9f6aabbcfa02170
+  metadata.gz: daeba67369d05792796bf13709af702f4ed8937c74f4a66755fc02160a4cc8e9
+  data.tar.gz: 1f4db6b1b3609a580b14da4b6d548ec17b4fc8d16d06e1ae85f199695c65f088
 SHA512:
-  metadata.gz: 5903c78b3823f165bd11a85cf6e31ba6563222a572f01b69b0c1233df4f846410eca99f054668a18368d03fa0fb0b0e35a19db59c8f2c673992bbe7ae63caab3
-  data.tar.gz: 586dac7e96c3d2ccf29d089134e5c8140da29086d87e52e54196bdf1c73121a1ac89aba955b0ec3f5feb14e5e441bb0da797b29418190d3525bc3d07dc9c4beb
+  metadata.gz: d96eb617e47fa8bf0e399d610d8aab68a30b21fac029168a2c4839b4ae3570b839f4f71a1e518a954bff1cb822c635ec1c47d052fad147daa8e9e423930ed5c5
+  data.tar.gz: 94e010fbd073a784cf9a4be53e961dc922b201cd51d69bb35221c301d782b9da500902df86b4f8b0e3d3d4e29f4bbafeefaa20dc689f6e2f8923ec7bc3b28a3f

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

@@ -6,9 +6,10 @@ require 'cocoapods-lhj-bin/command/bin/code'
 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/local/local'
+require 'cocoapods-lhj-bin/command/bin/local/fetch'
+require 'cocoapods-lhj-bin/command/bin/local/upload'
 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/{fetch.rb → local/fetch.rb}

@@ -28,8 +28,14 @@ module Pod
           gen_csv
         end
 
+        def csv_file_name
+          file_name = @file_name
+          file_name = "#{@file_name}.csv" unless /.csv$/ =~ @file_name
+          file_name
+        end
+
         def gen_csv
-          file = File.join(@current_path, @file_name)
+          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 中文 英文 原字符 所在文件 文件路径]
@@ -46,21 +52,24 @@ 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|
+            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

data/lib/cocoapods-lhj-bin/command/bin/{local.rb → local/local.rb}

@@ -2,6 +2,7 @@
 
 require 'csv'
 require 'cocoapods-lhj-bin/helpers/trans_helper'
+require 'cocoapods-lhj-bin/helpers/oss_helper'
 
 module Pod
   class Command
@@ -14,11 +15,12 @@ module Pod
             %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[--download-csv 云端下载cvs的文件名],
+            %w[--read-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, @"")]
+            %w[--modify-format-string 修改为国际化后的字符格式，默认为NSLocalizedString(%s,@"")]
           ]
         end
 
@@ -27,17 +29,18 @@ module Pod
           @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', '*')
+          @download_csv_files = argv.option('download-csv')
+          @read_csv_file = argv.option('read-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 = {}
-          @cn_key_map = {}
           super
         end
 
         def run
+          down_load_csv_file if @download_csv_files
           read_csv_file
           if @key_map.keys.length.positive?
             write_en_strings
@@ -45,32 +48,87 @@ module Pod
             write_zh_hk_strings
             handle_modify_source if @modify_source_flag
           else
-            UI.puts "获取中英文映射文件失败, 检查参数--csv-file=xx是否正常\n".red
+            UI.puts "获取中英文映射文件失败, 检查参数--read-csv-file=xx是否正常\n".red
           end
         end
 
         def en_dir_name
-          'en.lproj'
+          'local_gen/en.lproj'
         end
 
         def zh_hk_dir_name
-          'zh-hk.lproj'
+          'local_gen/zh-hk.lproj'
         end
 
         def zh_cn_dir_name
-          'zh-cn.lproj'
+          'local_gen/zh-cn.lproj'
         end
 
         def generate_file_name
           @gen_file_name
         end
 
+        def read_csv_file_name
+          file_name = @read_csv_file
+          file_name = "#{@read_csv_file}.csv" unless /.csv$/ =~ @read_csv_file
+          file_name
+        end
+
+        def down_load_csv_file
+          ary = get_download_keys
+          ary.each do |key|
+            file_name = File.basename(key)
+            file = File.join(@current_path, file_name)
+            backup_csv_file file if File.exist?(file)
+            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)
+          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)
+          all_keys = CBin::OSS::Helper.instance.list.map(&:key)
+          csv_files.each do |f|
+            arr = all_keys.select { |k| %r{^csv/} =~ k && /#{f}/ =~ k }
+            if arr.count.positive?
+              arr.sort! { |a, b| b.split(%r{/})[1].to_i <=> a.split(%r{/})[1].to_i }
+              download_keys << arr[0]
+            end
+          end
+          download_keys
+        end
+
+        def read_csv_file
+          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]/
+            end
+          end
+        end
+
         def handle_modify_source
-          UI.puts '开始修改源码开始'
+          UI.puts '修改源码开始'
           Dir.glob("#{@current_path}/**/*.{#{@modify_file_type}}").each do |f|
             handle_modify_file f if File.stat(f).writable?
           end
-          UI.puts '开始修改源码结束'
+          UI.puts '修改源码结束'
         end
 
         def handle_modify_file(file)
@@ -90,40 +148,34 @@ 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]
-          @cn_key_map[cn_key]
-        end
-
-        def read_csv_file
-          path = "#{@current_path}/#{@csv_file}.csv"
-          Dir.glob(path).each do |p|
-            CSV.foreach(p) do |row|
-              key = row[@key_col]
-              unless key =~ /[\u4e00-\u9fa5]/
-                @key_map[key] = { zh: row[@cn_col], en: row[@en_col] }
-                @cn_key_map[row[@cn_col]] = key
-              end
-            end
-          end
+          index = @key_map.values.find_index { |obj| /^#{cn_key}$/ =~ obj[:zh] && /^#{file_name}/ =~ obj[:key] }
+          index ||= @key_map.values.find_index { |obj| /^#{cn_key}$/ =~ obj[:zh] }
+          @key_map.values[index][:key] if index
         end
 
         def format_str(type, area = :cn)

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

@@ -0,0 +1,46 @@
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Local < Bin
+        class Upload < Local
+          self.summary = '上传中英文对照csv文件'
+
+          def self.options
+            [
+              %w[--upload-file 上传中英文对照csv文件名]
+            ]
+          end
+
+          def initialize(argv)
+            @pwd_path = argv.shift_argument || Dir.pwd
+            @upload_csv_file = argv.option('upload-file', '*.csv')
+            super
+          end
+
+          def csv_file_name
+            file_name = @upload_csv_file
+            file_name = "#{@upload_csv_file}.csv" unless /.csv$/ =~ @upload_csv_file
+            file_name
+          end
+
+          def csv_oss_key(file_name)
+            "csv/#{Time.now.to_i}/#{file_name}"
+          end
+
+          def run
+            csv_files = File.join(@pwd_path, '**', csv_file_name)
+            Dir.glob(csv_files).each do |f|
+              file_name = File.basename(f)
+              oss_key = csv_oss_key file_name
+              CBin::OSS::Helper.instance.upload(oss_key, f)
+              url = CBin::OSS::Helper.instance.object_url(oss_key)
+              UI.puts "云端上传成功.下载Url：#{url}\n".green
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ module Pod
           end
 
           def validate!
-            help! "请输入key" unless @key
+            help! '请输入key' unless @key
             super
           end
 

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

@@ -8,10 +8,6 @@ module Pod
         class List < OSS
           self.summary = '查看OSS列表'
 
-          def initialize(argv)
-            super
-          end
-
           def run
             objects = CBin::OSS::Helper.instance.list
             objects.each do |o|

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

@@ -36,12 +36,9 @@ module CBin
       case configuration_env
       when 'release_iphoneos'
         file = config_release_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
       when 'debug_iphoneos'
         file = config_debug_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
       when 'dev'
-        puts "\n======  #{configuration_env} 环境 ========"
       else
         raise "\n=====  #{configuration_env} 参数有误，请检查%w[dev debug_iphoneos release_iphoneos]===="
       end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.2'
+  VERSION = '0.1.7'
 end
 
 module Pod

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

@@ -19,6 +19,14 @@ module CBin
         @bucket.put_object(key, :file => file)
       end
 
+      def down_load(key, file)
+        @bucket.get_object(key, :file => file)
+      end
+
+      def object_url(key)
+        @bucket.object_url(key, false)
+      end
+
       def list
         @bucket.list_objects
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -111,14 +111,15 @@ 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
 - lib/cocoapods-lhj-bin/command/bin/install.rb
 - lib/cocoapods-lhj-bin/command/bin/lhj.rb
 - lib/cocoapods-lhj-bin/command/bin/lib/lint.rb
-- lib/cocoapods-lhj-bin/command/bin/local.rb
+- lib/cocoapods-lhj-bin/command/bin/local/fetch.rb
+- lib/cocoapods-lhj-bin/command/bin/local/local.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
 - lib/cocoapods-lhj-bin/command/bin/repo/update.rb