cocoapods-aomi-bin 0.0.6 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89d1160267cbaca0726951d62739924145ad03acf6b2c8841b728fe2fa15ecb
-  data.tar.gz: de326cca1219934abcc1b23e6bde7a82747fb605c54c67f38542d437df194797
+  metadata.gz: ff454de568d2c55f94a01c7c5309403ce55484b1e249f93dff8e5f4d2444ba89
+  data.tar.gz: b8d6e9bca5a8be1808ba78bfc4a9cb4fba8c0cd5dd7599a4c9f6aabbcfa02170
 SHA512:
-  metadata.gz: 2d95cd0bb9a8c9cd9ede100eb9dab67e7ccdc9f4393852c9c0a98fa6d31c2082303a61840a2b23503db3a872a169b1fd0a04debba5a476ce71a3e2033d2778b4
-  data.tar.gz: cb71472ec07895dfdd8499d0a1a571c54ca35210c2c335160b1a5f2375a5626b0263da28f0bd2be575108bc2d0d5995fc65cb0bb48eeaabd467daccaa6aa6fc4
+  metadata.gz: 5903c78b3823f165bd11a85cf6e31ba6563222a572f01b69b0c1233df4f846410eca99f054668a18368d03fa0fb0b0e35a19db59c8f2c673992bbe7ae63caab3
+  data.tar.gz: 586dac7e96c3d2ccf29d089134e5c8140da29086d87e52e54196bdf1c73121a1ac89aba955b0ec3f5feb14e5e441bb0da797b29418190d3525bc3d07dc9c4beb

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

@@ -7,7 +7,12 @@ 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/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'
+require 'cocoapods-lhj-bin/command/bin/oss/del'
 require 'cocoapods-lhj-bin/helpers'
 require 'cocoapods-lhj-bin/native'
 

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

@@ -0,0 +1,48 @@
+#coding:utf-8
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+require 'yaml'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Init < Bin
+        class Push < Init
+          self.summary = '推送配置文档到OSS.'
+
+          def initialize(argv)
+            super
+          end
+
+          def run
+            push
+          end
+
+          def push_cn_hk
+            file = File.expand_path("#{Pod::Config.instance.home_dir}/zh2hant.yml")
+            CBin::OSS::Helper.instance.upload('zh2hant.yml', file)
+          end
+
+          def push
+            file = File.expand_path("#{Pod::Config.instance.home_dir}/bin_dev.yml")
+            CBin::OSS::Helper.instance.upload('bin_dev.yml', file)
+          end
+
+          def trans
+            key_map = {}
+            path = '/Users/lihaijian/workspace/cocoa/cocoapods-lhj-bin-build-temp/zh2Hant.properties'
+            File.open(path, 'r+') do |f|
+              f.each_line do |line|
+                arr = line.split('=')
+                key = [arr[0][2, 4].hex].pack("U")
+                val = arr[1].strip!
+                key_map[key] = [val[2, 4].hex].pack("U")
+              end
+            end
+            File.open('/Users/lihaijian/workspace/cocoa/cocoapods-lhj-bin-build-temp/zh2hant.yml', 'w') { |f| f.write key_map.to_yaml }
+          end
+
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,54 +1,177 @@
+# frozen_string_literal: true
+
 require 'csv'
+require 'cocoapods-lhj-bin/helpers/trans_helper'
 
 module Pod
   class Command
     class Bin < Command
       class Local < Bin
-        self.summary = '国际化文件变更'
+        self.summary = '根据中英文对照csv文件，生成国际化配置, 及批量更新源码(使用国际化写法)'
+
+        def self.options
+          [
+            %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[--modify-source 修改源码，使用国际化key代替中文字符串],
+            %w[--modify-file-type 需要修改源码的文件类型，默认为m,h],
+            %w[--modify-format-string 修改为国际化后的字符格式，默认为NSLocalizedString(%s, @"")]
+          ]
+        end
 
         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
