cocoapods-dongjia 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126bfc1cf1fdf266d9b8d0801f531d8dab5b5656ed3f6f7392144c1b0782a564
-  data.tar.gz: 27bf7cf27a82203f6bce0b6a4c289830b18f50cd909896a23595af038663d635
+  metadata.gz: fa6197291c8d0327124cdfe9a152f5a4cddc91a15fb42571ca10c175f96fa730
+  data.tar.gz: 4e68535d83b1c174b1e01314cf00f4fecd45c0131de4fbb4b37e64ffb4504c10
 SHA512:
-  metadata.gz: f5e54d1dca186cdf7c45aed044ccdbd41df1125925fb40e11bb49ef981fe3994ec48625e1c9a7cd3a6d3fb3a193672bba541dd9255da0d754e9da469ed3e0c32
-  data.tar.gz: 78a68150bdf76f6a27f358a7bda31f1f81542e30cfde5b58ef39c8487fe5eb645d00229e4f3516ab6a734f65525b3bb9612701c6e5b3d3a511640a5e9be0beef
+  metadata.gz: 6d3a68721994c607cace3a8bca9bd89832887ef55646f5d9950c71c23099881f7299449cfd37940201a703116819d9173f18f99aaffa4a5dc0272ff7256ef598
+  data.tar.gz: dc481b20dc7a3505f0a089ef465a513e4e026086df1a89fe7d97563c30accab74cd6492897a8debf79645aae1ffa0ac1241bd4356584cd7b6a5567e115cda484

data/lib/cocoapods-dongjia/command/strip.rb

@@ -104,17 +104,18 @@ module Pod
       def get_images
         images = Set[]
         except_dirs = [
-          'QYResource.bundle', 
-          'DJMate', 
-          'IQKeyboardManager', 
-          'EnterpriseEditionImages.xcassets',
+          'QYResource.bundle',
+          'DJMate',
+          'IQKeyboardManager',
           'MJRefresh.bundle',
           'AlipaySDK.bundle',
           'AppIcon.appiconset',
-          'KPCameraImages.xcassets'
+          'KPCameraImages.xcassets',
+          'Umeng',
+          'LaunchResource'
         ]
         except_files = [
-          'image_placeholder', 
+          'image_placeholder',
           'register_add_avatar'
         ]
         bk = Proc.new do |dir, name, ext|
@@ -127,20 +128,32 @@ module Pod
 
       # 分析
       def analyze(source_files, images)
-        source_files.map { |x| x.file_ref.real_path }.each do | path |
+        source_file_paths = source_files.map { |x| 
+          x.file_ref.real_path
+        }
+        .select { |x| 
+          File.exist?(x)
+        }
+        count = source_file_paths.count
+        source_file_paths.each_index do | index |
+          percent = index.to_f / count.to_f * 100
+          print "\r" if index != 0
+          print "#{format("%.2f", percent)}%"
+          path = source_file_paths[index]
           File.open(path, 'r') do |f|
             image_using = []
             f.each_line do |line|
               next unless line.include?('"')
-              images.each do |img|
-                if line.include?('"' + img.name)
-                  image_using << img
-                else
-                  # 根据下划线分割剔除最后一项，再尝试匹配
-                  if !img.fuzzy_name.empty?
-                    if line.include?('"' + img.fuzzy_name + '%') || 
-                      line.include?('"' + img.fuzzy_name + '"')
-                      image_using << img
+              ['"', '/'].each do |prefix|
+                images.each do |img|
+                  if line.include?(prefix + img.name)
+                    image_using << img
+                  else
+                    # 根据下划线分割剔除最后一项，再尝试匹配
+                    if !img.fuzzy_name.empty?
+                      ['%', '"'].each do |suffix|
+                        image_using << img if line.include?(prefix + img.fuzzy_name + suffix)
+                      end
                     end
                   end
                 end
@@ -149,6 +162,7 @@ module Pod
             images = images - image_using
           end
         end
+        print "\r"
         images
       end
 

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,6 +1,7 @@
 module CocoapodsDongjia
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
   UPDATE_DESC = <<-EOS
-  - 修复依赖
+  - 修复路由抓取错误
+  - 修复 pod strip
 EOS
 end

data/lib/dongjia_router.rb

@@ -39,7 +39,10 @@ EOS
       end
       
       if @prefix != nil
-        @redirect_type = @defining_line[prefix_len, @defining_line.index(',') - prefix_len]
+        end_index = @defining_line.index(',') || @defining_line.index(')')
+        if !end_index.nil?
+          @redirect_type = @defining_line[prefix_len, end_index - prefix_len]
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,9 @@ homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT
 metadata:
-  update_desc: "  - 修复依赖\n"
+  update_desc: |2
+      - 修复路由抓取错误
+      - 修复 pod strip
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -115,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-dongjia.