yjcocoa 18.07.31 → 20.07.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fdbd2fca228241aba011988455e5b1f67b68831e
-  data.tar.gz: d1108511b8494183b56ae77409b4904786c9b3ba
+SHA256:
+  metadata.gz: 40d37f6010c02d5bc410ed53af79da394e7ba2a3c851863b234876545d3fe5be
+  data.tar.gz: a396593d587cde35a650f8c34f0abf1d26f027e8e92872cc8475f7bf9b7304a1
 SHA512:
-  metadata.gz: 45e2b84ce14fb94143d0863da08850eb8bc14355502fedaf017d1b3475ce25f522f34caae8975dfa88a9dd972b995c21a9f02e63c5c5c7d9c4db8a4efd9995b3
-  data.tar.gz: c8534ec06d684f71c8da09e2f6181a1ae002a2d0ea3566f1bb727dada86f54ca563901c2d62a4146c70c250a432c3b421b9cd27bd1a78a2505b23b1148639433
+  metadata.gz: 067a7461030bec8e1d45aec69317006037491f3b64f968bda50f9fa614e6155ae9126b8e1e01dbb07cb2e1ed296f7c02d73a27d965bae4a2e5349065972b7c3d
+  data.tar.gz: d10af319ad7d5665e861e6e3d3d9833ce45ff92b51a9bb5aeebd431c7a0d9c51018ed355dc46f3266d6379803adae480ebd7c267d68a41a86a637fc86326fa24

data/README.md

