cocoapods-hbh 0.0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce18e2b95339d2db022c65c616c7ca55fb29c372a3fa534ddd3fb7b4430e46d9
-  data.tar.gz: 4ad932b3d91390c27f7d9895e016a3ebdacbbe7146a8d5c2972e728d62138889
+  metadata.gz: da626f7b976f6a16457e2733f07349f4845f02bd52f963494355ff3ed55f2086
+  data.tar.gz: 273c9e9e84053abf887b4427d357bf29505ef01cea7666b60285f210d304cea0
 SHA512:
-  metadata.gz: 0edef73beae1ffcd658707c201e120eed4df01958c402db5ea92d61147648c824628ec3ba3a71f1adb71427af415d5e36c86921e246bc9115b2abbbbb56fb0b8
-  data.tar.gz: c44f0b8a99668bf891432d7a1edff04eb5f8c784837e30caf1eabcad8cb82797a0f5dad14b7af318f5a6d525077ef7f99958e8d99dfd067b4933025a080f920c
+  metadata.gz: b5efe9375d521087fc6ee69c60e9fc77f1d13684860ec43db86a29e3781080aa98ac9ca3c5c048e1583ae5f97f352ea12a8619f5525398d64b7cc6c818068e4c
+  data.tar.gz: ac52e0157181febf6795126d03a8a40c16a04ff4f7f7d058d3100ce835539b47f8e55175ccd394d98afa14a0d94e98aee14ddbfade003384448f6b80c2b07b25

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

@@ -0,0 +1,52 @@
+require 'cocoapods-hbh/config/config_asker'
+require 'cocoapods/generate'
+
+module Pod
+    class Command
+      class Hbh < Command
+        class Init < Hbh
+          def initialize(argv)
+          
+          end
+    
+          def validate!
+        
+          end
+
+          def run()
+            if File.exist?("./HBHConfig.yml") 
+              Pod::UI.puts "当前目录已有配置文件".yellow 
+              return
+            end
+            
+            Pod::UI.message '开始生成配置文件' do
+                config_with_asker
+            end
+          end
+
+          def config_with_asker
+                asker = HBHConfig::Config::Asker.new
+                asker.wellcome_message
+      
+                # config = {}
+                # template_hash = HBHConfig.config.template_hash
+                # template_hash.each do |k, v|
+                #   default = begin
+                #     HBHConfig.config.send(k)
+                #     rescue StandardError
+                #         nil
+                #     end
+                #   config[k] = asker.ask_with_answer(v[:description], default, v[:selection])
+                # end
+              
+                HBHConfig.config.sync_config(HBHConfig.config.write_config)
+                asker.done_message
+            end
+          end
+
+          def generate_obj ()
+
+          end
+      end
+    end
+  end

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

@@ -1,5 +1,5 @@
 require 'cocoapods'
-require 'cocoapods-hbh/command/sub_module/add_submodule'
+require 'cocoapods-hbh/command/module/add_module'
 
 
 module Pod
@@ -11,11 +11,17 @@ module Pod
             unless name
               raise StandardError, 'A dependency requires a name.'
             end
-            add_sub_module = AddSubModule.new(@current_target_definition)
-            add_sub_module.pod_moudle(name, *requirements)
-            # current_target_definition.store_pod(name, *requirements)
+            add_sub_module = AddModule.new(@current_target_definition)
+            add_sub_module.pod_submoudle(name, *requirements)
         end
 
+        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/custom/sync_githooks.rb

@@ -0,0 +1,38 @@
+require 'cocoapods'
+require 'fileutils'
+
+module CocoapodsGitHooks
+  class GitHooksManager
+    class << self
+  
+      # @param [TargetDefinition]
+      # @return [Array<Dependency>]
+      def dependencies_in_target(abstract_target)
+        abstract_target.dependencies
+      end
+
+      def validate_git_directory?
+        unless File.directory?(".git")
+          Pod::UI.puts 'Can not find .git directory.'
+          return false
+        end
+        true
+      end
+
+      def sync
+          return unless validate_git_directory?
+          scr_path = "./Script/pre-commit"
+          return unless File::exist?(scr_path)
+          pre_path = ".git/hooks/pre-commit"
+
+          FileUtils.mkdir '.git/hooks' unless File.directory?('.git/hooks') 
+          if File::exist?(pre_path)
+          FileUtils.cp(scr_path, ".git/hooks/")
+          FileUtils.chmod('+x', pre_path)
+          end
+        end
+
+      
+    end
+  end
+end

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

@@ -1,6 +1,9 @@
 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
@@ -28,16 +31,16 @@ module Pod
           婚博会组件依赖管理插件
       DESC
 
