yjcocoa 17.8.26 → 18.07.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1f6fb36b23404a0613c8094c2b1e2779c647360
-  data.tar.gz: 5d3f79a3a09a6c3425e8cbe897e2791f9f3cd413
+  metadata.gz: 468dc9c57201b9d39c26c51c9e7b7aa683d1c2e4
+  data.tar.gz: a5ca566d3435ac11207a5c95add930a69399e8d3
 SHA512:
-  metadata.gz: d1c6a92994cfc5e81c1dbd41e0d5ff42a6ba543ba04bc8adb02bf5dad012255bfd108516a639a2eac286cf8e649332e4472dc00b731050ae07c2f8237f060406
-  data.tar.gz: 4c38c996509704d02c02493282dc8958442e6d5ada595e1621a28bd5f91cdc4c81d40a24479e872fb40dee632a48e896cd43e6c37b8bcdf905081fdb9b8245bd
+  metadata.gz: 4eda8132e956e71098abc1dd49198652034c06a611d09cd93f942f5b49e70a0e9cce60c7cbaffc62ca6ca26f3daafcdd98d464da33ce3c1091e45bbc5a6c0d08
+  data.tar.gz: a7a9d834f2d6bbc331a93c3e76474f537e30591317609db0ae8ffecf2824043a5e557e4e395e9f4f88b84b4117dc4783ba9cb4031057d44dbf717fec708e850a

data/README.md