+          @csv_file = argv.option('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
           read_csv_file
-          write_en_strings
-          write_zh_hans_strings
+          if @key_map.keys.length.positive?
+            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
+          end
+        end
+
+        def en_dir_name
+          'en.lproj'
+        end
+
+        def zh_hk_dir_name
+          'zh-hk.lproj'
+        end
+
+        def zh_cn_dir_name
+          'zh-cn.lproj'
+        end
+
+        def generate_file_name
+          @gen_file_name
+        end
+
+        def handle_modify_source
+          UI.puts '开始修改源码开始'
+          Dir.glob("#{@current_path}/**/*.{#{@modify_file_type}}").each do |f|
+            handle_modify_file f if File.stat(f).writable?
+          end
+          UI.puts '开始修改源码结束'
+        end
+
+        def handle_modify_file(file)
+          str = modify_file_string(file)
+          File.open(file, 'w+') do |f|
+            f.write(str)
+          end
+        end
+
+        def modify_file_string(file)
+          str = ''
+          File.open(file, 'r') do |f|
+            f.each_line do |line|
+              str += modify_format_string(f, line)
+            end
+          end
+          str
+        end
+
+        def modify_format_string(file, line)
+          result = line
+          result = handle_modify_line line if line =~ /@"[^"]*[\u4e00-\u9fa5]+[^"]*"/
+          result
+        end
+
+        def handle_modify_line(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)
+          end
+          result
+        end
+
+        def find_key_by_cn_val(val)
+          cn_key = val[2, val.length - 3]
+          @cn_key_map[cn_key]
         end
 
         def read_csv_file
-          path = "#{@current_path}/b_lvr_land_a_land.csv"
-          CSV.foreach(path) { |row| @key_map[row[0]] = { zh: row[1], en: row[3] } unless row[0] =~ /[\u4e00-\u9fa5]/ }
+          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
         end
 
-        def file_str(type)
+        def format_str(type, area = :cn)
           str = ''
           @key_map.each do |k, v|
-            str += "\"#{k}\" = \"#{v[type]}\";\n"
+            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"
           end
           str
         end
 
-        def write_to_file(file, type)
+        def write_to_file(file, contents)
           FileUtils.rm_rf(file) if File.exist?(file)
+          FileUtils.mkdir_p(File.dirname(file)) unless File.exist?(File.dirname(file))
           File.open(file, 'w+') do |f|
-            str = file_str(type)
-            f.write(str)
+            f.write(contents)
           end
         end
 
+        def generate_file(file, type)
+          content = format_str(type)
+          write_to_file(file, content)
+        end
+
         def write_en_strings
-          file = "#{@current_path}/Main_en.strings"
-          write_to_file(file, :en)
+          file = File.join(@current_path, en_dir_name, generate_file_name)
+          generate_file(file, :en)
+          UI.puts "生成英文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end
 
-        def write_zh_hans_strings
-          file = "#{@current_path}/Main_zh_hans.strings"
-          write_to_file(file, :zh)
+        def write_zh_cn_strings
+          file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
+          generate_file(file, :zh)
+          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)
+          write_to_file(file, content)
+          UI.puts "生成繁体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
+        end
       end
     end
   end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class OSS < Bin
+        class Del < OSS
+          self.summary = '删除OSS的key'
+
+          self.arguments = [
+            CLAide::Argument.new('--key=XX', true)
+          ]
+
+          def self.options
+            [
+              ['--key', 'OSS对应的key']
+            ]
+          end
+
+          def initialize(argv)
+            @key = argv.option('key')
+            super
+          end
+
+          def validate!
+            help! "请输入key" unless @key
+            super
+          end
+
+          def run
+            CBin::OSS::Helper.instance.delete(@key)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require 'cocoapods-lhj-bin/helpers/oss_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class OSS < Bin
+        class List < OSS
+          self.summary = '查看OSS列表'
+
+          def initialize(argv)
+            super
+          end
+
+          def run
+            objects = CBin::OSS::Helper.instance.list
+            objects.each do |o|
+              path = "#{CBin::OSS::Helper.instance.url_path}/#{o.key}"
+              UI.puts path.green
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+require 'cocoapods-lhj-bin/helpers/trans_helper'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Trans < Bin
+        self.summary = '源码中的简繁体转换'
+
+        def self.options
+          [
+            %w[--file-type 文件扩展名，默认为m,h,pch,xib],
+            %w[--zh-cn 转成简体中文，默认转成繁体]
+          ]
+        end
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h,pch,xib')
+          @zh_cn = argv.flag?('zh-cn', false)
+          super
+        end
+
+        def run
+          handler_files
+        end
+
+        def handler_files
+          Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+            handler_file f
+          end
+        end
+
+        def handler_file(file)
+          str = format_file_string(file)
+          File.open(file, 'w+') do |f|
+            f.write(str)
+          end
+        end
+
+        def format_file_string(file)
+          str = ''
+          File.open(file, 'r+') do |f|
+            f.each_line do |line|
+              str += format_line_string(line)
+            end
+          end
+          str
+        end
+
+        def format_line_string(line)
+          result = line
+          if line =~ /[\u4e00-\u9fa5]/
+            result = CBin::Trans::Helper.instance.trans_zh_cn_str(line) if @zh_cn
+            result = CBin::Trans::Helper.instance.trans_zh_hk_str(line) unless @zh_cn
+          end
+          result
+        end
+
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,35 @@
+require 'aliyun/oss'
+require 'cocoapods-lhj-bin/config/config'
+
+module CBin
+  class OSS
+    class Helper
+      def initialize
+        @client = Aliyun::OSS::Client.new(endpoint: CBin.config.oss_endpoint,
+                                          access_key_id: CBin.config.oss_access_key_id,
+                                          access_key_secret: CBin.config.oss_access_key_secret)
+        @bucket = @client.get_bucket(CBin.config.oss_bucket)
+      end
+
+      def url_path
+        "http://#{CBin.config.oss_bucket}.#{CBin.config.oss_endpoint}"
+      end
+
+      def upload(key, file)
+        @bucket.put_object(key, :file => file)
+      end
+
+      def list
+        @bucket.list_objects
+      end
+
+      def delete(key)
+        @bucket.delete_object(key)
+      end
+
+      def self.instance
+        @instance ||= new
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+
+module CBin
+  class Trans
+    class Helper
+
+      def self.instance
+        @instance ||= new
+      end
+
+      def yaml_file
+        File.join(Pod::Config.instance.home_dir, 'zh2hant.yml')
+      end
+
+      def load_trans_map
+        require 'yaml'
+        down_load_yaml unless File.exist?(yaml_file)
+        contents = YAML.safe_load(File.open(yaml_file))
+        contents.to_hash
+      end
+
+      def down_load_yaml
+        require 'open-uri'
+        URI.open('http://aomi-ios-repo.oss-cn-shenzhen.aliyuncs.com/zh2hant.yml') do |i|
+          File.open(yaml_file, 'w+') do |f|
+            f.write(i.read)
+          end
+        end
+      end
+
+      def trans_zh_cn_str(input)
+        @trans_map_invert ||= load_trans_map.invert
+        out = []
+        input.each_char do |c|
+          out << (@trans_map_invert[c] || c)
+        end
+        out.join('')
+      end
+
+      def trans_zh_hk_str(input)
+        @trans_map ||= load_trans_map
+        out = []
+        input.each_char do |c|
+          out << (@trans_map[c] || c)
+        end
+        out.join('')
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'aliyun/oss'
+require 'cocoapods-lhj-bin/helpers/oss_helper'
 require 'cocoapods-lhj-bin/native/podfile'
 require 'cocoapods/command/gen'
 require 'cocoapods/generate'