-      self.arguments = 'hbhCocoapods插件'
+      # self.arguments = 'hbhCocoapods插件'
 
       def initialize(argv)
-        @name = argv.shift_argument
+        @help = argv.flag?('help').blank? ? 'help' : argv.flag?('help')
         super
       end
 
       def validate!
         super
-        help! 'A Pod name is required.' unless @name
+        help! '暂时还没有帮助信息' unless @help
       end
 
       def run

data/lib/cocoapods-hbh/command/{sub_module/add_submodule.rb → module/add_module.rb}

@@ -4,7 +4,7 @@ require 'cocoapods/user_interface'
 
 module Pod
   class Podfile
-    class AddSubModule
+    class AddModule
       UI = Pod::UserInterface unless defined? UI
     # @return [TargetDefinition] The current target definition to which the DSL
     #         commands apply.
@@ -23,39 +23,47 @@ module Pod
           return default
         end
       end
+
+      def pod_private (moduleName, *requirements) 
+        info = requirements.last
+        git = get_info(info, :git, nil)
+        sub_config = HBHConfig.config.submodule_env
+        remoteUrl = sub_config['sub_url'] 
+        if git.blank? 
+            if moduleName.include?('/')
+                name = moduleName.split('/').first
+                requirements.last[:git] = "#{remoteUrl}/#{name}.git"
+            else
+                requirements.last[:git] = "#{remoteUrl}/#{moduleName}.git"
+            end
+        end
+        Pod::UI.puts "#{moduleName}使用私有库".yellow
+        current_target_definition.store_pod moduleName, *requirements
+      end
       
       
       # 添加模块 模块名称为podspec的名称，路径默认为Module/下的模块，tag或者branch 优先使用tag，默认develop分支
-      # (moduleName, submodule: true, moduleTag: nil, moduleBranch: 'develop', appspecs: nil)
-      def pod_moudle (moduleName, *requirements)
+      # (moduleName,     : true, moduleTag: nil, moduleBranch: 'develop', appspecs: nil)
+      def pod_submoudle (moduleName, *requirements)
         info = requirements.last
-        # git = get_info(info, :git, nil)
-        
-        
-        # if git.blank? 
-        #   hbh_git = get_info(info, :hbh_git, nil)
-        #   if moduleName.include?('/')
-        #     name = moduleName.split('/').first
-        #     requirements.last[:git] = "#{remoteUrl}/#{name}.git"
-        #   else
-        #     requirements.last[:git] = "#{remoteUrl}/#{moduleName}.git"
-        #   end
-        #   requirements.last.delete(:hbh_git)
-        # end
-
         is_submodule = get_info(info, :submodule, true)
         if is_submodule 
           if info.nil? then raise "请输入正确的参数" end
           return requirements unless info.is_a?(Hash) 
 
           moduleTag = get_info(info, :tag, nil)
-          moduleBranch = get_info(info, :branch, "develop")
+          moduleBranch = get_info(info, :branch, nil)
+          if moduleTag.nil? && moduleBranch.nil?
+            Pod::UI.puts "请配置依赖tag或者branch".red
+            exit()
+          end
+
           appspecs = get_info(info, :appspecs, nil)
           sub_config = HBHConfig.config.submodule_env
           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']
 

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,9 +1,15 @@
-require 'cocoapods-hbh/command/hbh'
-
 require 'cocoapods'
+require 'cocoapods-hbh/command/hbh'
+require 'cocoapods-hbh/git_hooks/githooks_sync'
 
-module CocoapodsHbhHooks
-    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

@@ -1,52 +1,45 @@
 require 'yaml'
-
+require 'cocoapods-hbh/gem_version'
+# require 'cocoapods/generate'
 
 module HBHConfig
     class Config
-
-        def config_file
-            config_file_with_configuration_env(configuration_env)
+      
+      def template_hash
+          {
+            'hbh_specs_env' => { 
+              'description' => '私有仓库环境配置', 
+              'specs_name'   => '私有仓库名称',
+              'specs_url'    => '私有仓库地址',
+            },
+            'submodule_env' => { 
+              'description' => '子仓库环境配置', 
+              'sub_path'    => '子模块存储路径' ,
+              'sub_url'    => '子模块厂库地址' ,
+            },
+            'is_git_hooks' => 'false',
+            'cocoapods_version' => '1.10.1',
+          }
         end
 
