cocoapods-hbh 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ecd9739c3ee6352722b81352293df223f450498dc62d67f3b4e7398d0e6126
-  data.tar.gz: dc5e9e4a2043e464a2f790efc8f5b79e710813529d6a6f77c9173c5d5041ce22
+  metadata.gz: 8bad5c1b8ce197c38234be5e45fbd18308cae43d59cf347945d0ebec29c5fdbe
+  data.tar.gz: 5ee039ad7e1c47dc8965d444f03290e4f069bb34ca48ac3de7c8f1ed97bd91fd
 SHA512:
-  metadata.gz: 37ac6062b4024b8bc9cf5338efd6ba1ce5f567a6a2068251390221f2b228f69e9d267dc4b51133eaebf7914970f5586844aa6f6c9a0f02b33e0de374295d0136
-  data.tar.gz: 38b54f1dd0e180580ebde346aa61b827d4a3f97b31222a7380a19b3c533e03e126b79fc354f81580a20bd4e9aa7e2d2f62d004f3d4386ebf5b99f98c6a919b69
+  metadata.gz: 75b416f95ddf8bcf7078f0e82b445d06d32a962a5d627667ba965d7d999ef2def5143b192ee723f090195c76fec228cbf47df076be11aa3d779bee4cdd15955e
+  data.tar.gz: 66e6b44209cd8a26c27fd59b6ccbaf41e5b056ca4972512d770ab24ce4a9f783719fc51a98c7c417cf124b8d04c76b24be929065e06f8aeee40bad20390ba3a9

data/lib/cocoapods-hbh/command/common/hbh_git.rb

@@ -0,0 +1,27 @@
+require 'cocoapods-hbh/git_hooks/githooks_sync'
+
+module Pod
+    class Command
+        class Hbh < Command
+            class Git < Hbh
+                self.summary = '自定的githook相关命令'
+
+                self.description = <<-DESC
+                    自定的githook相关命令.
+                DESC
+            
+                # self.arguments = "hbhgit"
+
+                def initialize(argv)
+                    super    
+                end
+
+                def run
+                    UI.puts "同步Git相关命令"
+                    GitHooksSync.new.sync()
+                    UI.puts "同步完成"
+                end
+            end
+        end
+    end
+end

data/lib/cocoapods-hbh/command/hbh.rb

@@ -2,6 +2,7 @@ require 'cocoapods-hbh/command/common/install'
 require 'cocoapods-hbh/command/common/podfile'
 require 'cocoapods-hbh/command/common/push'
 require 'cocoapods-hbh/command/common/hbh_init'
+require 'cocoapods-hbh/command/common/hbh_git'
 require 'cocoapods-hbh/command/native/native_install'
 require 'cocoapods-hbh/command/native/native_update'
 

data/lib/cocoapods-hbh/command/module/add_module.rb

@@ -68,7 +68,7 @@ module Pod
           moduleRoot = sub_config['sub_path'].blank? ? "Modules" : sub_config['sub_path']
 
           path_module = "./#{moduleRoot}/#{moduleName}"
-          Pod::UI.puts "#{moduleName}使用本地Pod模块".yellow
+          Pod::UI.puts "#{moduleName}使用本地Pod模块".green
           if !File.exist?("#{path_module}/#{moduleName}.podspec")
             `git submodule add #{remoteUrl}#{moduleName}.git ./Modules/#{moduleName}`
             Pod::UI.puts "本地没有#{moduleName}模块，正在下载中..."
@@ -79,16 +79,16 @@ module Pod
             # `git config push.recurseSubmodules on-demand`
             
             if system "git submodule update --init --recursive" 
-              Pod::UI.puts "#{moduleName}模块下载完成...".yellow
+              Pod::UI.puts "#{moduleName}模块下载完成...".green
             end
           end
           if moduleTag != nil and !moduleTag.empty?
-            result = system("cd #{path_module} && git fetch && git checkout #{moduleTag}")
+            result = system("cd #{path_module} && git fetch origin #{moduleTag} && git checkout #{moduleTag}")
             raise "发生错误" unless result
             # `cd #{path_module} && git fetch && git checkout #{moduleTag}`
             # Pod::UI.puts "发生错误#{result}".red
            else