@@ -17,8 +17,6 @@ module CBin
         @spec = spec
         @code_dependencies = code_dependencies
         @sources = sources
-        @client = Aliyun::OSS::Client.new(endpoint: CBin.config.oss_endpoint, access_key_id: CBin.config.oss_access_key_id, access_key_secret: CBin.config.oss_access_key_secret )
-        @bucket = @client.get_bucket(CBin.config.oss_bucket)
       end
 
       def upload
@@ -73,7 +71,7 @@ EOF
           res = File.exist?(zip_file)
         end
         if res
-          @bucket.put_object("#{@spec.name}/#{@spec.version}/#{@spec.name}.zip", :file => zip_file)
+          CBin::OSS::Helper.instance.upload("#{@spec.name}/#{@spec.version}/#{@spec.name}.zip", zip_file)
         end
         res
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.2
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -42,16 +42,16 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,9 @@ files:
 - lib/cocoapods-lhj-bin/command/bin/archive.rb
 - lib/cocoapods-lhj-bin/command/bin/auto.rb
 - 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
@@ -117,9 +119,12 @@ files:
 - 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/oss/del.rb
+- lib/cocoapods-lhj-bin/command/bin/oss/list.rb
 - lib/cocoapods-lhj-bin/command/bin/repo/update.rb
 - lib/cocoapods-lhj-bin/command/bin/spec/create.rb
 - lib/cocoapods-lhj-bin/command/bin/spec/push.rb
+- lib/cocoapods-lhj-bin/command/bin/trans.rb
 - lib/cocoapods-lhj-bin/command/bin/update.rb
 - lib/cocoapods-lhj-bin/config/config.rb
 - lib/cocoapods-lhj-bin/config/config_asker.rb
@@ -135,10 +140,12 @@ files:
 - lib/cocoapods-lhj-bin/helpers/framework_builder.rb
 - lib/cocoapods-lhj-bin/helpers/library.rb
 - lib/cocoapods-lhj-bin/helpers/library_builder.rb
+- lib/cocoapods-lhj-bin/helpers/oss_helper.rb
 - lib/cocoapods-lhj-bin/helpers/sources_helper.rb
 - lib/cocoapods-lhj-bin/helpers/spec_creator.rb
 - lib/cocoapods-lhj-bin/helpers/spec_files_helper.rb
 - lib/cocoapods-lhj-bin/helpers/spec_source_creator.rb
+- lib/cocoapods-lhj-bin/helpers/trans_helper.rb
 - lib/cocoapods-lhj-bin/helpers/upload_helper.rb
 - lib/cocoapods-lhj-bin/native.rb
 - lib/cocoapods-lhj-bin/native/acknowledgements.rb