cocoapods-hbh 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416d296eacf21ea795f369ce67716788f512101da11b1975f95fcb31d0201d92
-  data.tar.gz: 5dde5bfb57c073b6db07c2b7094a97f7830ba466e3c82d1c4e0a9cc998917d2e
+  metadata.gz: 31f2592765405050041e12717abc2b09cfd47f330e051f4de48b50ebe20dc502
+  data.tar.gz: 9cdb8ece30e50c8997e758a46acd773bc7bd6685ba4fbd5faa83bc54e63ecb28
 SHA512:
-  metadata.gz: b8054f00ec0d7b35bfd1dd00263f89e9ae79987c3a33a3d3130653bc8cf9ef53e8357f63a8a73dd98de6af4c4e97f0753b2790bf29f4cd3404a2d64328add7be
-  data.tar.gz: 327c35772d4bdb96a701f9aa2fe2328ab0b2bf106abc28da4e48a84d038d794ad6d88e9624ca7646edf81539add3cc111a79b0948e13990b1e175c936f6135b6
+  metadata.gz: 5047868bf505be88016941cd3b4966fa7c1e4be02af0e7db568a66ec02a7d873b4322c1988eb2d0a085b2c1da52ba329a1b143fc77a82c11f024c0625482f504
+  data.tar.gz: 30d0a3e632d08d03bf9ea88bcb8259ee2d52e20cf4e74873d741d98a26be6dceafe0d4ad41c093aa3f64f1f71c7c44fc9571caf847aa93685c9555c1874b94ce

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/custom/sync_githooks.rb

@@ -4,30 +4,7 @@ require 'fileutils'
 module CocoapodsGitHooks
   class GitHooksManager
     class << self
-      # @return [Array<String>]
-      def hook_types
-        %w(applypatch-msg commit-msg fsmonitor-watchman post-update pre-applypatch pre-commit pre-merge-commit pre-push pre-rebase prepare-commit-msg push-to-checkout)
-      end
-
-      # @return [TargetDefinition]
-      def abstract_target_of_githooks
-        abstract_target = nil
-        podfile = Pod::Config.instance.podfile
-        podfile.target_definition_list.each do |target|
-          if target.name == 'Githooks'
-            abstract_target = target
-            break
-          end
-        end unless podfile.target_definition_list.nil?
-
-        if abstract_target.nil?
-          Pod::UI.puts 'The abstract_target of SyncGithooks is not defined.'
-          return nil
-        end
-
-        abstract_target
-      end
-
+  
       # @param [TargetDefinition]
       # @return [Array<Dependency>]
       def dependencies_in_target(abstract_target)
@@ -39,85 +16,23 @@ module CocoapodsGitHooks
           Pod::UI.puts 'Can not find .git directory.'
           return false
         end
-
         true
       end
 
-      # @param [Array<Dependency>] dependencies
-      def sync_githooks_in_dependencies(dependencies)
-        pods_directory = "#{Dir.pwd}/Pods"
-        hook_dependencies = Hash.new([])
-        dependencies.each do |dependency|
-          dependency_directory = if dependency.local?
-                                   File.expand_path(dependency.external_source[:path])
-                                 else
-                                   "#{pods_directory}/#{dependency.name}"
-                                 end
-          hook_types.each { |hook_type|
-            file_path = "#{dependency_directory}/githooks/#{hook_type}"
-            if File.exist?(file_path)
-              hook_dependencies[hook_type] += [dependency]
-            end
-          }
-        end
-        git_hook_directory = '.git/hooks'
-        hook_dependencies.each_pair { |key, dependencies|
-          file_path = "#{git_hook_directory}/#{key}"
-
-          File.delete(file_path) if File.exist?(file_path)
-
-          File.new(file_path, 'w')
-          File.open(file_path, File::RDWR) do |file|
-            file.write("#!/bin/sh\n")
-            file.write("#!/usr/bin/env ruby\n")
-            file.write("#!/usr/bin/env python\n")
-
-            dependencies.each do |dependency|
-              dependency_directory = if dependency.local?
-                                       File.expand_path(dependency.external_source[:path])
-                                     else
-                                       "#{pods_directory}/#{dependency.name}"
-                                     end
-
-              hook_file_path = "#{dependency_directory}/githooks/#{key}"
-
-              file.write("# #{dependency.name} githook\n")
-              file.write("if [ -f \"#{hook_file_path}\" ]; then\n")
-              file.write("  function #{dependency.name}(){\n")
-              file.write("    local script_directory=#{dependency_directory}/scripts\n")
-              File.readlines(hook_file_path).each { |line|
-                file.write("    #{line}")
-              }
-              file.write("\n  }\n")
-              file.write("  #{dependency.name}\n")
-              file.write("fi\n")
-            end
-
-            FileUtils.chmod('+x', file_path)
-          end
-        }
-      end
-
       def sync
