cocoapods-aomi-bin 0.1.10 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f241532f973a1e5903475c7b395bda5e20c234aae56f570785f68e3e6f7911
-  data.tar.gz: 10b05f2cf2f632d8db9fa4298ee76f6df6b11f4eca036dded2e6c4890e4aaee9
+  metadata.gz: ed246e9a0f0e2f98e30932e84961ac9134201400e7b699264faf3f1f0cc122ae
+  data.tar.gz: 80944ebf177b7dcfebc249d45effba91be1072988261a841f19cf89000928a44
 SHA512:
-  metadata.gz: ffb72bdc8ae5cd1f604e4ccd03f98710f180dd15ae1a96ceb02c273f07dcf783f4a40da828ac124faafa6b234cfe81820a1ad3541d42ec8a45ebb9f0a0ce5ac1
-  data.tar.gz: 2a0cd1ca1db7712681c6b626f5ef87e1c5c0db90c7c0557e16670af5fd013d35e9b732b9c35e26f9f1f918569671a617f9e8c897e70608a9bdfac95389b226c6
+  metadata.gz: 8704818341ad7763e15195dcc3f6a925d1a530fac67f027303cdab6ded57ebff868a1f84572999d44b35538dbe8d6d99d92d953ce3befe32d7055377b02c6eb1
+  data.tar.gz: f869b158e0a6cd7f5ae359e349a9547c0159bd4a72095af484308c1a2528cb2dd096c76acbbcfa53e65d0f5b1c982eeff8e5a1be1c2bb6a4513fde10634c80ed

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

@@ -6,11 +6,15 @@ 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/reverse_import'
 require 'cocoapods-lhj-bin/command/bin/local/local'
 require 'cocoapods-lhj-bin/command/bin/local/fetch'
+require 'cocoapods-lhj-bin/command/bin/local/filter'
+require 'cocoapods-lhj-bin/command/bin/local/micro_service'
 require 'cocoapods-lhj-bin/command/bin/local/upload'
 require 'cocoapods-lhj-bin/command/bin/trans'
 require 'cocoapods-lhj-bin/command/bin/lhj'
+require 'cocoapods-lhj-bin/command/bin/model'
 require 'cocoapods-lhj-bin/command/bin/config/push'
 require 'cocoapods-lhj-bin/command/bin/oss/list'
 require 'cocoapods-lhj-bin/command/bin/oss/del'

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

@@ -18,8 +18,8 @@ module Pod
           end
 
           def push_cn_hk
-            file = File.expand_path("#{Pod::Config.instance.home_dir}/zh2hant.yml")
-            CBin::OSS::Helper.instance.upload('zh2hant.yml', file)
+            file = File.expand_path("#{Pod::Config.instance.home_dir}/localizable_config.yml")
+            CBin::OSS::Helper.instance.upload('localizable_config.yml', file)
           end
 
           def push

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

@@ -50,7 +50,13 @@ module Pod
 
         def handle_files
           Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
-            handle_file f
+            dir_name = File.dirname(f)
+            if /Pods/ =~ f
+              mod_name = framework_name(dir_name)
+              handle_file f if /^ML/ =~ mod_name
+            else
+              handle_file f
+            end
           end
         end
 
@@ -61,7 +67,7 @@ module Pod
         def handle_file(file)
           File.open(file, 'r') do |f|
             f.each_line do |line|
-              handle_line(file, line) if zh_ch_reg =~ line
+              handle_line(file, line) if zh_ch_reg =~ line && !((/DDLog/ =~ line) || (/NSLog/ =~ line))
             end
           end
         end
@@ -71,6 +77,7 @@ module Pod
             fname = File.basename(file)
             dir_name = File.dirname(file)
             mod_name = framework_name(dir_name)
+            # ('a'..'z').to_a.shuffle[0..12].join
             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')
@@ -102,9 +109,11 @@ module Pod
         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}
+              dir_name = File.dirname(f)
+              mod_name = framework_name(dir_name)
+              handle_file f if /^ML/ =~ mod_name
             else
-              handler_file(f)
+              handler_file f
             end
           end
         end
@@ -140,7 +149,6 @@ module Pod
           end
           result
         end