-            result = system("cd #{path_module} && git fetch && git checkout #{moduleBranch} && git pull origin #{moduleBranch}")
+            result = system("cd #{path_module} && git fetch origin #{moduleBranch} && git checkout #{moduleBranch} && git pull origin #{moduleBranch}")
             raise "发生错误" unless result
 
             # Pod::UI.puts "发生错误#{result}".red

data/lib/cocoapods-hbh/command.rb

@@ -3,13 +3,13 @@ require 'cocoapods-hbh/command/hbh'
 require 'cocoapods-hbh/git_hooks/githooks_sync'
 
 module CocoapodsHBHGitHooks
-    Pod::HooksManager.register('cocoapods-hbh', :post_install) do |context|
-        GitHooksSync.new.sync()
-    end
+    include Pod
     Pod::HooksManager.register('cocoapods-hbh', :post_update) do |context|
         GitHooksSync.new.sync()
+        Pod::UI.puts "恭喜你, 你已经 `pod update` 结束了."
     end
     Pod::HooksManager.register('cocoapods-hbh', :post_install) do |context|
+        GitHooksSync.new.sync()
 		Pod::UI.puts "恭喜你, 你已经 `pod install` 结束了."
 	end
 end

data/lib/cocoapods-hbh/config/config.rb

@@ -17,7 +17,8 @@ module HBHConfig
               'sub_path'    => '子模块存储路径' ,
               'sub_url'    => '子模块厂库地址' ,
             },
-            'is_git_hooks' => 'false',
+            'is_turn_swiftint' => false,
+            'is_turn_tinypng' => true,
             'cocoapods_version' => '1.10.1',
           }
         end
@@ -56,7 +57,8 @@ module HBHConfig
               if aFile   
                 aFile.syswrite(template_hash.to_yaml)   
               end 
-              raise "请在你的根目录配置创建并配置HBHConfig.yml文件"
+              YAML.load_file(config_name)
+              # raise "请在你的根目录配置创建并配置HBHConfig.yml文件"
             end
         end
         

data/lib/cocoapods-hbh/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHbh
-  VERSION = "0.1.5"
+  VERSION = "0.1.9"
 end

data/lib/cocoapods-hbh/git_hooks/githooks_sync.rb

@@ -1,14 +1,35 @@
 require 'cocoapods'
 require 'fileutils'
-
-module CocoapodsHBHGitHooks
+module Pod
     class GitHooksSync
         def sync
 
-            return unless HBHConfig.config.is_git_hooks
+            copyFileToGit("pre-commit")
+
+            if HBHConfig.config.is_turn_swiftint 
+                copyFileToGit("swiftlint.sh")
+            else
+                deleteFileInGit("swiftlint.sh")
+            end
+
+            if HBHConfig.config.is_turn_tinypng 
+                copyFileToGit("imageTinypng.rb")
+            else
+                deleteFileInGit("imageTinypng.rb")
+            end
+        end
+
+        def findGitPath
+            _git_path = ".git"
+            if !File.directory?(_git_path)
+                _git_path = "../.git"
+            end
+            _git_path
+        end
 
-            Pod::UI.puts "开始同步git拦截设置"
-            if !File.directory?(".git")
+        def copyFileToGit (file_name)
+            git_path = findGitPath()
+            if !File.directory?(git_path)
                 Pod::UI.puts "没有发现git工程"
                 return
             end
@@ -16,27 +37,54 @@ module CocoapodsHBHGitHooks
             # 在当前ruby项目的githook文件copy到项目里去做拦截
             # 如果项目里配置了 .git-hooks 文件件，将把里面的内容copy到项目里去做拦截
             # 项目里的.git-hooks 配置优先
-            git_hooks = "#{File.dirname(__FILE__)}/../../script_source/pre-commit"
+            hooks_path = "#{File.dirname(__FILE__)}/../../script_source/#{file_name}"
 