-        Pod::UI.message 'Start syncing Git Hook' do
           return unless validate_git_directory?
-
-          FileUtils.mkdir '.git/hooks' unless File.directory?('.git/hooks')
-
-          abstract_target = abstract_target_of_githooks
-          return if abstract_target.nil?
-          dependencies = dependencies_in_target(abstract_target)
-          if dependencies.nil? || dependencies.empty?
-            Pod::UI.warn 'The dependencies of SyncGithooks is nil or empty.'
-            return
+          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
-          dependencies.each { |dependency|
-            Pod::UI.message "- #{dependency.name}"
-          }
-          sync_githooks_in_dependencies(dependencies)
         end
-        Pod::UI.message 'Githooks are synced'
-      end
+
+      
     end
   end
 end

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

@@ -1,6 +1,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'
 
 module Pod
   class Command
@@ -28,16 +29,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.rb

@@ -1,9 +1,7 @@
+require 'cocoapods'
 require 'cocoapods-hbh/command/hbh'
 
-require 'cocoapods'
 
-module CocoapodsHbhHooks
-    Pod::HooksManager.register('cocoapods-hbhhooks', :pre_install) do |_context, _| 
+Pod::HooksManager.register('cocoapods-hbhhooks', :pre_install) do |_context, _| 
         
-    end
 end

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

@@ -1,52 +1,61 @@
 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 write_config ()
+          { 
+            "hbh_specs_env" =>
+          {
+            "specs_name" => "私有仓库名称", 
+            "specs_url" => "私有仓库地址"
+          },
+          "submodule_env" =>
+          {
+            "sub_path" => "子模块存储路径",
+            "sub_url" => "子模块远程厂库地址"
+          }
+        }
         end
 
         def template_hash
-            {
-                'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-            }
+          {
+            'hbh_specs_env' => { description: '私有仓库环境', 
+              default: {
+              'specs_name'    => { description: '私有仓库名称' },
+              'specs_url'    => { description: '私有仓库地址' },
+              }
+            },
+            
+            'submodule_env' => { description: '子仓库环境', 
+              default: {
+                'sub_path'    => { description: '子模块存储路径' },
+                'sub_url'    => { description: '子模块厂库地址' },
+              }
+            },
+          }
         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
+        def sync_config(config)
+          File.open(config_file_with_configuration(), 'w+') do |f|
+            f.write(config.to_yaml)
+          end
         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 +65,16 @@ 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
             end
         end
+        
+        def default_config
+          @default_config ||= Hash[template_hash.map { |k, v| [k, v[:default]] }]
+        end
 
         def initialize
 
@@ -71,7 +84,7 @@ 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
+              raise Pod::Informative, "#{method} 字段必须在配置文件 #{config_name} 中设置, 请执行 init 命令配置或手动修改配置文件".red
             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.2"
+  VERSION = "0.0.3"
 end

data/lib/cocoapods_plugin.rb

@@ -1,2 +1 @@
 require 'cocoapods-hbh/command'
-require 'cocoapods-hbh/source_provider_hook'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hbh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - zanju
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-14 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,17 +89,17 @@ 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/module/add_module.rb
 - lib/cocoapods-hbh/config/config.rb
+- lib/cocoapods-hbh/config/config_asker.rb
 - lib/cocoapods-hbh/gem_version.rb
 - lib/cocoapods-hbh/helpers/git_depend.rb
-- lib/cocoapods-hbh/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/EXAMPLE/cocoapods-hbh
 licenses:

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

data/lib/cocoapods-hbh/source_provider_hook.rb

@@ -1,11 +0,0 @@
-
-require 'cocoapods-hbh/command/custom/sync_githooks'
-
-module CocoapodsGitHooks
-  Pod::HooksManager.register('cocoapods-hbh', :post_install) do |context|
-    CocoapodsGitHooks::GitHooksManager.sync
-  end
-  Pod::HooksManager.register('cocoapods-hbh', :post_update) do |context|
-    CocoapodsGitHooks::GitHooksManager.sync
-  end
-end