-
       end
     end
   end

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Filter < Bin
+        self.summary = '过滤重复对象'
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h')
+          @file_name = argv.option('file-name', 'MaucaoLife_zh_en.csv')
+          @cn_keys = []
+          @key_map = {}
+          @used_keys = []
+          super
+        end
+
+        def run
+          fetch_keys
+          read_csv
+          gen_csv
+        end
+
+        def csv_file_name
+          file_name = @file_name
+          file_name = "#{@file_name}.csv" unless /.csv$/ =~ @file_name
+          file_name
+        end
+
+        def read_csv
+          path = File.join(@current_path, csv_file_name)
+          Dir.glob(path).each do |p|
+            CSV.foreach(p) do |row|
+              key = row[0]
+              if @used_keys.any? { |k| k.eql?(key) }
+                @cn_keys << { key: key, cn: row[1], en: row[2], fname: row[3], dirname: row[4] }
+              end
+            end
+          end
+        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 fetch_keys
+          Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+            handle_file f
+          end
+        end
+
+        def zh_ch_reg
+          /MLLocalizedString\([^)]+\)/
+        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|
+            str[20, str.length - 22]
+            @used_keys << str[20, str.length - 22]
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -42,7 +42,7 @@ module Pod
 
         def run
           down_load_csv_file if need_download
-          read_csv_file
+          read_csv
           if @key_map.keys.length.positive?
             write_en_strings
             write_zh_hk_strings
@@ -122,12 +122,27 @@ module Pod
           download_keys
         end
 
-        def read_csv_file
+        def read_csv
           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]/
+          Dir.glob(path).each do |f|
+            read_csv_file f
+          end
+        end
+
+        def read_csv_file(file)
+          key_c = CBin::LocalConfig.instance.get_col_by_name(file, 'csv_key_col')
+          cn_c = CBin::LocalConfig.instance.get_col_by_name(file, 'csv_cn_col')
+          en_c = CBin::LocalConfig.instance.get_col_by_name(file, 'csv_en_col')
+          trans_hk = CBin::LocalConfig.instance.get_col_by_name(file, 'trans_zh_hk')
+          trans_cn = CBin::LocalConfig.instance.get_col_by_name(file, 'trans_zh_cn')
+          CSV.foreach(file) do |row|
+            if row.length > 2
+              key = row[key_c]
+              cn_str = row[cn_c]
+              hk_str = row[cn_c]
+              cn_str = CBin::Trans::Helper.instance.trans_zh_cn_str(cn_str) if trans_cn
+              hk_str = CBin::Trans::Helper.instance.trans_zh_hk_str(hk_str) if trans_hk
+              @key_map[key] = { key: key, cn: cn_str, hk: hk_str, en: row[en_c] } unless key =~ /[\u4e00-\u9fa5]/
             end
           end
         end
@@ -170,7 +185,7 @@ module Pod
 
         def modify_format_string(file, line)
           result = line
-          result = handle_modify_line(file, line) if zh_ch_reg =~ line
+          result = handle_modify_line(file, line) if zh_ch_reg =~ line && !((/DDLog/ =~ line) || (/NSLog/ =~ line))
           result
         end
 
@@ -194,17 +209,10 @@ module Pod
           @key_map.values[index][:key] if index
         end
 
-        def format_str(type, area = :origin)
+        def format_str(type)
           str = ''
           @key_map.each do |k, v|
-            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"
+            str += "\"#{k}\" = \"#{v[type]}\";\n"
           end
           str
         end
@@ -229,18 +237,12 @@ module Pod
         end
 
         def write_zh_cn_strings
-          if CBin::LocalConfig.instance.config['gen_zh_cn']
-            gen_zh_cn_strings_file
-          else
-            copy_hk_to_cn_file
-          end
+          gen_zh_cn_strings_file
         end
 
         def gen_zh_cn_strings_file
           file = File.join(@current_path, zh_cn_dir_name, generate_file_name)
-          area = :origin
-          area = :cn if CBin::LocalConfig.instance.config['trans_zh_cn']
-          content = format_str(:zh, area)
+          content = format_str(:cn)
           write_to_file(file, content)
           UI.puts "生成简体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end