-            # if File.directory?(".git-hooks")
-                
-            # end
+            if !File.exist?(hooks_path)        
+                Pod::UI.puts "同步文件不存在"
+                return
+            end
+            git_hooks_path = "#{git_path}/hooks"
+            if !File.exist?(git_hooks_path)
+                FileUtils.mkdir_p git_hooks_path
+            end
+            FileUtils.cp_r(hooks_path, git_hooks_path)
+            FileUtils.chmod("+x", "#{git_hooks_path}/#{file_name}")
+            findSubmodulesHooks(hooks_path, git_path, file_name)
+        end
 
-            git_hooks = '.git-hooks/.' unless Dir['.git-hooks/*'].empty?
+        def findSubmodulesHooks (git_hooks_path, git_path, file_name)
+            subGitHookPath = walk(git_path)
+            subGitHookPath.each do |path|
+                FileUtils.cp_r(git_hooks_path, path)
+                FileUtils.chmod("+x", "#{path}/#{file_name}")
+            end
+        end
 
-            if !File.directory?(".git/hooks")
-                FileUtils.mkdir ".git/hooks"
+        def walk (startPath, dirName = "hooks", first = true)
+            @pathArr=Array.new unless !first
+            Dir.foreach(startPath) do |x|
+                path = File.join(startPath, x)
+                if x =="." or x ==".."
+                  next
+                elsif File.directory?(path)
+                    if path.include?(dirName)
+                        @pathArr << path
+                    end
+                    walk(path, dirName, false)
+                end
+              end
+            @pathArr
+        end
+
+        def deleteFileInGit (file_name)
+            if !File.directory?(findGitPath())
+                Pod::UI.puts "没有发现git工程"
+                return
             end
-            FileUtils.cp_r(git_hooks, ".git/hooks/")
-            path = ".git/hooks/"
-            Dir.open(path).each do |p|
-                filename = File.basename(p, File.extname(p))
-                if File.extname(p) == ".sh"
-                    FileUtils.mv("#{path}/#{p}", "#{path}/#{filename}")
-                end      
-                FileUtils.chmod("+x", "#{path}/#{filename}")
+            path = ".git/hooks/#{file_name}"
+            if File.exist?(path)
+                FileUtils.rm(path)
             end
-            Pod::UI.puts "结束同步git拦截设置"
         end
     end
 end

data/lib/script_source/imageTinypng.rb