@@ -11,9 +11,24 @@ YJ系列Gem开源库
 
 [https://rubygems.org/gems/yjcocoa](https://rubygems.org/gems/yjcocoa)
 
-## git命令
+```
+Usage:
 
-![](https://raw.githubusercontent.com/937447974/Blog/master/Resources/2017082601.png)
+    $ yjcocoa COMMAND
+
+      YJCocoa, the Cocoa library package manager.
+
+Commands:
+
+    + git       Git commands
+    + log       log 日志解析
+    + pod       Pod commands
+
+Options:
+
+    --version   Show the version of the tool
+    --help      Show help banner of specified command
+```
 
 ----------
 
@@ -27,12 +42,8 @@ QQ：937447974
 
 YJ技术支持群：557445088
 
-职位：滴滴 iOS 高级工程师
-
 如果你觉得这个框架很赞，请点击右上角的Star按钮；如果你对我的框架感兴趣，并想持续获得本人最新的框架源文件，欢迎点击右上角的Fork按钮。
 
-如果你也想来和我们一起在滴滴从事iOS研发工作，欢迎投递简历到937447974@qq.com。
-
 ## Copyright
 
 CSDN：http://blog.csdn.net/y550918116j

data/lib/yjcocoa/command.rb

@@ -9,13 +9,10 @@
 #  Copyright © 2017年 YJCocoa. All rights reserved.
 #
 
-require 'claide'
-require 'colored2'
-require 'fileutils'
-require 'yjcocoa/gem_version'
-
 module YJCocoa
     
+    require 'yjcocoa/gem_version'
+    
     # Usage
     class Command < CLAide::Command
         
@@ -59,7 +56,7 @@ module YJCocoa
                 result = STDIN.gets.chomp.downcase
                 if result.empty?
                     result = answersDowncase.first
-                    print "default: #{result}".yellow
+                    puts "select default: #{result}".yellow
                 else
                     result = "yes" if result == "y"
                     result = "no" if result == "n"
@@ -74,6 +71,8 @@ module YJCocoa
 
     # Commands
     require 'yjcocoa/git/git'
+    require 'yjcocoa/log/log'
+    require 'yjcocoa/pod/pod'
 
 end
 

data/lib/yjcocoa/gem_version.rb

@@ -11,6 +11,6 @@
 
 module YJCocoa
     
-    VERSION = '17.8.26'.freeze unless defined? YJCocoa::VERSION
-    
+    VERSION = Time.now.strftime("%y.%m.%d").freeze unless defined? YJCocoa::VERSION
+
 end

data/lib/yjcocoa/git/git.rb

@@ -16,7 +16,7 @@ module YJCocoa
         
         self.abstract_command = true
         self.command = 'git'
-        self.summary = 'git commands'
+        self.summary = 'Git commands'
         self.description = 'These are common Git commands used in YJCocoa.'
         
         def gitExist?

data/lib/yjcocoa/git/git_cache.rb

@@ -41,11 +41,8 @@ module YJCocoa
         
         # businrss
         def validate!
+            super
             exit 0 unless self.gitExist?
-            unless File.exist?(".git")
-                puts "需在 git 仓库的根目录执行".red
-                self.banner!
-            end
             unless self.paths
                 puts "文件路径为空".red
                 self.banner!

data/lib/yjcocoa/git/git_tag.rb

@@ -13,25 +13,26 @@ module YJCocoa
     
     class GitTag < Git
         
+        self.abstract_command = false
         self.command = 'tag'
         self.summary = 'git tag'
         self.description = <<-DESC
             操作 tag 并同步到服务器
-            
-            1. 增加tag 1.0：yjcocoa git tag --add=1.0
-            
-            2. 删除多个tag 1.0 和 2.0：yjcocoa git tag --delete=1.0,2.0
         DESC
         
         def self.options
-            [['--add', '增加tag并推送到服务器'],
-            ['--delete', '删除多个tags并推送到服务器'],]
+            if self == YJCocoa::GitTag
+                [['--add', '增加 tag, 多 tag 用 "," 分隔'],
+                ['--delete', '删除 tag, 多 tag 用 "," 分隔']] + super
+            else
+                super
+            end
         end
-    
+
         # property
         attr_accessor :addTag
         attr_accessor :deleteTags
-        
+
         # 初始化
         def initialize(argv)
             super
@@ -39,13 +40,16 @@ module YJCocoa
             self.deleteTags = argv.option('delete')
             self.deleteTags = self.deleteTags.split(",").reject {|i| i.empty? } if self.deleteTags
         end
-        
+
         # businrss
         def validate!
+            super
             exit 0 unless self.gitExist?
-            self.banner! unless self.addTag || self.deleteTags
+            if self.class == YJCocoa::GitTag
+                self.banner! unless self.addTag || self.deleteTags
+            end
         end
-        
+
         def run
             if self.addTag
                 self.gitTagAdd
@@ -53,19 +57,23 @@ module YJCocoa
             end
             self.gitTagDelete if self.deleteTags && !self.deleteTags.empty?
         end
-        
+
         def gitTagAdd
             puts "YJCocoa git add tag #{self.addTag}".green
             system("git push origin #{self.addTag}") if system("git tag #{self.addTag}")
         end
-        
+
         def gitTagDelete
             puts "YJCocoa git delete tags #{self.deleteTags}".green
             self.deleteTags.each { |tag|
                 system("git push origin :refs/tags/#{tag}") if system("git tag -d #{tag}")
             }
         end
-        
+
     end
 
+    # Commands
+    require 'yjcocoa/git/git_tag_add'
+    require 'yjcocoa/git/git_tag_delete'
+
 end

data/lib/yjcocoa/git/git_tag_add.rb

@@ -0,0 +1,38 @@
+#
+#  git_tag_add.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/16.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class GitTagAdd < GitTag
+        
+        self.abstract_command = false
+        self.command = 'add'
+        self.summary = '添加默认 tag(git库名-%Y%m%d%H%M)'
+        self.description = '添加默认 tag(git库名-%Y%m%d%H%M)'
+        
+        def run
+            if File.exist?(".git")
+                tag = File.basename(Dir.pwd)
+                tag << '-'
+                tag << Time.now.strftime("%Y%m%d%H%M")
+                puts "YJCocoa build tag #{tag}".green
+                system("yjcocoa git tag --add=#{tag}")
+                else
+                Dir.chdir("..") {
+                    self.run
+                }
+            end
+        end
+        
+    end
+    
+end

data/lib/yjcocoa/git/git_tag_delete.rb

@@ -0,0 +1,38 @@
+#
+#  git_tag_delete.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/16.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class GitTagDelete < GitTag
+        
+        self.abstract_command = false
+        self.command = 'delete'
+        self.summary = '删除最新的 tag'
+        self.description = '删除最新的 tag'
+        
+        def run
+            tag = `git tag`.split("\n").last
+            if tag
+                answer = self.askWithAnswers("是否删除 tag #{tag}", ["Yes", "No"])
+                if answer == "yes"
+                    system("YJCocoa git tag --delete=#{tag}")
+                end
+                else
+                puts "暂无 Tag".green
+                self.banner!
+            end
+        end
+        
+    end
+    
+end
+

data/lib/yjcocoa/log/log.rb

@@ -0,0 +1,87 @@
+#
+#  pod.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/17.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class Log < Command
+        
+        self.command = 'log'
+        self.summary = 'log 日志解析'
+        self.description = <<-DESC
+            .log 日志解析，并保留需要的记录\n
+            1. 以文件夹的方式解析，并将解析后的日志存放在文件夹内。\n
+            2. 解析时使用字符串匹配，匹配成功的记录会保留 YJCocoa.log 中。
+        DESC
+        
+        def self.options
+            [['--dir', '文件夹地址'], ['--match', '匹配的字符串']] + super
+        end
+    
+        LOG_FILE = "YJCocoa.log"
+    
+        attr_accessor :dir   # 文件夹地址
+        attr_accessor :match # 匹配的字符串
+        
+        # 初始化
+        def initialize(argv)
+            super
+            self.dir = argv.option('dir')
+            self.match = argv.option('match')
+            self.match = self.match.split(",").reject {|i| i.empty? } if self.match
+        end
+        
+        # businrss
+        def validate!
+            super
+            unless self.dir && Dir.exist?(self.dir)
+                puts "dir:#{self.dir} 文件夹不存在".red
+                self.banner!
+            end
+            unless self.match && self.match.length > 0
+                puts "match 为空".red
+                self.banner!
+            end
+        end
+        
+        def run
+            Dir.chdir(self.dir) {
+                log = ""
+                File.delete(LOG_FILE) if File.exist?(LOG_FILE)
+                for path in Dir["**/*.log"].sort do
+                    puts "解析日志 #{path}".green
+                    File.open(path, "r") { |file|
+                        while line = file.gets
+                            if self.check(line)
+                                log << line
+                            end
+                        end
+                    }
+                end
+                puts "\n解析完毕，打开日志：#{dir}/#{LOG_FILE}".green
+                File.write(LOG_FILE, log)
+                `open #{LOG_FILE}`
+            }
+        end
+                
+        def check (line)
+            self.match.each { |m|
+                if line.include?(m)
+                    return true
+                end
+            }
+            return false
+        end
+        
+    end
+
+end
+

data/lib/yjcocoa/pod/pod.rb

@@ -0,0 +1,31 @@
+#
+#  pod.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/16.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class Pod < Command
+        
+        self.abstract_command = true
+        self.command = 'pod'
+        self.summary = 'Pod commands'
+        self.description = 'These are common pod commands used in YJCocoa.'
+        
+    end
+    
+    # Commands
+    require 'yjcocoa/pod/pod_dependency'
+    require 'yjcocoa/pod/pod_lib'
+    require 'yjcocoa/pod/pod_release'
+    
+end
+
+

data/lib/yjcocoa/pod/pod_dependency.rb

@@ -0,0 +1,171 @@
+#
+#  pod_dependency.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/17.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    require 'yjcocoa/pod/product_class'
+    
+    # Usage
+    class PodDependency < Pod
+        
+        self.command = 'dependency'
+        self.summary = '代码依赖分析'
+        self.description = <<-DESC
+        代码依赖分析\n
+        1. 分析库之间的依赖关系；\n
+        2. 搜索不符合规范的 import 导入，库正确导入方式为 '#import <Foundation/Foundation.h>'，错误的方式是'#import "Foundation.h"'.
+        DESC
+        
+        def self.options
+            [['--dir', '库路径，多个库用’,‘号分割'],
+            ['--output', '日志存放路径，默认当前路径']] + super
+        end
+    
+         attr_accessor :dir_array # 目录
+         attr_accessor :output # 输出地址
+         attr_accessor :ignore_frameworks # 忽略的外部库
+
+        def initialize(argv)
+            super
+            self.dir_array = argv.option('dir')
+            self.output = argv.option('output')
+            if self.dir_array
+                self.dir_array = self.dir_array.split(",").reject {|i|
+                    i.empty? || !Dir.exist?(i)
+                }
+            end
+            self.output = Dir.pwd unless self.output
+            self.output << "/YJCocoa.log"
+            self.ignore_frameworks = ["AppKit", "Foundation", "UIKit", "WatchKit"]
+        end
+        
+        def validate!
+            super
+            unless self.dir_array && !self.dir_array.empty?
+                puts "库路径为空或不存在".red
+                self.banner!
+            end
+        end
+        
+        def run
+            log = "YJCocoa 代码依赖分析\n"
+            files = self.search_files
+            log << "文件数：#{files.size}\n"
+            products = self.parsing_files(files)
+            log << "class数：#{products.size}\n"
+            log << self.parsing_class(products)
+            puts "\n分析完毕，打开日志：#{self.output}".green
+            File.write(self.output, log)
+            `open #{self.output}`
+        end
+        
+        def search_files
+            puts "\n搜索文件...".green
+            files = []
+            for dir in self.dir_array do
+                Dir.chdir(dir) {
+                    puts dir
+                    for path in Dir["**/*.{h,m,mm}"] do
+                        files << "#{dir}/#{path}"
+                    end
+                }
+            end
+            files.uniq!
+            files.sort!
+        end
+        
+        def parsing_files(files)
+            puts "\n分析文件...".green
+            hash = {}
+            for file in files
+                puts file
+                fileName = File.basename(file).split(".").first
+                product_class = hash[fileName]
+                unless product_class
+                    product_class = ProductClass.new(fileName)
+                    hash[fileName] = product_class
+                end
+                case File.extname(file)
+                when ".h"
+                    product_class.h_path = file
+                when ".m"
+                    product_class.m_path = file
+                when ".mm"
+                    product_class.mm_path = file
+                end
+            end
+            return hash
+        end
+        
+        def parsing_class(products)
+            puts "\n分析文件内容...".green
+            log = ""
+            all_frameworks = []
+            for project in products.values
+                puts project.name
+                templog = ""
+                hlog = self.parsing_content(project.h_path, all_frameworks, products) if project.h_path
+                templog << hlog if hlog
+                mlog = self.parsing_content(project.m_path, all_frameworks, products) if project.m_path
+                templog << mlog if mlog
+                mmlog = self.parsing_content(project.mm_path, all_frameworks, products) if project.mm_path
+                templog << mmlog if mmlog
+                log << "\n#{project.name}\n#{templog}" unless templog.empty?
+            end
+            all_frameworks.uniq!
+            all_frameworks.sort!
+            return "外部依赖汇总：#{all_frameworks.size} #{all_frameworks.to_s}\n\n" + log
+        end
+        
+        def parsing_content(file, all_frameworks, products)
+            frameworks = []
+            warning = []
+            error = []
+            File.open(file, "r") { |file|
+                while line = file.gets
+                    if line.include?("#import")
+                        if line.include?("<")
+                            import = line[/<.*>/][/<.*\//]
+                            if import
+                                import[0] = ""
+                                import[-1] = ""
+                                frameworks << import unless self.ignore_frameworks.include?(import)
+                            else
+                                 error << line.chomp
+                            end
+                        elsif line.include?(".h\"")
+                            import = line[/".*.h"/]
+                            import[0] = ""
+                            import[-1] = ""
+                            warning << import unless products[import[0..import.size-3]]
+                        end
+                    elsif line.include?("@protocol") || line.include?("@interface") || line.include?("@implementation")
+                        break
+                    end
+                end
+            }
+            all_frameworks.concat(frameworks)
+            frameworks.uniq!
+            frameworks.sort!
+            if !frameworks.empty? || !warning.empty? || !error.empty?
+                log = "#{file}\n"
+                log << "外部依赖：#{frameworks.to_s}\n" unless frameworks.empty?
+                log << "错误依赖：#{error.to_s}\n" unless error.empty?
+                log << "不合理依赖：#{warning.to_s}\n" unless warning.empty?
+                return log
+            end
+            return nil
+        end
+        
+    end
+
+end
+

data/lib/yjcocoa/pod/pod_lib.rb

@@ -0,0 +1,47 @@
+#
+#  product_lib.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/17.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class PodLib < Pod
+        
+        self.command = 'lib'
+        self.summary = 'Develop pods'
+        self.description = 'Develop pods'
+        
+        def self.options
+            [['--create', 'Creates a new Pod'],] + super
+        end
+    
+        attr_accessor :create # create pod
+    
+        def initialize(argv)
+            super
+            self.create = argv.option('create')
+        end
+        
+        def validate!
+            super
+            unless self.create && !self.create.empty?
+                puts "库名为空".red
+                self.banner!
+            end
+        end
+        
+        def run
+            puts "YJCocoa create pod lib #{self.create}".green            
+            system("pod lib create --template-url=git@github.com:937447974/pod-template.git #{self.create}")
+        end
+    
+    end
+    
+end

data/lib/yjcocoa/pod/pod_release.rb

@@ -0,0 +1,90 @@
+#
+#  pod_release.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/16.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class PodRelease < Pod
+        
+        self.abstract_command = false
+        self.command = 'release'
+        self.summary = '收集 pod 库的 版本号'
+        self.description = <<-DESC
+        收集 pod 库的 版本号
+        
+        注意事项: podfile 和 sender 不可为空
+        DESC
+        
+        def self.options
+            [['--podfile', '包含 pods 库的 podfile 文件路径'],
+            ['--pods', 'pods 库，多 pod 用 "," 分隔']] + super
+        end
+    
+        attr_accessor :podfile # 文件路径
+        attr_accessor :pods # pods 库
+        
+        # 初始化
+        def initialize(argv)
+            super
+            self.podfile = argv.option('podfile')
+            self.pods = argv.option('pods')
+            self.pods = self.pods.split(",").reject {|i| i.empty? } if self.pods
+        end
+        
+        def validate!
+            super
+            puts "podfile 为空".red unless self.podfile
+            puts "pods 为空".red unless self.pods
+            self.banner! unless self.podfile && self.pods
+            unless File.exist?(self.podfile)
+                puts "podfile 文件路径 #{self.podfile} 不存在".red
+                self.banner!
+            end
+        end
+        
+        # businrss
+        def run
+            self.gitPull
+            content = []
+            File.open(self.podfile, "r") { |file|
+                while line = file.gets   #标准输入流
+                    result = check(self.pods, line)
+                    content << "#{result}" if result
+                end
+            }
+            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")
+                            return "#{pod}, #{item.chomp}"
+                        end
+                    }
+                end
+            }
+            return nil
+        end
+        
+    end
+    
+end