@@ -254,9 +256,7 @@ module Pod
 
         def write_zh_hk_strings
           file = File.join(@current_path, zh_hk_dir_name, generate_file_name)
-          area = :origin
-          area = :hk if CBin::LocalConfig.instance.config['trans_zh_hk']
-          content = format_str(:zh, area)
+          content = format_str(:hk)
           write_to_file(file, content)
           UI.puts "生成繁体中文配置完成.文件路径：#{File.absolute_path(file)}\n".green
         end

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'csv'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Service < Bin
+        self.summary = '微服务名变更'
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @file_type = argv.option('file-type', 'm,h')
+          @file_name = argv.option('file-name', 'service_map.csv')
+          @service_map = {}
+          super
+        end
+
+        def run
+          read_csv
+          update_source
+        end
+
+        def read_csv
+          path = File.join(@current_path, csv_file_name)
+          Dir.glob(path).each do |p|
+            CSV.foreach(p) do |row|
+              @service_map[row[0]] = row[1] if row[0]
+            end
+          end
+        end
+
+        def csv_file_name
+          file_name = @file_name
+          file_name = "#{@file_name}.csv" unless /.csv$/ =~ @file_name
+          file_name
+        end
+
+        def update_source
+          Dir.glob("#{@current_path}/**/*.{m,h}").each do |f|
+            if f =~ /Pods/
+              update_file(f) if f =~ %r{Pods/ML}
+            else
+              update_file(f)
+            end
+          end
+        end
+
+        def update_file(file)
+          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
+          if url_reg =~ line
+            line.scan(url_reg).flatten.each do |key|
+              result = result.gsub(key, @service_map[key]) if key && @service_map[key]
+            end
+          end
+          result
+        end
+
+        def url_reg
+          @url_key_reg ||= begin
+                             keys = @service_map.keys.join('|')
+                             /(#{keys})/
+                           end
+          @url_key_reg
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+require 'net/https'
+require 'uri'
+require 'json'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Model < Bin
+        self.summary = '生成模型文件'
+
+        def initialize(argv)
+          @url = argv.shift_argument
+          @model_pre_name = argv.option('model-pre', 'ML')
+          @models = []
+        end
+
+        def run
+          uri = URI.parse(@url)
+          res = Net::HTTP.get_response(uri)
+          res_body = JSON.parse(res.body)
+          detail_msg = res_body['detailMsg']
+          fetch_models(nil, detail_msg) if detail_msg
+          print_models
+          print_models_implementation
+        end
+
+        def validate!
+          help! "请输入url" unless @url
+        end
+
+        def fetch_models(name, obj)
+          model = obj
+          model = obj.first if obj.respond_to? :<<
+          @models.unshift({name: name, value: model}) if model.instance_of? Hash
+          if model.instance_of? Hash
+            model.each do |key, value|
+              if (value.instance_of? Hash) || (value.instance_of? Array)
+                fetch_models(key, value)
+              end
+            end
+          end
+        end
+
+        def print_models
+          @models.each do |model|
+            model_name = ''
+            model_name = model[:name].gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase } if model[:name]
+            puts "@interface #{@model_pre_name}#{model_name}Model : NSObject"
+            model[:value].each do |key, value|
+              print_property(key, value)
+            end
+            puts "@end\n\n\n"
+          end
+        end
+
+        def print_models_implementation
+          @models.each do |model|
+            model_name = model[:name].gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase } if model[:name]
+            puts "@implementation #{@model_pre_name}#{model_name}Model"
+            puts "+(NSDictionary *)modelContainerPropertyGenericClass {"
+            puts "  return @{@\"#{model[:name]}\" : #{@model_pre_name}#{model_name}Model.class};"
+            puts "}"
+            puts "@end\n\n\n"
+          end
+        end
+
+        def print_property(key, value)
+          if value.instance_of? String
+            puts "///#{value}"
+            puts "@property (nonatomic, copy) NSString *#{key};"
+          elsif value.instance_of? Integer
+            puts "///#{value}"
+            puts "@property (nonatomic, assign) NSInteger #{key};"
+            puts "///#{value}" if value > 1000
+            puts "@property (nonatomic, strong) MLCentNumber *#{key};" if value > 1000
+          elsif value.instance_of? Float
+            puts "///#{value}"
+            puts "@property (nonatomic, assign) CGFloat #{key};"
+          elsif (value.instance_of? TrueClass) || (value.instance_of? FalseClass)
+            puts "///#{value}"
+            puts "@property (nonatomic, assign) BOOL #{key};"
+          elsif value.instance_of? Array
+            if value.first.instance_of? String
+              puts "///#{key}"
+              puts "@property (nonatomic, strong) NSArray<NSString *> *#{key};"
+            else
+              puts "///#{key}"
+              name = key.gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase }
+              puts "@property (nonatomic, strong) NSArray<#{@model_pre_name}#{name}Model *> *#{key};"
+            end
+          elsif value.instance_of? Hash
+            puts "///#{key}"
+            name = key.gsub('List', '').gsub('Vo', '').gsub(/^\w/) { $&.upcase }
+            puts "@property (nonatomic, strong) #{@model_pre_name}#{name}Model *#{key};"
+          else
+            puts "///#{value}"
+            puts "@property (nonatomic, copy) NSString *#{key};"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'find'
+require 'fileutils'
+
+module Pod
+  class Command
+    class Bin < Command
+      class ReverseImport < Bin
+        self.summary = '更改头文件引入'
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @framework_names = []
+          super
+        end
+
+        def run
+          get_all_frameworks
+          get_import_headers
+        end
+
+        def get_import_headers
+          Dir.glob("#{@current_path}/**/*.{m,h,pch}").each do |f|
+              header_handler_file(f) unless f =~ /Pods/
+          end
+        end
+
+        def get_all_frameworks
+          folders = child_dir
+          folders.each { |name| @framework_names << name }
+        end
+
+        def framework_name_reg
+          @url_key_reg ||= begin
+                             keys = @framework_names.join('|')
+                             /#{keys}/
+                           end
+          @url_key_reg
+        end
+
+        def pod_folder_name
+          File.join(@current_path, 'MacauLife', 'CustomPods')
+        end
+
+        def child_dir
+          dirs = Dir.entries(pod_folder_name)
+          dirs.reject!{ |d| File.directory?(d) }
+          dirs
+        end
+
+        def import_reg
+          /#import\s*<(.*)\/(.*)>$/
+        end
+
+        def header_handler_file(f)
+          str = ''
+          File.readlines(f).each do |l|
+            if import_reg =~ l
+              ma = l.match(import_reg)
+              if framework_name_reg =~ ma[1]
+                str += "#import \"#{ma[2]}\"\n"
+              else
+                str += l.dup
+              end
+            else
+              str += l.dup
+            end
+          end
+          File.write(f, str)
+        end
+
+      end
+    end
+  end
+end

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