@@ -0,0 +1,57 @@
+
+require 'tinify'
+require 'yaml'
+class TinyPngImage
+    ### 正则匹配所有图片资源
+    def get_all_img(items)
+        filter = /[\s\S]*\.(png|jpeg|jpg|pjpg|svg)/
+        items.select { |i| i[filter] }
+    end
+    def template_hash
+        {
+        'info' => "配置tinypng_key, 可访问获取对应Key https://tinypng.com/",
+        'tinypng_key' => "",
+        }  
+    end
+    ### 通过本地配置文件获取tinypng的key
+    def get_config 
+        configPath = ".git/hbh_git_config"
+        if !File.exist?(configPath)
+            File.new(configPath, "w+").syswrite(template_hash().to_yaml) 
+        end
+
+        config = OpenStruct.new YAML.load_file(configPath)
+        config.tinypng_key
+    end
+    ### 根据条件开始使用tinypng压缩图片
+    def start_tinypng
+        tinypng_key = get_config()
+
+        if !tinypng_key.nil? && !tinypng_key.empty?
+            Tinify.key = tinypng_key
+            # diffFile = %x(git diff --cached --name-only --diff-filter=ACM)
+            diffFile = %x(git diff --cached --name-only --diff-filter=ACM -- '*.jpg' '*.png' '*.jpeg')
+            diffArr = diffFile.split("\n")
+            imgArr = get_all_img(diffArr)
+            if imgArr.count > 0
+                puts "开始使用tinypng压缩图片"
+                for item in imgArr do
+                    fileSize =%x(du -sh #{item})
+                    puts "原文件大小：#{fileSize}"
+                    Tinify.from_file("#{item}").to_file("#{item}")
+                    addChangeFile = %x(git add #{item})
+                    optimizedFileSize =%x(du -sh #{item})
+                    puts "压缩后文件：#{optimizedFileSize}"
+                end
+            end
+        else
+            puts "请到.git/hbh_git_config文件里配置tinypng_key"
+            system("open .git/hbh_git_config")
+        end
+    end
+end
+
+tinify = TinyPngImage.new
+tinify.start_tinypng()
+
+

data/lib/script_source/pre-commit

@@ -1,37 +1,11 @@
-STAGE_FILES=$(git diff --cached --name-only --diff-filter=ACM -- '*.swift')
-swiftLintPath="./Pods/SwiftLint/swiftlint"
-if test ${#STAGE_FILES} -gt 0
-then
-    echo '检查提交的文件'
-    echo $(pwd)
-    if [ ! -e $swiftLintPath ]; then
-        echo '没安装SwiftLint'
-        exit 1
-    fi
-
-    PASS=true
-    PATH="./swiftLint"
-
-    for FILE in $STAGE_FILES
-    do
-        warning="*warning*"
-        $swiftLintPath lint --strict $FILE > $PATH
-        /bin/cat $PATH
-        Result=$(/bin/cat $PATH)
-        if [[ $Result == *$warning* ]]; then
-            PASS=false
-        fi
-    done
-    /bin/rm -rf $PATH
-  if ! $PASS; then
-      echo "SwiftLint检查没通过！"
-      exit 1
-  else
-      echo "SwiftLint检查完毕"
-  fi
-
-else
-    echo '没有swift文件需要检查'
+#!/bin/bash
+path=".git/hooks"
+#判断Swiftlint文件是否存在
+if [ -f ${path}/swiftlint.sh ]; then
+    sh .git/hooks/swiftlint.sh
 fi
-
-exit 0
+#判断Tinypng图片压缩文件是否存在
+if [ -f ${path}/imageTinypng.rb ]; then
+    ruby=$(which ruby)
+    ruby .git/hooks/imageTinypng.rb
+fi

data/lib/script_source/swiftlint.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+STAGE_FILES=$(git diff --cached --name-only --diff-filter=ACM -- '*.swift')
+swiftLintPath="./Pods/SwiftLint/swiftlint"
+if test ${#STAGE_FILES} -gt 0
+then
+    echo '检查提交的文件'
+    echo $(pwd)
+    if [ ! -e $swiftLintPath ]; then
+        echo '没安装SwiftLint'
+        exit 1
+    fi
+
+    PASS=true
+    PATH="./swiftLint"
+
+    for FILE in $STAGE_FILES
+    do
+        warning="*warning*"
+        $swiftLintPath lint --strict $FILE > $PATH
+        /bin/cat $PATH
+        Result=$(/bin/cat $PATH)
+        if [[ $Result == *$warning* ]]; then
+            PASS=false
+        fi
+    done
+    /bin/rm -rf $PATH
+  if ! $PASS; then
+      echo "SwiftLint检查没通过！"
+      exit 1
+  else
+      echo "SwiftLint检查完毕"
+  fi
+
+else
+    echo '没有swift文件需要检查'
+fi
+
+exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hbh
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - zanju
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tinify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - lib/cocoapods-hbh.rb
 - lib/cocoapods-hbh/command.rb
+- lib/cocoapods-hbh/command/common/hbh_git.rb
 - lib/cocoapods-hbh/command/common/hbh_init.rb
 - lib/cocoapods-hbh/command/common/install.rb
 - lib/cocoapods-hbh/command/common/podfile.rb
@@ -104,7 +119,9 @@ files:
 - lib/cocoapods-hbh/git_hooks/githooks_sync.rb
 - lib/cocoapods-hbh/helpers/git_depend.rb
 - lib/cocoapods_plugin.rb
+- lib/script_source/imageTinypng.rb
 - lib/script_source/pre-commit
+- lib/script_source/swiftlint.sh
 homepage: https://github.com/EXAMPLE/cocoapods-hbh
 licenses:
 - MIT
@@ -124,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-hbh.