cocoapods-hbh 0.0.3 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f2592765405050041e12717abc2b09cfd47f330e051f4de48b50ebe20dc502
-  data.tar.gz: 9cdb8ece30e50c8997e758a46acd773bc7bd6685ba4fbd5faa83bc54e63ecb28
+  metadata.gz: a99b63e2ae7aca677011d72c3b530e86baae6ce67ab013d20f7492be3c87ae5a
+  data.tar.gz: 1ae16580830fa55e0a235cb4f9ece28af8de44f6e2cb17c291b2ea03997f81b6
 SHA512:
-  metadata.gz: 5047868bf505be88016941cd3b4966fa7c1e4be02af0e7db568a66ec02a7d873b4322c1988eb2d0a085b2c1da52ba329a1b143fc77a82c11f024c0625482f504
-  data.tar.gz: 30d0a3e632d08d03bf9ea88bcb8259ee2d52e20cf4e74873d741d98a26be6dceafe0d4ad41c093aa3f64f1f71c7c44fc9571caf847aa93685c9555c1874b94ce
+  metadata.gz: f71687768d2449f2c478d4c9b659417ab83221c38d82fa83e2941dad14f2206095af344592043e4b9eeb0fe98f3ce4abafb13689cfa681c3e42a8c9d2871d448
+  data.tar.gz: 825677c58fa3882f65fb222d9acae3d797ed03bd08dbf2bf1c20d53f65aebe341ebfab81627299be7efc7b5042d20912ef7e8a962014952ed852ce30ed7ac2cc

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

@@ -15,14 +15,13 @@ module Pod
             add_sub_module.pod_submoudle(name, *requirements)
         end
 
-        def pod_private(name = nil, *requirements)
+        def pod_hbh(name = nil, *requirements)
           unless name
             raise StandardError, 'A dependency requires a name.'
           end
           add_sub_module = AddModule.new(@current_target_definition)
           add_sub_module.pod_private(name, *requirements)
       end
-
     end
 
   end

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

@@ -5,8 +5,6 @@ module Pod
       class Repo < Command
         class Push < Repo
             class HBH < Push
-            # pod repo push HBHSpecs HBHNetwork.podspec、
-            # --sources='http://gitlab.jiehun.tech/App/iOS/Modularization/HBHSpecs.git,https://github.com/CocoaPods/Specs' --allow-warnings
                 def initialize(argv)
                     super
                     hbh_specs_env = HBHConfig.config.hbh_specs_env

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

@@ -2,6 +2,8 @@ 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/native/native_install'
+require 'cocoapods-hbh/command/native/native_update'
 
 module Pod
   class Command

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

@@ -43,7 +43,7 @@ module Pod
       
       
       # 添加模块 模块名称为podspec的名称，路径默认为Module/下的模块，tag或者branch 优先使用tag，默认develop分支
-      # (moduleName, submodule: true, moduleTag: nil, moduleBranch: 'develop', appspecs: nil)
+      # (moduleName,     : true, moduleTag: nil, moduleBranch: 'develop', appspecs: nil)
       def pod_submoudle (moduleName, *requirements)
         info = requirements.last
         is_submodule = get_info(info, :submodule, true)
@@ -55,7 +55,7 @@ module Pod
           moduleBranch = get_info(info, :branch, nil)
           if moduleTag.nil? && moduleBranch.nil?
             Pod::UI.puts "请配置依赖tag或者branch".red
-            raise "注意： 请配置依赖tag或者branch"
+            exit()
           end
 
           appspecs = get_info(info, :appspecs, nil)
@@ -63,7 +63,7 @@ module Pod
           remoteUrl = sub_config['sub_url'] 
           if remoteUrl.blank?
             Pod::UI.puts "请配置subModule的sub_url".red
-            raise "注意： 请配置subModule的sub_url"
+            exit()
           end
           moduleRoot = sub_config['sub_path'].blank? ? "Modules" : sub_config['sub_path']
 
@@ -83,9 +83,11 @@ module Pod
             end
           end
           if moduleTag != nil and !moduleTag.empty?
-            `cd #{path_module} && git fetch && git checkout #{moduleTag}`    
+            `cd #{path_module} && git fetch && git checkout #{moduleTag}`
            else
-            `cd #{path_module} && git fetch && git checkout #{moduleBranch} && git pull origin #{moduleBranch}`
+            pid, stdin, stdout, stderr = Open3::popen3 `cd #{path_module} && git fetch && git checkout #{moduleBranch} && git pull origin #{moduleBranch}`
+            Pod::UI.puts "发生错误#{stderr.value}".red
+            # `cd #{path_module} && git fetch && git checkout #{moduleBranch} && git pull origin #{moduleBranch}`
           end
           if appspecs != nil 
             sub_hash = {:path => path_module, :appspecs => ['Example']}

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

@@ -0,0 +1,19 @@
+require 'cocoapods'
+
+module Pod
+    class Installer
+        alias old_prepare prepare
+        def prepare
+            if podfile.plugins.keys.include?('cocoapods-hbh')
+                Pod::UI.puts "使用cocoapods-hbh插件"
+                spec_version = HBHConfig.config.cocoapods_version
+                cocoapods_version = Pod::VERSION
+                if spec_version != cocoapods_version 
+                    Pod::UI.puts "注意： 你当前的pod版本和指定的版本不一致，当前指定版本为#{spec_version}，您的版本为#{cocoapods_version}".red
+                    exit()
+                end
+            end
+            old_prepare()
+        end
+    end
+end  

