itools 0.5.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788ebf01252a934f4e4705dd9f9103819934798ab91aef3e6aa32728ecaafd45
-  data.tar.gz: cefd7dde5ac84dd3a9afe5a4cf80541f9f0152680e41ce5bc8649207b4027c4d
+  metadata.gz: d2f0c8c5a5b8189fd5561b57ee9fd5ba7b90a8e899cc51569b215409959a0760
+  data.tar.gz: 77127100e3fc43d53d05bf4da8fac3d30c5604b6535477ba0be11ced2fe007b0
 SHA512:
-  metadata.gz: 8c70960e3f4247c406f7742f796575fa73a56d6a130c9747baa6eefc93f13cdff2c3e11cfcea443cc07d2639041dcff75ec9165fd291fc198169951155895a4a
-  data.tar.gz: 69f57dfdaa3459a5991c657a215bf78c060fba821a009c1072452fab55938839f0f137da29a9895b95a2bb9ede4fad81135d67d754c4e363787b0c4c2b25a6c7
+  metadata.gz: e321a1cdb2b2fe8c6da17853a45bd94d3edb5e2781e961c4eb4be46a51304e48a2ec5f31ed71b29a8183d3d06d35d04c1610cb2352eb64d297d5b34d4709cdb9
+  data.tar.gz: 8059a806fd284eb1c29cc17d5eb54a657a9303524b11658a3cccd40e29dc2e9746faac936d2b7749192b77433b9ca12fe17dac5efc054f02b542e3a1b7d0ab5c

data/.ruby-version

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

data/Gemfile.lock

@@ -1,28 +1,30 @@
 PATH
   remote: .
   specs:
-    itools (0.5.2)
-      bundler (~> 1.17)
+    itools (1.1.5)
+      bundler (>= 2.2.33)
       git (~> 1.5)
       gli (~> 2.17)
-      rake (~> 10.0)
+      rake (>= 12.3.3)
       spreadsheet (~> 1.1, >= 1.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    git (1.5.0)
-    gli (2.18.0)
-    rake (10.5.0)
-    ruby-ole (1.2.12.1)
-    spreadsheet (1.1.8)
-      ruby-ole (>= 1.0)
+    git (1.10.1)
+      rchardet (~> 1.8)
+    gli (2.20.1)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    ruby-ole (1.2.12.2)
+    spreadsheet (1.3.0)
+      ruby-ole
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   itools!
 
 BUNDLED WITH
-   1.17.1
+   2.3.4

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/itools.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "bundler", "~> 1.17"
-  spec.add_runtime_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency "bundler", ">= 2.2.33"
+  spec.add_runtime_dependency "rake", ">= 12.3.3"
   spec.add_runtime_dependency "gli", "~> 2.17"
   spec.add_runtime_dependency "spreadsheet", '~> 1.1', '>= 1.1.8'
   spec.add_runtime_dependency 'git', '~> 1.5'

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,6 +53,7 @@ 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
@@ -60,7 +62,7 @@ module Itools
             if file_exts.size == 0
                 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)}(#{total_size})；找到后缀为(#{file_exts_string})的文件#{file_count}个，共#{get_show_size(sum)}(#{total_size}).\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/podfile_tiled.rb

@@ -0,0 +1,98 @@
+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|
+            exist_pod_name = exist_pod.pod_name
+            if exist_pod_name.include?('/')
+              exist_pod_name = exist_pod_name.split('/')[0]
+            end
+            if all_pod.pod_name == exist_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.2"
+  VERSION = "1.2.0"
+
 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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: itools
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.2.0
 platform: ruby
 authors:
 - zhanggui
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -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: []