itools 0.5.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf38167231314d38da1f2027c16c24df9cd7419205c154e6bf8591fe89d58133
-  data.tar.gz: ecbcb2405ee49c04d97de632f10d56ff4f2a17f26679fb7d0ed72bca3e0278c9
+  metadata.gz: 231409dd71fbd6f84598d2270edc928ad0288089b0bdb9536632cc832ed20bae
+  data.tar.gz: a64240894bfa6a17fcf0d4d63050378cf5c8e9cc4f6239ff0329d0cce0eff302
 SHA512:
-  metadata.gz: 9d233beb82f1909ef00e6791789caae405cd852763fa2d5590cbe469a81f710b0e1358812da22b452359dd55f21f85ba8ee5b1290ecdecdbdd05ec15be7a9f25
-  data.tar.gz: 7684e2bafc4abc09757f3dbf96f316f44b6172b68cc532b5edb25a579db57ea3103d04ffd3b774dbbc822984e1cddd72304dde7e149c560f7874670803583061
+  metadata.gz: '049cbfd7152daa2944833d1d3f7cae6ef40a00725c2811f02779105919b34a09cf3fe94cf33c034aa1801646e169437eed0808e818282de8d1333b64a1565719'
+  data.tar.gz: d9e790bc02448e7d0c9e0516527333f02ed1a834138a5d35dbfd186e0f83be6ada8e29c83aa1dc0f4733040299f437b2ed0848de8bf0ba69f4e1cd1794c25e44

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.7
+ruby-2.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    itools (0.5.0)
+    itools (1.1.5)
       bundler (~> 1.17)
       git (~> 1.5)
       gli (~> 2.17)
@@ -11,11 +11,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    git (1.5.0)
-    gli (2.18.0)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    gli (2.20.0)
     rake (10.5.0)
-    ruby-ole (1.2.12.1)
-    spreadsheet (1.1.8)
+    rchardet (1.8.0)
+    ruby-ole (1.2.12.2)
+    spreadsheet (1.2.6)
       ruby-ole (>= 1.0)
 
 PLATFORMS
@@ -25,4 +27,4 @@ DEPENDENCIES
   itools!
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/README.md

@@ -19,7 +19,7 @@ SYNOPSIS
     itools [global options] command [command options] [arguments...]
 
 VERSION
-    0.4.9
+    1.0.0
 
 GLOBAL OPTIONS
     --help    - Show this message
@@ -40,7 +40,7 @@ COMMANDS
 ### 功能1：解析LinkMap
 命令：
 ```shell
-itools parse  LinkMapDemo-LinkMap-normal-arm64.txt  
+itools parse  LinkMapDemo-LinkMap-normal-arm64.txt (分析文件夹) 
 # or
 itools parse /user/Desk/LinkMapDemo-LinkMap-normal-arm64.txt
 ```
@@ -56,8 +56,8 @@ Foundation.tbd          24B
 UIKit.tbd          24B
 Total Size：10.07KB
 ```
-For more information, see：[https://www.cnblogs.com/zhanggui/p/9991455.html](https://www.cnblogs.com/zhanggui/p/9991455.html)
-
+For more information, see：[https://www.cnblogs.com/zhanggui/p/9991455.html](https://www.cnblogs.com/zhanggui/p/9991455.html)   
+也可以根据linkmap按照folder解析，即传入第二个参数为分析的引用库目录，例如想查看AFNetWorking中各个文件夹(内容)所占二进制的大小。
 ### 功能2：字符串查找
 命令
 ```ruby

data/bin/itools

@@ -79,4 +79,12 @@ command :pre_commit do |c|
         Itools::GitSets.commit_msg_init(args)
     end
 end
+#本地commit规范化
+desc "通过执行该命令，可以将podfile.lock中所有的依赖平铺至Podifle中"
+arg 'podfile.lock'
+command :podfile_tiled do |c|
+    c.action do |global_options,options, args|
+        Itools::PodfileTiled.podfile_tiled(args)
+    end
+end
 exit run(ARGV)

data/lib/itools/class_unuse_finder.rb

@@ -64,6 +64,7 @@ module Itools
             sheet1.row(0)[0] = "序号"
             sheet1.row(0)[1] = "文件名"
             sheet1.row(0)[2] = "文件路径"