data/lib/cocoapods-hbh/command.rb

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

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

@@ -4,37 +4,21 @@ require 'cocoapods-hbh/gem_version'
 
 module HBHConfig
     class Config
-
-        def write_config ()
-          { 
-            "hbh_specs_env" =>
-          {
-            "specs_name" => "私有仓库名称", 
-            "specs_url" => "私有仓库地址"
-          },
-          "submodule_env" =>
-          {
-            "sub_path" => "子模块存储路径",
-            "sub_url" => "子模块远程厂库地址"
-          }
-        }
-        end
-
-        def template_hash
+      
+      def template_hash
           {
-            'hbh_specs_env' => { description: '私有仓库环境', 
-              default: {
-              'specs_name'    => { description: '私有仓库名称' },
-              'specs_url'    => { description: '私有仓库地址' },
-              }
+            'hbh_specs_env' => { 
+              'description' => '私有仓库环境配置', 
+              'specs_name'   => '私有仓库名称',
+              'specs_url'    => '私有仓库地址',
             },
-            
-            'submodule_env' => { description: '子仓库环境', 
-              default: {
-                'sub_path'    => { description: '子模块存储路径' },
-                'sub_url'    => { description: '子模块厂库地址' },
-              }
+            'submodule_env' => { 
+              'description' => '子仓库环境配置', 
+              'sub_path'    => '子模块存储路径' ,
+              'sub_url'    => '子模块厂库地址' ,
             },
+            'is_git_hooks' => 'false',
+            'cocoapods_version' => '1.10.1',
           }
         end
 
@@ -68,7 +52,11 @@ module HBHConfig
             if File.exist?(config_name)
               YAML.load_file(config_name)
             else
-              default_config
+              aFile = File.new(config_name, "w+")
+              if aFile   
+                aFile.syswrite(template_hash.to_yaml)   
+              end 
+              raise "请在你的根目录配置创建并配置HBHConfig.yml文件"
             end
         end
         
@@ -84,7 +72,11 @@ module HBHConfig
             if config.respond_to?(method)
               config.send(method, *args)
             elsif template_hash.keys.include?(method.to_s)
-              raise Pod::Informative, "#{method} 字段必须在配置文件 #{config_name} 中设置, 请执行 init 命令配置或手动修改配置文件".red
+              if method.to_s == "is_git_hooks" 
+
+              else
+                raise Pod::Informative, "#{method} 字段必须在配置文件 #{config_name} 中设置, 请手动修改配置文件".red
+              end
             else
               super
             end

data/lib/cocoapods-hbh/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHbh
-  VERSION = "0.0.3"
+  VERSION = "0.1.3"
 end

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

@@ -0,0 +1,42 @@
+require 'cocoapods'
+require 'fileutils'
+
+module CocoapodsHBHGitHooks
+    class GitHooksSync
+        def sync
+
+            return unless HBHConfig.config.is_git_hooks
+
+            Pod::UI.puts "开始同步git拦截设置"
+            if !File.directory?(".git")
+                Pod::UI.puts "没有发现git工程"
+                return
+            end
+
+            # 在当前ruby项目的githook文件copy到项目里去做拦截
+            # 如果项目里配置了 .git-hooks 文件件，将把里面的内容copy到项目里去做拦截
+            # 项目里的.git-hooks 配置优先
+            git_hooks = "#{File.dirname(__FILE__)}/../../script_source/pre-commit"
+
+            # if File.directory?(".git-hooks")
+                
+            # end
+
+            git_hooks = '.git-hooks/.' unless Dir['.git-hooks/*'].empty?
+
+            if !File.directory?(".git/hooks")
+                FileUtils.mkdir ".git/hooks"
+            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}")
+            end
+            Pod::UI.puts "结束同步git拦截设置"
+        end
+    end
+end

data/lib/script_source/pre-commit

@@ -0,0 +1,37 @@
+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.0.3
+  version: 0.1.3
 platform: ruby
 authors:
 - zanju
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -96,11 +96,15 @@ files:
 - lib/cocoapods-hbh/command/custom/sync_githooks.rb
 - lib/cocoapods-hbh/command/hbh.rb
 - lib/cocoapods-hbh/command/module/add_module.rb
+- lib/cocoapods-hbh/command/native/native_install.rb
+- lib/cocoapods-hbh/command/native/native_update.rb
 - lib/cocoapods-hbh/config/config.rb
 - lib/cocoapods-hbh/config/config_asker.rb
 - lib/cocoapods-hbh/gem_version.rb
+- lib/cocoapods-hbh/git_hooks/githooks_sync.rb
 - lib/cocoapods-hbh/helpers/git_depend.rb
 - lib/cocoapods_plugin.rb
+- lib/script_source/pre-commit
 homepage: https://github.com/EXAMPLE/cocoapods-hbh
 licenses:
 - MIT