cocoapods-mtxx-bin 0.0.13 → 1.0.0

data/lib/cocoapods-mtxx-bin/native/resolver.rb

@@ -6,7 +6,7 @@ require 'cocoapods-mtxx-bin/native/podfile'
 require 'cocoapods-mtxx-bin/native/sources_manager'
 require 'cocoapods-mtxx-bin/native/installation_options'
 require 'cocoapods-mtxx-bin/gem_version'
-require 'cocoapods-mtxx-bin/command/bin/archive'
+# require 'cocoapods-mtxx-bin/command/bin/archive'
 require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
 require 'cocoapods-mtxx-bin/config/config'
 
@@ -91,8 +91,7 @@ module Pod
 
     # 读取黑名单
     def read_black_list
-      binary_dir = CBin.config.binary_dir
-      config_file = File.join(binary_dir, 'BinConfig.yaml')
+      config_file = File.join(Pod::Config.instance.project_root, 'BinConfig.yaml')
       return nil unless File.exist?(config_file)
       config = YAML.load(File.open(config_file))
       return nil if config.nil?
@@ -232,35 +231,35 @@ module Pod
           end.compact
         end
 
-        if missing_binary_specs.any?
-          missing_binary_specs.uniq.each do |spec|
-            # UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
-          end
-          # 下面的代码为了实现 auto 命令的 --all-make
-          Pod::Command::Bin::Archive.missing_binary_specs(missing_binary_specs)
-          #缓存没有二进制组件到spec文件，local_psec_dir 目录
-          sources_sepc = []
-          des_dir = CBin::Config::Builder.instance.local_psec_dir
-          FileUtils.rm_f(des_dir) if File.exist?des_dir
-          Dir.mkdir des_dir unless File.exist?des_dir
-          missing_binary_specs.uniq.each do |spec|
-            # 排除subspec
-            next if spec.name.include?('/')
-
-            spec_git_res = false
-            CBin::Config::Builder.instance.ignore_git_list.each do |ignore_git|
-              spec_git_res = spec.source[:git] && spec.source[:git].include?(ignore_git)
-              break if spec_git_res
-            end
-            next if spec_git_res
-
-            #获取没有制作二进制版本的spec集合
-            sources_sepc << spec
-            unless spec.defined_in_file.nil?
-              FileUtils.cp("#{spec.defined_in_file}", "#{des_dir}")
-            end
-          end
-        end
+        # if missing_binary_specs.any?
+        #   missing_binary_specs.uniq.each do |spec|
+        #     # UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
+        #   end
+        #   # 下面的代码为了实现 auto 命令的 --all-make
+        #   Pod::Command::Bin::Archive.missing_binary_specs(missing_binary_specs)
+        #   #缓存没有二进制组件到spec文件，local_psec_dir 目录
+        #   sources_sepc = []
+        #   des_dir = CBin::Config::Builder.instance.local_psec_dir
+        #   FileUtils.rm_f(des_dir) if File.exist?des_dir
+        #   Dir.mkdir des_dir unless File.exist?des_dir
+        #   missing_binary_specs.uniq.each do |spec|
+        #     # 排除subspec
+        #     next if spec.name.include?('/')
+        #
+        #     spec_git_res = false
+        #     CBin::Config::Builder.instance.ignore_git_list.each do |ignore_git|
+        #       spec_git_res = spec.source[:git] && spec.source[:git].include?(ignore_git)
+        #       break if spec_git_res
+        #     end
+        #     next if spec_git_res
+        #
+        #     #获取没有制作二进制版本的spec集合
+        #     sources_sepc << spec
+        #     unless spec.defined_in_file.nil?
+        #       FileUtils.cp("#{spec.defined_in_file}", "#{des_dir}")
+        #     end
+        #   end
+        # end
 
         specs_by_target
       end

data/lib/cocoapods-mtxx-bin/native/sources_manager.rb

@@ -8,7 +8,8 @@ module Pod
     class Manager
       # 源码 source list
       def code_source_list
-        CBin.config.code_repo_url_list.split(";").map { |source| source_with_name_or_url(source)}
+        []
+        # CBin.config.code_repo_url_list.split(";").map { |source| source_with_name_or_url(source)}
       end
       # 二进制 source
       def binary_source

data/lib/cocoapods-mtxx-bin/source_provider_hook.rb

@@ -6,6 +6,9 @@ require 'yaml'
 
 Pod::HooksManager.register('cocoapods-mtxx-bin', :pre_install) do |_context, _|
   require 'cocoapods-mtxx-bin/native'
+  require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+
+  Pod::UI.puts "当前configuration: `#{CBin::BuildAll::BinHelper.configuration}`".green
 
   # pod bin repo update 更新二进制私有源
   Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new($ARGV)).run
@@ -45,8 +48,7 @@ Pod::HooksManager.register('cocoapods-mtxx-bin', :source_provider) do |context,
   podfile = Pod::Config.instance.podfile
   if podfile
     # 读取配置文件
-    project_root = CBin.config.binary_dir
-    config_file = File.join(project_root, 'BinConfig.yaml')
+    config_file = File.join(Pod::Config.instance.project_root, 'BinConfig.yaml')
     if File.exist?(config_file)
       config = YAML.load(File.open(config_file))
       unless config.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 1.0.0
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -103,11 +103,13 @@ files:
 - lib/cocoapods-mtxx-bin/command/bin/auto.rb
 - lib/cocoapods-mtxx-bin/command/bin/buildAll.rb
 - lib/cocoapods-mtxx-bin/command/bin/code.rb
-- lib/cocoapods-mtxx-bin/command/bin/imy.rb
 - lib/cocoapods-mtxx-bin/command/bin/init.rb
-- lib/cocoapods-mtxx-bin/command/bin/initHotKey.rb
 - lib/cocoapods-mtxx-bin/command/bin/install.rb
 - lib/cocoapods-mtxx-bin/command/bin/lib/lint.rb
+- lib/cocoapods-mtxx-bin/command/bin/lock.rb
+- lib/cocoapods-mtxx-bin/command/bin/lock/dependency.rb
+- lib/cocoapods-mtxx-bin/command/bin/lock/spec_repo.rb
+- lib/cocoapods-mtxx-bin/command/bin/lock/version.rb
 - lib/cocoapods-mtxx-bin/command/bin/outputSource.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo/push.rb
@@ -120,8 +122,6 @@ files:
 - lib/cocoapods-mtxx-bin/config/config.rb
 - lib/cocoapods-mtxx-bin/config/config_asker.rb
 - lib/cocoapods-mtxx-bin/config/config_builder.rb
-- lib/cocoapods-mtxx-bin/config/config_hot_key.rb
-- lib/cocoapods-mtxx-bin/config/config_hot_key_asker.rb
 - lib/cocoapods-mtxx-bin/gem_version.rb
 - lib/cocoapods-mtxx-bin/helpers.rb
 - lib/cocoapods-mtxx-bin/helpers/Info.plist

data/lib/cocoapods-mtxx-bin/command/bin/imy.rb

@@ -1,45 +0,0 @@
-require 'cocoapods-mtxx-bin/config/config_hot_key_asker'
-
-module Pod
-  class Command
-    class Bin < Command
-      class Imy < Bin
-        self.summary = '设置快捷键'
-        self.description = <<-DESC
-          设置快捷键
-        DESC
-
-        self.arguments = [
-            CLAide::Argument.new('1', false)
-        ]
-
-        def self.options
-          [
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @hot_key = argv.shift_argument || '1'
-          super
-        end
-
-        def run
-          CBin.config_hot_key.set_hot_key_index(@hot_key)
-          UI.puts  "cd #{CBin.config_hot_key.hot_key_dir}".yellow
-
-          if Dir.exist?(CBin.config_hot_key.hot_key_dir)
-            Dir.chdir(CBin.config_hot_key.hot_key_dir) do
-              UI.puts " #{CBin.config_hot_key.hot_key_cmd}".yellow
-              system CBin.config_hot_key.hot_key_cmd
-            end
-          else
-            raise "配置项中文件目录不存在 #{CBin.config_hot_key.hot_key_dir}"
-          end
-
-
-        end
-
-      end
-    end
-  end
-end

data/lib/cocoapods-mtxx-bin/command/bin/initHotKey.rb

@@ -1,70 +0,0 @@
-
-require 'cocoapods-mtxx-bin/config/config_hot_key_asker'
-
-module Pod
-  class Command
-    class Bin < Command
-      class Inithk < Bin
-        self.summary = '初始化快捷键配置'
-        self.description = <<-DESC
-          创建  文件，在其中保存插件需要的配置信息，
-          如二进制私有源地址、源码私有源地址等。
-        DESC
-
-        def self.options
-          [
-            ['--bin-url=URL', '配置文件地址，直接从此地址下载配置文件']
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @bin_url = argv.option('bin-url')
-          super
-        end
-
-        def run
-          if @bin_url.nil?
-            config_with_asker
-          else
-            config_with_url(@bin_url)
-          end
-        end
-
-        private
-
-        def config_with_url(url)
-          require 'open-uri'
-
-          UI.puts "开始下载配置文件...\n"
-          file = open(url)
-          contents = YAML.safe_load(file.read)
-
-          UI.puts "开始同步配置文件...\n"
-          CBin.config_hot_key.sync_config(contents.to_hash)
-          UI.puts "设置完成.\n".green
-        rescue Errno::ENOENT => e
-          raise Informative, "配置文件路径 #{url} 无效，请确认后重试."
-        end
-
-        def config_with_asker
-          asker = CBin::Config_Hot_Key::Asker.new
-          asker.wellcome_message
-
-          config = {}
-          template_hash = CBin.config_hot_key.template_hash
-          template_hash.each do |k, v|
-            default = begin
-                        CBin.config_hot_key.send(k)
-                      rescue StandardError
-                        nil
-                      end
-            config[k] = asker.ask_with_answer(v[:description], default, v[:selection])
-          end
-
-          CBin.config_hot_key.sync_config(config)
-          asker.done_message
-        end
-      end
-    end
-  end
-end

data/lib/cocoapods-mtxx-bin/config/config_hot_key.rb

@@ -1,103 +0,0 @@
-require 'yaml'
-require 'cocoapods-mtxx-bin/native/podfile'
-require 'cocoapods-mtxx-bin/native/podfile_env'
-require 'cocoapods/generate'
-
-module CBin
-  class Config_Hot_Key
-
-    def config_file
-      config_file_with_hot_key_index(hot_key_index)
-    end
-
-    def template_hash
-      {
-          'hot_key_index' => { description: '快捷键', default: '1', selection: %w[1 2 3...] },
-          'hot_key_dir'   => { description: '快捷键执行目录', default: '' },
-          'hot_key_cmd'   => { description: '快捷键执行命令', default: 'pod bin update --no-repo-update' }
-      }
-    end
-
-    def config_file_with_hot_key_index(hot_key_index)
-      file = config_file_whith_hot_key_index(hot_key_index)
-      raise "\n=====  #{hot_key_index} 参数有误，请检查%w[1 2 3...]===" unless (hot_key_index.to_i).is_a?(Integer)
-      File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
-    end
-
-    def hot_key_index
-      @hot_key_index = 1 if @hot_key_index.is_a?(NilClass)
-      @hot_key_index
-    end
-
-    def set_hot_key_index(hot_key_index)
-      @hot_key_index = hot_key_index
-    end
-
-    def config_file_whith_hot_key_index(hot_key_index)
-      "hot_key_#{hot_key_index}.yml"
-    end
-
-    def sync_config(config)
-      File.open(config_file_with_hot_key_index(config['hot_key_index']), 'w+') do |f|
-        f.write(config.to_yaml)
-      end
-    end
-
-    def default_config
-      @default_config ||= Hash[template_hash.map { |k, v| [k, v[:default]] }]
-    end
-
-    private
-
-    def load_config
-      file = config_file
-      if (!file.nil?) && File.exist?(config_file)
-        YAML.load_file(config_file)
-      else
-        default_config
-      end
-    end
-
-    def config
-      @config ||= begin
-                    puts "====== cocoapods-mtxx-bin #{CBin::VERSION} 版本 ======== \n"
-                    @config = OpenStruct.new load_config
-                    validate!
-                    @config
-                  end
-    end
-
-    def validate!
-      template_hash.each do |k, v|
-        selection = v[:selection]
-        next if !selection || selection.empty?
-
-        config_value = @config.send(k)
-        next unless config_value
-        unless selection.include?(config_value)
-          raise Pod::Informative, "#{k} 字段的值必须限定在可选值 [ #{selection.join(' / ')} ] 内".red
-        end
-      end
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      config.respond_to?(method) || super
-    end
-
-    def method_missing(method, *args, &block)
-      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
-      else
-        super
-      end
-    end
-  end
-
-  def self.config_hot_key
-    @config_hot_key ||= Config_Hot_Key.new
-  end
-
-end
-

data/lib/cocoapods-mtxx-bin/config/config_hot_key_asker.rb

@@ -1,57 +0,0 @@
-require 'yaml'
-require 'cocoapods-mtxx-bin/config/config_hot_key'
-
-module CBin
-  class Config_Hot_Key
-    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
-
-          开始设置快捷键 pod bin imy.
-          所有的信息都会保存在 #{CBin.config_hot_key.config_file} 文件中.
-          %w[hot_key.yaml] 
-          你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
-
-          #{CBin.config_hot_key.default_config.to_yaml}
-        EOF
-      end
-
-      def done_message
-        print "\n设置完成.\n".green
-      end
-    end
-  end
-end