@@ -33,11 +33,16 @@ module CBin
     end
 
     def load_config
-      if File.exist?(config_file)
-        YAML.load_file(config_file)
-      else
-        default_config
-      end
+      syn_config_file unless File.exist?(config_file)
+      YAML.load_file(config_file)
+    end
+
+    def get_col_by_name(file_name, col_name = 'csv_key_col')
+      m = config
+      col = m[col_name]
+      fo = m['read_targets'].find{ |o| /#{o['csv_file']}/ =~ file_name }
+      col = fo[col_name] if fo
+      col
     end
 
     def config

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = '0.1.10'
+  VERSION = '0.1.15'
 end
 
 module Pod

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

@@ -19,8 +19,8 @@ module CBin
         @bucket.put_object(key, :file => file)
       end
 
-      def down_load(key, file)
-        @bucket.get_object(key, :file => file)
+      def down_load(key, file, &block)
+        @bucket.get_object(key, :file => file, &block)
       end
 
       def object_url(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aomi-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.15
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -118,11 +118,15 @@ 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/fetch.rb
+- lib/cocoapods-lhj-bin/command/bin/local/filter.rb
 - lib/cocoapods-lhj-bin/command/bin/local/local.rb
+- lib/cocoapods-lhj-bin/command/bin/local/micro_service.rb
 - lib/cocoapods-lhj-bin/command/bin/local/upload.rb
+- lib/cocoapods-lhj-bin/command/bin/model.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/reverse_import.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