data/lib/yjcocoa/pod/product_class.rb

@@ -0,0 +1,28 @@
+#
+#  product_class.rb
+#  YJCocoa
+#
+#  https://github.com/937447974
+#  YJ技术支持群:557445088
+#
+#  Created by 阳君 on 2018/07/17.
+#  Copyright © 2017年 YJCocoa. All rights reserved.
+#
+
+module YJCocoa
+    
+    # Usage
+    class ProductClass
+        
+        attr_accessor :name
+        attr_accessor :h_path
+        attr_accessor :m_path
+        attr_accessor :mm_path
+        
+        def initialize(name)
+            self.name = name
+        end
+        
+    end
+    
+end

data/lib/yjcocoa/test.rb

@@ -0,0 +1 @@
+Dir.chdir("..") { system("yjcocoa git pull") }

data/lib/yjcocoa.rb

@@ -11,11 +11,13 @@
 
 require 'rubygems'
 require 'claide'
-require 'colored'
-require 'yjcocoa/command'
+require 'colored2'
+require 'date'
+require 'fileutils'
+require 'json'
 
 module YJCocoa
     
-    autoload :Command, 'cocoapods/command'
+    require 'yjcocoa/command'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yjcocoa
 version: !ruby/object:Gem::Version
-  version: 17.8.26
+  version: 18.07.17
 platform: ruby
 authors:
 - 阳君
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -69,6 +69,15 @@ files:
 - lib/yjcocoa/git/git_cache.rb
 - lib/yjcocoa/git/git_pull.rb
 - lib/yjcocoa/git/git_tag.rb
+- lib/yjcocoa/git/git_tag_add.rb
+- lib/yjcocoa/git/git_tag_delete.rb
+- lib/yjcocoa/log/log.rb
+- lib/yjcocoa/pod/pod.rb
+- lib/yjcocoa/pod/pod_dependency.rb
+- lib/yjcocoa/pod/pod_lib.rb
+- lib/yjcocoa/pod/pod_release.rb
+- lib/yjcocoa/pod/product_class.rb
+- lib/yjcocoa/test.rb
 homepage: https://github.com/937447974/YJCocoaGem
 licenses:
 - MIT
@@ -89,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: YJCocoa, the Cocoa library package manager.