cocoapods-hbh 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68cb2128e5a916a9c9e8b1e8b030facbfce360cb253b7d3efd9317c55e687521
-  data.tar.gz: e20133b18410c6f992a2987358f93f2d96a264bae8ce9d0416b4d0bcf6b79ec8
+  metadata.gz: aaa9a46dbd35d6f731cb779c53d98fc6ce5bdf2a7c7b07cd8a524cca704a22f9
+  data.tar.gz: 8daba11c634b15cdb5aaf5f0c9f0d91d1c9d7038d64b4ed86d64abc7794d574f
 SHA512:
-  metadata.gz: 6a0a64f0d1c9f39e727bb88e2c96fc5ef2b586bff21b55ca551a6fdd8bb0d5cb7d81dea2a2bde1d48f4673e22f828e79225664029bd8f39e1b4ecd3327e5cd80
-  data.tar.gz: 8998baf5668e58f1ee26ac2d19ba0def65813a8ebcc572e78a762e138fd81c877d70ee9916f990d7f497e2d06ca5c6032cd2782e470f705ca875f072d63530aa
+  metadata.gz: 9c6467fdf43be71dac1f3ec3281fb8e1ddce111259a3b5135a9db2421bbababaa849be9dea547671294be7894e11b5fc7f92328b37a1d603e7251b72fd2d9df5
+  data.tar.gz: b862ebfb616bd9a4d0b5250922d0943b6e33c14629a11139d11fcc17939640c8808eb28b61d898df986ebeffab671c8772f6975de25d14e7b64265f3331a1022

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

@@ -83,12 +83,12 @@ module Pod
             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 tag #{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/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHbh
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

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

@@ -19,8 +19,17 @@ module Pod
             end
         end
 
+        def findGitPath
+            _git_path = ".git"
+            if !File.directory?(_git_path)
+                _git_path = "../.git"
+            end
+            _git_path
+        end
+
         def copyFileToGit (file_name)
-            if !File.directory?(".git")
+            git_path = findGitPath()
+            if !File.directory?(git_path)
                 Pod::UI.puts "没有发现git工程"
                 return
             end
@@ -28,44 +37,64 @@ module Pod
             # 在当前ruby项目的githook文件copy到项目里去做拦截
             # 如果项目里配置了 .git-hooks 文件件，将把里面的内容copy到项目里去做拦截
             # 项目里的.git-hooks 配置优先
-            git_hooks = "#{File.dirname(__FILE__)}/../../script_source/#{file_name}"
+            hooks_path = "#{File.dirname(__FILE__)}/../../script_source/#{file_name}"
 
-            if !File.exist?(git_hooks)        
+            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
 
-            # git_hooks = '.git-hooks/.' unless Dir['.git-hooks/*'].empty?
+            copyHookAndChmod(hooks_path, git_hooks_path, file_name)
+            findSubmodulesHooks(hooks_path, git_path, file_name)
+        end
 
-            if !File.directory?(".git/hooks")
-                FileUtils.mkdir ".git/hooks"
+        def findSubmodulesHooks (git_hooks_path, git_path, file_name)
+            subGitHookPath = walk(git_path)
+            subGitHookPath.each do |path|
+                copyHookAndChmod(git_hooks_path, path, file_name)
             end
-            path = ".git/hooks"
+        end
 
-            FileUtils.cp_r(git_hooks, path)
-            
-            FileUtils.chmod("+x", "#{path}/#{file_name}")
-            # 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}")
-            # end
+        def copyHookAndChmod(git_hooks_path, path, file_name)
+            if File.exist?("#{path}/#{file_name}")
+                Pod::UI.puts "文件已经存在#{path}/#{file_name}"
+                return
+            else
+                FileUtils.cp_r(git_hooks_path, path)
+                FileUtils.chmod("+x", "#{path}/#{file_name}")
+            end
+         
+        end
+
+        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?(".git")
+            if !File.directory?(findGitPath())
                 Pod::UI.puts "没有发现git工程"
                 return
             end
-
             path = ".git/hooks/#{file_name}"
             if File.exist?(path)
                 FileUtils.rm(path)
             end
-            
-
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hbh
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - zanju
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel