cocoapods-aomi-bin 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761d8708d5a6a58529721f57a03176cc6b304a299d73786da206eb2a891b55d6
-  data.tar.gz: b74e89002309aa292a591e0a37af7cc2f02bb0064ee517d12cd86cfc03e17936
+  metadata.gz: 8d60564dc2567c05414925657a0bfcc79c03e29346af7799a236e824a48b522b
+  data.tar.gz: c58a951a5261bd33adff5d05e133385a3cc225059b103769a0fb8af333072917
 SHA512:
-  metadata.gz: 9a7eddbb8207315d61bda960964b0c051903f8d54c851959383a073a32786b2738a1b0eaf3e2c52ccf56db59fb6869f118b77ea4296ad0b71529f69966f8036f
-  data.tar.gz: d7e57971be1d7f009f5699c43ebd72a9191949cc30c051e3776592d72f5ec831bc0cb568933c4991bb746832079b36db1dcb15ad3f5212b3ab617d0e316136dc
+  metadata.gz: a21bb3fff848840bf1a72671bfc09fadec1dbf67c2103a1958a897065f6fd3d2f69332715bc0afe2e64ed4fc39f2ae3490a3a5b8c3e9eb4df155bf718b522c85
+  data.tar.gz: 352d771b8a7731af97c00ac7f83753178f2a8d7bbab02d188d1e4f45f31246f8cb523e2b6d26167034a6766eae96a2ce83b8b95675d37a443cf8c7304898dd48

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

@@ -0,0 +1,147 @@
+# 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 = []
+          @key_map = {}
+          super
+        end
+
+        def run
+          handle_files
+          gen_csv
+          # update_source_header
+        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, csv_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[: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 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 zh_ch_reg =~ line
+            end
+          end
+        end
+
+        def handle_line(file, line)
+          line.scan(zh_ch_reg) do |str|
+            fname = File.basename(file)
+            dir_name = File.dirname(file)
+            mod_name = framework_name(dir_name)
+            key = "#{mod_name}.#{File.basename(file, '.*')}.#{rand(36**8).to_s(36)}"
+            cn_str = str[2, str.length - 3]
+            en_str = cn_str.gsub(/[\u4e00-\u9fa5]/, 'x')
+            @cn_keys << { key: key, cn: cn_str, en: en_str, fname: fname, dirname: dir_name }
+          end
+        end
+
+        def framework_name(path)
+          mod_name = 'Main'
+          if /pods/i =~ path
+            ary = path.split('/')
+            index = ary.find_index { |p| p.eql?('Pods') }
+            if index
+              i = index + 1
+              mod_name = ary[i]
+            end
+          end
+          mod_name
+        end
+
+        def handle_static_line(file, line)
+          line.scan(zh_ch_reg) do |str|
+            ma = line.match(/\*.*=/)
+            key = ma[0][1, ma[0].length - 2].strip
+            @key_map[key.to_sym] = str
+          end
+        end
+
+        def update_source_header
+          Dir.glob("#{@current_path}/**/*.{m,h}").each do |f|
+            if f =~ /Pods/
+              handler_file(f) if f =~ %r{Pods/MLF} || f =~ %r{Pods/MLU} || f =~ %r{Pods/MLN}
+            else
+              handler_file(f)
+            end
+          end
+        end
+
+        def handler_file(file)
+          puts "#{File.absolute_path(file)} \n"
+          File.chmod(0o644, file)
+          str = file_string(file)
+          File.open(file, 'w+') do |f|
+            f.write(str)
+          end
+          File.chmod(0o444, file) if file =~ /Pods/
+        end
+
+        def file_string(file)
+          str = ''
+          File.open(file, 'r+') do |f|
+            f.each_line do |line|
+              str += format_string(f, line)
+            end
+          end
+          str
+        end
+
+        def format_string(file, line)
+          result = line
+          unless /static/ =~ line
+            @key_map.each_key do |key|
+              n_key = /#{key.to_s}\s/
+              n_val = "#{@key_map[key]}\s"
+              result = result.gsub(n_key, n_val)
+            end
+          end
+          result
+        end
+
+      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,7 +29,8 @@ 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')
@@ -37,46 +40,109 @@ module Pod
         end
 
         def run
+          down_load_csv_file if @download_csv_files
           read_csv_file
           if @key_map.keys.length.positive?
-            # write_en_strings
-            # write_zh_cn_strings
-            # write_zh_hk_strings
+            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
+            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?
+            # handle_modify_file f if File.stat(f).writable?
+            if f =~ /Pods/
+              handle_modify_file(f) if f =~ %r{Pods/ML}
+            else
+              handle_modify_file(f)
+            end
           end
-          UI.puts '开始修改源码结束'
+          UI.puts '修改源码结束'
         end
 
         def handle_modify_file(file)
+          File.chmod(0o644, file)
           str = modify_file_string(file)
           File.open(file, 'w+') do |f|
             f.write(str)
           end
+          File.chmod(0o444, file) if file =~ /Pods/
         end
 
         def modify_file_string(file)
@@ -89,42 +155,36 @@ 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]
-          index = @key_map.values.find_index do |obj|
-            /^#{cn_key}$/ =~ obj[:zh]
-          end
+          index = @key_map.values.find_index { |obj| cn_key.eql?(obj[:zh]) && /#{file_name}/ =~ obj[:key] }
+          index ||= @key_map.values.find_index { |obj| cn_key.eql?(obj[:zh]) }
           @key_map.values[index][:key] if index
         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]
-              @key_map[key] = { key: key, zh: row[@cn_col], en: row[@en_col] } unless key =~ /[\u4e00-\u9fa5]/
-            end
-          end
-        end
-
         def format_str(type, area = :cn)
           str = ''
           @key_map.each do |k, v|

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.3'
+  VERSION = '0.1.8'
 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.3
+  version: 0.1.8
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-19 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

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

@@ -1,68 +0,0 @@
-# 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