-        def template_hash
-            {
-                'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-            }
+        def sync_config(config)
+          File.open(config_file_with_configuration(), 'w+') do |f|
+            f.write(config.to_yaml)
+          end
         end
 
-        def configuration_env
-            #如果是dev 再去 podfile的配置文件中获取，确保是正确的， pod update时会用到
-            if @configuration_env == "dev" || @configuration_env == nil
-              if Pod::Config.instance.podfile
-                configuration_env ||= Pod::Config.instance.podfile.configuration_env
-              end
-              configuration_env ||= "dev"
-              @configuration_env = configuration_env
-            end
-            @configuration_env
-        end
 
         def config_file
-            "HBHConfig.yml"
+          config_file_with_configuration()
         end
-            
-        def set_configuration_env(env)
-            @configuration_env = env
+
+        def config_name
+          "HBHConfig.yml"
         end
 
-        def config_file_with_configuration_env(configuration_env)
-            file = config_file
-            if configuration_env == "release_iphoneos"
-              file = config_release_iphoneos_file
-              puts "\n======  #{configuration_env} 环境 ========"
-            elsif configuration_env == "debug_iphoneos"
-              file = config_debug_iphoneos_file
-              puts "\n======  #{configuration_env} 环境 ========"
-            elsif configuration_env == "dev"
-              puts "\n======  #{configuration_env} 环境 ========"
-            else
-              raise "\n=====  #{configuration_env} 参数有误，请检查%w[dev debug_iphoneos release_iphoneos]===="
-            end
+
+        def config_file_with_configuration()
+            file = config_name
             file_path = "#{Pod::Config.instance.installation_root}/#{file}"
             if file_path.blank?
               file_path = "#{Pod::Config.instance.home_dir}/#{file}"
@@ -56,12 +49,20 @@ module HBHConfig
         end
 
         def load_config
-            if File.exist?(config_file)
-              YAML.load_file(config_file)
+            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
+        
+        def default_config
+          @default_config ||= Hash[template_hash.map { |k, v| [k, v[:default]] }]
+        end
 
         def initialize
 
@@ -71,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_file} 中设置, 请执行 init 命令配置或手动修改配置文件".red
+              if method.to_s == "is_git_hooks" 
+
+              else
+                raise Pod::Informative, "#{method} 字段必须在配置文件 #{config_name} 中设置, 请执行 init 命令配置或手动修改配置文件".red
+              end
             else
               super
             end

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

@@ -0,0 +1,57 @@
+require 'yaml'
+require 'cocoapods-hbh/config/config'
+
+module HBHConfig
+  class Config
+    class Asker
+      def show_prompt
+        print ' > '.green
+      end
+
+      def ask_with_answer(question, pre_answer, selection)
+        print "\n#{question}\n"
+
+        print_selection_info = lambda {
+          print "可选值：[ #{selection.join(' / ')} ]\n" if selection
+        }
+        print_selection_info.call
+        print "旧值：#{pre_answer}\n" unless pre_answer.nil?
+
+        answer = ''
+        loop do
+          show_prompt
+          answer = STDIN.gets.chomp.strip
+
+          if answer == '' && !pre_answer.nil?
+            answer = pre_answer
+            print answer.yellow
+            print "\n"
+          end
+
+          next if answer.empty?
+          break if !selection || selection.include?(answer)
+
+          print_selection_info.call
+        end
+
+        answer
+      end
+
+      def wellcome_message
+        print <<~EOF
+
+          开始设置二进制化初始信息.
+          所有的信息都会保存在 #{HBHConfig.config.config_file} 文件中.
+ 
+          你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
+
+          #{HBHConfig.config.default_config.to_yaml}
+        EOF
+      end
+
+      def done_message
+        print "\n设置完成.\n".green
+      end
+    end
+  end
+end

data/lib/cocoapods-hbh/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHbh
-  VERSION = "0.0.1"
+  VERSION = "0.1.2"
 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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - zanju
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocoapods-generate
+  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
@@ -75,16 +89,22 @@ extra_rdoc_files: []
 files:
 - lib/cocoapods-hbh.rb
 - lib/cocoapods-hbh/command.rb
+- lib/cocoapods-hbh/command/common/hbh_init.rb
 - lib/cocoapods-hbh/command/common/install.rb
 - lib/cocoapods-hbh/command/common/podfile.rb
 - lib/cocoapods-hbh/command/common/push.rb
-- lib/cocoapods-hbh/command/custom/pod_push.rb
+- lib/cocoapods-hbh/command/custom/sync_githooks.rb
 - lib/cocoapods-hbh/command/hbh.rb
-- lib/cocoapods-hbh/command/sub_module/add_submodule.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

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

@@ -1 +0,0 @@
-pod repo push HBHSpecs HBHNetwork.podspec --sources='http://gitlab.jiehun.tech/App/iOS/Modularization/HBHSpecs.git,https://github.com/CocoaPods/Specs' --allow-warnings