+            sheet1.row(0)[3] = "文件占用内存大小"
             total_size = 0
             @classes.each_with_index{|r_item,f_index| 
                 # if !r_item.fr_name.include?("+")

data/lib/itools/find_unuse_img.rb

@@ -81,11 +81,13 @@ module Itools
          sheet1 = book.create_worksheet
          sheet1.row(0)[0] = "文件名"
          sheet1.row(0)[1] = "文件路径"
+         sheet1.row(0)[2] = "文件大小(B)"
          imags.each_with_index {|item,idx|
             sheet1.row(idx+1)[0] = item
             path = imgFinder.get_image_path(item)
             sheet1.row(idx+1)[1] = path
             unuse_total_size = unuse_total_size + File.size(path)
+            sheet1.row(idx+1)[2] = File.size(path)
             puts item
         }
          book.write "#{imgFinder.find_path}/search_result.xls"

data/lib/itools/get_size.rb

@@ -42,6 +42,7 @@ module Itools
             file_count = 0
             total_count = 0
             total_size = 0
+            file_size = 0
             Find.find(folder) do |filename|
                 if File.file?(filename)
                     total_count = total_count + 1
@@ -52,15 +53,16 @@ module Itools
                     elsif file_exts.include?(File.extname(filename).delete("."))   #查找指定后缀的文件
                         sum = sum + File.size(filename)
                         file_count = file_count + 1
+                        file_size = file_size + File.size(filename)
                     else
                         #不做任何处理
                     end
                 end
             end
             if file_exts.size == 0
-                puts "\033[32m文件夹中共#{total_count}个文件，共#{get_show_size(total_size)}\033[0m"
+                puts "\033[32m文件夹中共#{total_count}个文件，共#{get_show_size(total_size)}(#{total_size})\033[0m"
             else
-                puts "\033[32m文件夹中共#{total_count}个文件，共#{get_show_size(total_size)}；找到后缀为(#{file_exts_string})的文件#{file_count}个，共#{get_show_size(sum)}.\033[0m"
+                puts "\033[32m文件夹中共#{total_count}个文件，共#{get_show_size(total_size)}(#{total_size})；找到后缀为(#{file_exts_string})的文件#{file_count}个，共#{get_show_size(file_size)}(#{file_size}).\033[0m"
             end
             
             # puts `du -b #{folder} | awk '{print $1}'`.to_i 

data/lib/itools/link_map.rb

@@ -138,6 +138,11 @@ module Itools
                   handle_method_name = "handle_sections"
                   puts "处理Sections..."
                elsif line.include?("Symbols:")   #symbols:和Dead Stripped Symbols处理一样
+               #   这里不处理Dead Stripped Symbols
+                  if line.delete('#').strip.include?("Dead Stripped Symbols")
+                     puts "不处理处理#{line.delete('#').strip}..."
+                     break
+                  end
                   puts "处理#{line.delete('#').strip}..."
                   handle_method_name = "handle_symbols"
                end
@@ -227,7 +232,7 @@ module Itools
          # 打印结果
          sizeResultArr.each do |obj|
             puts "#{obj.file_name}          " + SizeResult.handleSize(obj.size)
-            save_file.puts("#{obj.file_name}          #{SizeResult.handleSize(obj.size)}")
+            save_file.puts("#{obj.file_name}          #{SizeResult.handleSize(obj.size)}(#{obj.size})")
          end
          save_file.puts("总大小为：#{SizeResult.handleSize(total_size)}")
          save_file.close
@@ -301,8 +306,10 @@ module Itools
             File.delete(save_file_path)
          end
          save_file = File.new(save_file_path,"w+")
+         o_index = 2
          size_results.each do |o|
-            save_file.puts("#{' ' * o.space_count}|- #{o.folder_name.split('/').last}    #{SizeResult.handleSize(o.size)}")
+            result_str = "#{' ' * o.space_count}├── #{o.folder_name.split('/').last}    #{SizeResult.handleSize(o.size)}(#{o.size})"
+            save_file.puts(result_str)
          end
          save_file.close
          puts "分析结果已经保存为文件，位置为：\n\033[32m#{save_file_path}\033[0m"
@@ -313,7 +320,8 @@ module Itools
          space_index = space_index + 2 
          file_name_arr = [] #盛放计算过的类
          Find.find(file_path) do |file|
-            if File.file?(file)
+            # 不包含图片
+            if File.file?(file) && !(File.extname(file) =~ /(png|gif|jpg|bmp|jpeg)/)
                file_name = File.basename(file,".*")
                if !file_name_arr.include?(file_name) && sort_by_obj_files_map[file_name] #没有已经计算过
                   s_result.size = s_result.size + sort_by_obj_files_map[file_name][0].o_size
@@ -350,7 +358,7 @@ module Itools
       def self.getSaveFileName(path_para)
          path = Pathname.new(path_para)
          # 要保存的地址
-         save_file_path = path.dirname.to_s + "/" + "parse_" + path.basename.to_s + "_result.txt"
+         save_file_path = path.dirname.to_s + "/" + "parse_" + path.basename.to_s + "_result(#{Time.new.strftime("%Y%m%d%H%M%S")}).txt"
          return save_file_path
       end
    end   

data/lib/itools/podfile_tiled.rb

@@ -0,0 +1,95 @@
+module Itools
+    class PodInfo
+      attr_accessor :pod_name, :pod_version
+      def initialize(name, version)
+        @pod_name = name
+        @pod_version = version
+      end
+    end
+    class PodfileTiled
+      def self.podfile_tiled(args)
+        all_pods = [] #所有依赖的pod
+        exist_pods = [] #当前podfile已经存在的pod
+        need_add_pods = [] #当前需要添加到podfile中的pod
+        pod_tag = 1
+  
+        fileInfo = File.open(args[0])
+
+        total_index = 0
+        fileInfo.each_line do |line|
+          line_string = line.delete("\n")
+          if line_string == 'PODS:'
+            # 配置成功，后续请直接使用git commit ,不要加 -m\033[0m
+            puts "\033[32m开始分析依赖\033[0m"
+            pod_tag = 1
+            next
+          elsif line_string == 'DEPENDENCIES:'
+            puts "\033[32m开始分析当前Podfile中已添加的依赖项\033[0m"
+            pod_tag = 2
+            next
+          elsif line_string == 'SPEC REPOS:'
+            pod_tag = 0
+            puts "\033[32mpodfile.lock分析结束\033[0m"
+          end
+  
+          if pod_tag == 1 #分析所有pod
+            if line_string[0, 3] == '  -' && !line_string.include?('/')
+              # puts line_string
+              pod_version = line_string[/\((.*?)\)/, 1]
+              pod_name =
+                line_string.gsub(pod_version, '').delete('(').delete(')').delete(
+                  ':'
+                ).delete('-').strip
+              temp_pod = PodInfo.new(pod_name, pod_version)
+              all_pods << temp_pod
+              puts "查找到pod库：#{pod_name}, 版本号为：'#{pod_version}' #{all_pods.length}"
+            end
+          end
+  
+          if pod_tag == 2 #分析当前podfile已经有的pod
+            pod_name
+            pod_version = line_string[/\((.*?)\)/, 1]
+            if pod_version
+              pod_name =
+                line_string.gsub(pod_version, '').delete('(').delete(')').delete(
+                  ':'
+                ).delete('-').strip
+            else
+              pod_name = line_string.delete('-').lstrip.rstrip
+            end
+  
+            if pod_name.length == 0 || pod_name.include?('/')
+                next
+            end
+            temp_pod = PodInfo.new(pod_name, pod_version)
+            if pod_version
+                temp_pod.pod_version = pod_version.delete('=').strip 
+            end
+           
+            exist_pods << temp_pod 
+            puts "Podfile中已包含 #{pod_name}, 版本号为：'#{pod_version}'"
+          end
+        end
+        temp_exist_pods = []
+        all_pods.each do |all_pod|
+          exist_pods.each do |exist_pod|
+            if all_pod.pod_name == exist_pod.pod_name
+              temp_exist_pods << all_pod
+            end
+          end
+        end
+
+        need_add_pods = all_pods - temp_exist_pods
+        if need_add_pods.length == 0
+            puts "\033[32m恭喜！！！无需平铺，当前已全部平铺\033[0m"
+        else
+            puts "\033[32m以下为要平铺的库，直接复制粘贴至Podfile中即可：\033[0m"
+            need_add_pods.each do |to_add|
+                puts "pod '#{to_add.pod_name}', '#{to_add.pod_version}'"
+            end
+        end
+     
+      end
+    end
+  end
+  

data/lib/itools/version.rb

@@ -1,3 +1,4 @@
 module Itools
-  VERSION = "0.5.0"
+  VERSION = "1.1.5"
+
 end

data/lib/itools.rb

@@ -6,4 +6,5 @@ require "itools/get_size"
 require "itools/file_handle"
 require "itools/class_unuse_finder"
 require "itools/count_code_line"
-require "itools/git_sets"
+require "itools/git_sets"
+require "itools/podfile_tiled"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.5
 platform: ruby
 authors:
 - zhanggui
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,6 +113,7 @@ files:
 - lib/itools/get_size.rb
 - lib/itools/git_sets.rb
 - lib/itools/link_map.rb
+- lib/itools/podfile_tiled.rb
 - lib/itools/string_searcher.rb
 - lib/itools/temple-commit-msg.dat
 - lib/itools/version.rb
@@ -124,7 +125,7 @@ metadata:
   homepage_uri: https://github.com/ScottZg/itools
   source_code_uri: https://github.com/ScottZg/itools
   changelog_uri: https://github.com/ScottZg/itools/blob/master/README.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: iOS tools
 test_files: []