@@ -2,7 +2,7 @@
 
 [![Language: Ruby](https://img.shields.io/badge/language-Ruby-orange.svg?style=flat)](https://www.ruby-lang.org/zh_cn/) 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/937447974/YJCocoaGem/blob/master/LICENSE) 
-[![](https://img.shields.io/badge/gem-18.07.17-orange.svg?style=flat)](https://rubygems.org/gems/yjcocoa) 
+[![](https://img.shields.io/badge/gem-18.09.30-orange.svg?style=flat)](https://rubygems.org/gems/yjcocoa) 
 ![QQ群](https://img.shields.io/badge/QQ群-557445088-blue.svg?style=flat)
 
 # YJCocoaGem
@@ -23,6 +23,7 @@ Commands:
     + git       Git commands
     + log       log 日志解析
     + pod       Pod commands
+    + unused    OC 项目未使用资源查找
 
 Options:
 
@@ -48,4 +49,5 @@ YJ技术支持群：557445088
 
 CSDN：http://blog.csdn.net/y550918116j
 
-GitHub：https://github.com/937447974
+GitHub：https://github.com/937447974
+

data/lib/yjcocoa/command.rb

@@ -73,6 +73,7 @@ module YJCocoa
     require 'yjcocoa/git/git'
     require 'yjcocoa/log/log'
     require 'yjcocoa/pod/pod'
+    require 'yjcocoa/unused/unused'
 
 end
 

data/lib/yjcocoa/git/git.rb

@@ -36,6 +36,7 @@ module YJCocoa
     # Commands
     require 'yjcocoa/git/git_branch'
     require 'yjcocoa/git/git_cache'
+    require 'yjcocoa/git/git_checkout'
     require 'yjcocoa/git/git_pull'
     require 'yjcocoa/git/git_tag'
     

data/lib/yjcocoa/git/git_branch.rb

@@ -31,6 +31,7 @@ module YJCocoa
         # property
         attr_accessor :addBranch
         attr_accessor :deleteBranchs
+        attr_accessor :gits # git array
         
         # 初始化
         def initialize(argv)
@@ -42,18 +43,44 @@ module YJCocoa
         
         # businrss
         def validate!
-            exit 0 unless self.gitExist?
+            super
             self.banner! unless self.addBranch || self.deleteBranchs
         end
         
-        def run
-            if self.addBranch
-                self.gitBranchAdd
-                puts
+        def run    
+            self.buildGitPaths        
+            if self.gits.empty?
+                if self.gitExist?
+                    self.gitRun
+                end
+            else
+                self.gits.each { |path|
+                    self.gitRun(path)
+                }
             end
-            self.gitBranchDelete if self.deleteBranchs && !self.deleteBranchs.empty?
+        end
+
+        def buildGitPaths
+            self.gits = Dir["**/.git"]
+            self.gits.map! { |path|
+                File.dirname(path)
+            }
         end
         
+        def gitRun(path=".")
+            thread = Thread.new {
+                Dir.chdir(path) {
+                    puts "YJCocoa git #{path}/.git".green
+                    self.gitBranchDelete if self.deleteBranchs && !self.deleteBranchs.empty?
+                    if self.addBranch
+                        self.gitBranchAdd
+                        puts
+                    end                   
+                }
+            }
+            thread.join
+        end
+
         def gitBranchAdd
             puts "YJCocoa git add branch #{self.addBranch}".green
             system("git push --set-upstream origin #{self.addBranch}") if system("git checkout -b #{self.addBranch}")

data/lib/yjcocoa/git/git_checkout.rb

@@ -0,0 +1,71 @@
+#
+#  git_checkout.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2019/03/18.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+
+    class GitCheckout < Git
+
+        self.command = 'checkout'
+        self.summary = 'git checkout'
+        self.description = 'git checkout 当前文件夹下所有 gits'
+
+        def self.options
+            [['--branch', '切换 branch'],]
+        end
+    
+        # property
+        attr_accessor :branch
+        attr_accessor :gits
+
+        # 初始化
+        def initialize(argv)
+            super
+            self.branch = argv.option('branch')
+        end
+
+        # businrss
+        def validate!
+            self.banner! unless self.branch
+        end
+
+        def run
+            self.buildGitPaths
+            if self.gits.empty?
+                if self.gitExist?
+                    self.gitCheckout
+                end
+            else
+                self.gits.each { |path|
+                    self.gitCheckout(path)
+                }
+            end
+        end
+
+        def buildGitPaths
+            self.gits = Dir["**/.git"]
+            self.gits.map! { |path|
+                File.dirname(path)
+            }
+        end
+
+        def gitCheckout(path=".")
+            Dir.chdir(path) {
+                puts "YJCocoa git checkout #{path}/.git".green
+                localChanges = !(`git stash` =~ /No local changes to save/)
+                system("git checkout -b #{self.branch}") unless system("git checkout #{self.branch}")
+                `git stash pop` if localChanges
+                puts
+            }
+        end
+
+    end
+
+end

data/lib/yjcocoa/git/git_pull.rb

@@ -15,20 +15,20 @@ module YJCocoa
 
         self.command = 'pull'
         self.summary = 'git pull'
-        self.description = 'git pull 当前文件夹下所有 gits 和 branchs'
+        self.description = 'git pull 当前文件夹下所有 gits'
 
         def self.options
-            [['--current-branch', '只拉取当前分支'],]
+            [['--all', 'pull all branch'],]
         end
     
         # property
-        attr_accessor :currentBranch #是否只拉取当前分支
+        attr_accessor :all #是否拉取所有分支
         attr_accessor :gits # git array
 
         # 初始化
         def initialize(argv)
             super
-            self.currentBranch = argv.flag?('current-branch', false)
+            self.all = argv.flag?('all', false)
         end
 
         # businrss
@@ -57,8 +57,8 @@ module YJCocoa
                 Dir.chdir(path) {
                     puts "YJCocoa git pull #{path}/.git".green
                     localChanges = !(`git stash` =~ /No local changes to save/)
-                    system("git pull")
-                    unless self.currentBranch
+                    system("git pull -p")
+                    if self.all
                         list = (`git branch`).split("\n")
                         if list.size >= 2
                             headBranch = "master"

data/lib/yjcocoa/git/git_tag.rb

@@ -51,11 +51,11 @@ module YJCocoa
         end
 
         def run
-            if self.addTag
-                self.gitTagAdd
+            if self.deleteTags && !self.deleteTags.empty?
+                self.gitTagDelete
                 puts
             end
-            self.gitTagDelete if self.deleteTags && !self.deleteTags.empty?
+            self.gitTagAdd if self.addTag
         end
 
         def gitTagAdd

data/lib/yjcocoa/git/git_tag_add.rb

@@ -23,7 +23,7 @@ module YJCocoa
             if File.exist?(".git")
                 current_branch = self.current_branch
                 tag = File.basename(Dir.pwd)
-                tag << "-#{current_branch}" unless current_branch =~ /master/
+                tag << "-#{current_branch}" unless current_branch == "master"
                 tag << "-#{Time.now.strftime('%Y%m%d%H%M')}"
                 puts "YJCocoa build tag #{tag}".green
                 system("yjcocoa git tag --add=#{tag}")

data/lib/yjcocoa/pod/pod_release.rb

@@ -52,7 +52,6 @@ module YJCocoa
         
         # businrss
         def run
-            self.gitPull
             content = []
             File.open(self.podfile, "r") { |file|
                 while line = file.gets   #标准输入流
@@ -63,20 +62,13 @@ module YJCocoa
             puts "YJCocoa Pod Release".green
             puts content.sort * "\n"
         end
-        
-        def gitPull
-            puts "#{self.podfile} git pull".green
-            Dir.chdir(File.dirname(self.podfile)) {| path |
-                system("yjcocoa git pull")
-            }
-        end
-        
+    
         private def check (pods, line)
             pods.each { |pod|
                 if line.include?(pod)
-                    pods.delete(pod)
                     line.split(',').each { |item|
                         if item.include?("tag") || item.include?("branch")
+                            pods.delete(pod)
                             return "#{pod}, #{item.chomp}"
                         end
                     }

data/lib/yjcocoa/test.rb

@@ -1,14 +1,7 @@
-def current_branch
-    list = (`git branch`).split("\n")
-    for item in list
-        if item =~ /\* /
-            return item.gsub(/\* /, "")
-        end
-    end
-end
+gem build yjcocoa.gemspec
 
-unless current_branch =~ /master/
-    puts "current_branch1"
-end
+gem install yjcocoa-18.12.13.gem
 
-puts "current_branch"
+yjcocoa unused image --dir=/Users/cisdi/Desktop/QingTui/master --ignore=QTComm,Pods,LaunchImage,Emoji,AppIcon
+
+otool -oV /Users/cisdi/Desktop/QingTui_Developer

data/lib/yjcocoa/unused/unused.rb

@@ -0,0 +1,63 @@
+#
+#  unused.rb
+#  YJCocoaGem
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/12/8.
+#  Copyright © 2018年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class Unused < Command
+        
+        self.abstract_command = true
+        self.command = 'unused'
+        self.summary = 'OC 项目未使用资源查找'
+        self.description = 'These are common unused commands used in YJCocoa.'
+        
+        # property
+        attr_accessor :matcho
+        attr_accessor :match
+        attr_accessor :ignore
+        attr_accessor :output
+        
+        # 初始化
+        def initialize(argv)
+            super
+            self.matcho = argv.option('match-o')
+            self.match = argv.option('match')
+            self.match = self.match.split(",").reject {|i| i.empty? } if self.match
+            self.ignore = argv.option('ignore')
+            self.ignore = self.ignore.split(",").reject {|i| i.empty? } if self.ignore
+            self.output = argv.option('output')
+            self.output = Dir.pwd + "/YJCocoa.h" unless self.output
+        end
+        
+        def check_match(item)
+            return true unless self.match
+            self.match.each { |m|
+                return true if item.include?(m)
+            }
+            return false
+        end
+        
+        def check_ignore(item)
+            return false unless self.ignore
+            self.ignore.each { |i|
+                return true if item.include?(i)
+            }
+            return false
+        end
+        
+    end
+    
+    # Commands
+    require 'yjcocoa/unused/unused_class'
+    require 'yjcocoa/unused/unused_image'
+    require 'yjcocoa/unused/unused_method'
+
+end

data/lib/yjcocoa/unused/unused_class.rb

@@ -0,0 +1,107 @@
+#
+#  unused_class.rb
+#  YJCocoaGem
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/12/8.
+#  Copyright © 2018年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class UnusedClass < Unused
+        
+        self.command = 'class'
+        self.summary = 'unused class commands'
+        self.description = '查找 OC 项目中未使用的 class'
+        
+        def self.options
+            [['--match-o', 'Match O 文件地址'],
+            ['--match', '指定的字符串匹配，多字符串用 "," 分隔'],
+            ['--ignore', '忽略的字符串匹配, 多字符串用 "," 分隔'],
+            ['--output', '日志存放路径，默认当前路径']] + super
+        end
+    
+        # businrss
+        def validate!
+            super
+            unless self.matcho && self.matcho.length > 0
+                puts "Match O 文件地址为空".red
+                self.banner!
+            end
+        end
+        
+        def run
+            unused_class = self.unreferenced_class
+            fetch_class = unused_class.reject {|m| !(check_match(m) && !check_ignore(m))}
+            puts "分析完毕，打开日志：#{self.output}".green
+            File.write(self.output, fetch_class.join("\n"))
+            `open #{self.output}`
+        end
+        
+        def unreferenced_class
+            section = match_o_section
+            unless section.count
+                puts "#{self.matcho} can't find classlist".red
+                self.banner!
+            end
+            classlist = section["Contents of (__DATA,__objc_classlist) section"]
+            classrefs = section["Contents of (__DATA,__objc_classrefs) section"]
+            superrefs = section["Contents of (__DATA,__objc_superrefs) section"]
+            all_classlist = objc_classlist(classlist)
+            used_classlist = objc_super_classlist(classlist) + objc_classlist(classrefs) + objc_classlist(superrefs)
+            unused_classlist = []
+            all_classlist.each {|item|
+                unused_classlist << item unless used_classlist.include?(item)
+            }
+            return unused_classlist.sort
+        end
+        
+        def match_o_section
+            lines = `otool -oV #{self.matcho}`.split("\n")
+            section = Hash.new
+            key = nil
+            lines.each {|line|
+                line = line#.strip
+                if line.include?("Contents of (__DATA,")
+                    key = line
+                elsif (key)
+                    if section.include?(key)
+                        section[key] << line
+                    else
+                        section[key] = [line]
+                    end
+                end
+            }
+            return section
+        end
+        
+        def objc_super_classlist(classlist)
+            result = []
+            classlist.each { |line|
+                line_scan = line.scan(/_OBJC_CLASS_\$_(.+)/)
+                if line_scan.count > 0 && line.include?("superclass")
+                    result << line_scan[0][0]
+                end
+            }
+            return result
+        end
+        
+        def objc_classlist(classlist)
+            result = []
+            classlist.each { |line|
+                line_scan = line.scan(/_OBJC_CLASS_\$_(.+)/)
+                if line_scan.count > 0 && !line.include?("superclass")
+                    result << line_scan[0][0]
+                end
+            }
+            return result
+        end
+        
+    end
+    
+end
+

data/lib/yjcocoa/unused/unused_image.rb

@@ -0,0 +1,98 @@
+#
+#  unused_image.rb
+#  YJCocoaGem
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/12/8.
+#  Copyright © 2018年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class UnusedImage < Unused
+        
+        self.command = 'image'
+        self.summary = 'unused image commands'
+        self.description = '查找 OC 项目中未使用的 image'
+        
+        def self.options
+            [['--dir', '项目文件夹'],
+            ['--ignore', '忽略的字符串匹配, 多字符串用 "," 分隔'],
+            ['--output', '日志存放路径，默认当前路径']] + super
+        end
+    
+        # property
+        attr_accessor :dir
+        attr_accessor :image_hash
+        attr_accessor :class_content
+        
+        # 初始化
+        def initialize(argv)
+            super
+            self.dir = argv.option('dir')
+            self.image_hash = Hash.new
+            self.class_content = ""
+        end
+        
+        # businrss
+        def validate!
+            super
+            unless self.dir && self.dir.length > 0
+                puts "dir 文件地址为空".red
+                self.banner!
+            end
+            unless Dir.exist?(self.dir)
+                puts "dir 文件路径 #{self.dir} 不是文件夹".red
+                self.banner!
+            end
+        end
+        
+        def run
+            unused_image = self.unreferenced_image
+            puts "分析完毕，打开日志：#{self.output}".green
+            File.write(self.output, unused_image.join("\n"))
+            `open #{self.output}`
+        end
+        
+        def unreferenced_image
+            self.deal_with_path(self.dir)
+            puts "分析图片资源".green
+            result = []
+            self.image_hash.each {|key, value|
+                puts key
+                result += value unless self.class_content.include?(key)
+            }
+            return result.sort
+        end
+        
+        
+        def deal_with_path(path)
+            Dir.chdir(path) {
+                Dir["**/*.{png,jpg}"].each {|filename| self.deal_with_image(filename)}
+                Dir["**/*.{h,m,mm,swift,xib,storyboard,plist}"].each {|filename| self.deal_with_file(filename)}
+            }
+        end
+        
+        def deal_with_image(filename)
+            return if self.check_ignore(filename)
+            basename = File.basename(filename)
+            image_gsub = [".png", ".jpg", "@1x", "@2x", "@3x", "@1X", "@2X", "@3X"]
+            image_gsub.each {|gsub| basename.gsub!(gsub, "")}
+            if self.image_hash.include?(basename)
+                self.image_hash[basename] << filename
+            else
+                self.image_hash[basename] = [filename]
+            end
+        end
+        
+        def deal_with_file(filename)
+            self.class_content << File.read(filename) unless File.symlink?(filename)
+        end
+        
+    end
+
+end
+

data/lib/yjcocoa/unused/unused_method.rb

@@ -0,0 +1,91 @@
+#
+#  unused_method.rb
+#  YJCocoaGem
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/12/8.
+#  Copyright © 2018年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class UnusedMethod < Unused
+        
+        self.command = 'method'
+        self.summary = 'unused method commands'
+        self.description = '查找 OC 项目中未使用的 method'
+        
+        def self.options
+            [['--match-o', 'Match O 文件地址'],
+            ['--match', '指定的字符串匹配，多字符串用 "," 分隔'],
+            ['--ignore', '忽略的字符串匹配, 多字符串用 "," 分隔'],
+            ['--output', '日志存放路径，默认当前路径']] + super
+        end
+    
+        # businrss
+        def validate!
+            super
+            unless self.matcho && self.matcho.length > 0
+                puts "Match O 文件地址为空".red
+                self.banner!
+            end
+        end
+        
+        def run
+            unused_methods = self.unreferenced_methods
+            fetch_methods = unused_methods.reject {|m| !(check_match(m) && !check_ignore(m))}
+            puts "分析完毕，打开日志：#{self.output}".green
+            File.write(self.output, fetch_methods.join("\n"))
+            `open #{self.output}`
+        end
+        
+        def unreferenced_methods
+            methods = self.implemented_methods
+            unless methods.count
+                puts "#{self.matcho} can't find implemented methods".red
+                self.banner!
+            end
+            sels = self.referenced_selectors
+            sels.each {|sel| methods.delete(sel)}
+            result = []
+            methods.values.each {|value| result += value}
+            return result.sort
+        end
+        
+        def implemented_methods
+            lines = `otool -oV #{self.matcho}`.split("\n")
+            methods = Hash.new
+            lines.each {|line|
+                line_scan = line.scan(/\s*imp 0x\w+ ([+|-]\[.+\s(.+)\])/)
+                if line_scan.count > 0
+                    imp = line_scan[0][0]
+                    sel = line_scan[0][1]
+                    if methods.include?(sel)
+                        methods[sel] << imp
+                    else
+                        methods[sel] = [imp]
+                    end
+                end
+            }
+            return methods
+        end
+        
+        def referenced_selectors
+            lines = `otool -v -s __DATA __objc_selrefs #{self.matcho}`.split("\n")
+            refs = []
+            lines.each { |line|
+                line_scan = line.scan(/__TEXT:__objc_methname:(.+)/)
+                if line_scan.count > 0
+                    refs << line_scan[0][0]
+                end
+            }
+            return refs
+        end
+        
+    end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yjcocoa
 version: !ruby/object:Gem::Version
-  version: 18.07.31
+  version: 20.07.16
 platform: ruby
 authors:
 - 阳君
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -67,6 +67,7 @@ files:
 - lib/yjcocoa/git/git.rb
 - lib/yjcocoa/git/git_branch.rb
 - lib/yjcocoa/git/git_cache.rb
+- lib/yjcocoa/git/git_checkout.rb
 - lib/yjcocoa/git/git_pull.rb
 - lib/yjcocoa/git/git_tag.rb
 - lib/yjcocoa/git/git_tag_add.rb
@@ -78,6 +79,10 @@ files:
 - lib/yjcocoa/pod/pod_release.rb
 - lib/yjcocoa/pod/product_class.rb
 - lib/yjcocoa/test.rb
+- lib/yjcocoa/unused/unused.rb
+- lib/yjcocoa/unused/unused_class.rb
+- lib/yjcocoa/unused/unused_image.rb
+- lib/yjcocoa/unused/unused_method.rb
 homepage: https://github.com/937447974/YJCocoaGem
 licenses:
 - MIT
@@ -98,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 3
 summary: YJCocoa, the Cocoa library package manager.