cocoapods-aomi-bin 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554bc02daf76ce2c1ff292e42d014d21f20278a2514f48d799c458db509e9865
-  data.tar.gz: f1f818abd7656a5d88996c54975a14e3f65ca31be61bf54e615917f72766b174
+  metadata.gz: 2de50f4edfa779b9e90f5ae4e184d6f6fa16dfa30ccb8391315eed1f5fcf2400
+  data.tar.gz: f2148de18be3ad11c18f1456407f912378c4ff3110185baaaa525438c99b8256
 SHA512:
-  metadata.gz: 87a3ff4a95188fbdcb2e22860791fba9d5e55ec6eb1a49289f09aab9f08f34ae5f76cb3aa7c650279a2b29c66ddc1c031c89527ccefc3e0fc0735f1dcf6fb09d
-  data.tar.gz: 70cd528a6c20c68043e5fc9c51b2bc2e0f5a387250f082a92f2af899610bf523963212c950d46eea3cf86d5317de3c6ba1b2091c4f4c8e1a9baa234a4dae6ab4
+  metadata.gz: cad276b5fa7153d116e8bf4cbd9461b563329b7492ddf12a21536de3ed57d409d46f6cc211d6bf612b3f0f37994f3e487bf6f354fad2fca7d145479e2a993d5a
+  data.tar.gz: cd8cbe520df055dbaaa779221e9dc2856e49bfd7b20bf1bcf23604306e36399f17e7020e0d8c5b94445100a96e7758a5189b9a5a4fd7f8e1d5928c31f69ecad8

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

@@ -75,27 +75,27 @@ 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
 
@@ -150,15 +150,15 @@ module Pod
 
         def modify_format_string(file, line)
           result = line
-          result = handle_modify_line line if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+          result = handle_modify_line(file, line) if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
           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])
+          key = find_key_by_cn_val(file, ma[0])
           if key
             val = format(@modify_format_string, "@\"#{key}\"")
             result = line.gsub(ma[0], val)
@@ -166,11 +166,11 @@ module Pod
           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}$/ =~ 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
 

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

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