cocoapods-pahealth-bin 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a1fea35fcbe57752bef46c23661a3068639783bbb6fa0ecd567c6eb84eb694
-  data.tar.gz: 2c9472f051b88873423a2ca004d5a350c997b0e4aa469a1a1669361a322d7730
+  metadata.gz: 548ec031b506a3415e358a531b7164c58ffa5f98bd60a6bdd39b2a7bb1fbc5da
+  data.tar.gz: 26a9775ac5184aaee5543bb7e732f1c9781039ca42b7e942ba9f0e2a45b6ef78
 SHA512:
-  metadata.gz: f5d8836a8bc3f9e38a0fbc906d65f259932c16a8d39e93d02c01e30bb73b34bf466917affa0c92cc38b12a2d206222cc7d687c2a03043ee71ccc9076609e661e
-  data.tar.gz: 20e867d0745fdcf6a0a096c4d3f87a2fd9181a0a86841af28e7e5676db493b4ad9936ea0d9e993b7f3f582769ec065237d53fc50e923bef498f351b6b9153690
+  metadata.gz: 782b67edcf136c3f51523eb15a30ece5f293b17ca5f3c013384d93911a376787111231456c5f10165104b1d27ceffeb9310ac607605892d7640656f8d4c62ec6
+  data.tar.gz: 5f106a5efb491af72858e877b084f5a6fb225d4c3f2cc5b3cc6b1edba1cf35ded83421f2ca0ab299e17dc9d2c23e1eb5c65ff8cebc80abd200527e5d23fe6c9e

data/lib/cocoapods-pahealth-bin/command/bin.rb

@@ -1,6 +1,7 @@
 require 'cocoapods-pahealth-bin/command/bin/init'
 require 'cocoapods-pahealth-bin/command/bin/spec'
 require 'cocoapods-pahealth-bin/command/bin/update'
+require 'cocoapods-pahealth-bin/command/bin/repo/push'
 require 'cocoapods-pahealth-bin/helpers'
 
 module Pod

data/lib/cocoapods-pahealth-bin/command/bin/init.rb

@@ -6,8 +6,8 @@ module Pod
       class Init < Bin
         self.summary = '初始化插件.'
         self.description = <<-DESC
-          创建 #{CBin.config.config_file} 文件，在其中保存插件需要的配置信息，
-          如二进制私有源地址、源码私有源地址等。
+          创建.yml文件，在其中保存组件需要的配置信息，
+          如私有源地址、依赖环境等。
         DESC
 
         def self.options

data/lib/cocoapods-pahealth-bin/command/bin/repo/push.rb

@@ -0,0 +1,79 @@
+require 'cocoapods-pahealth-bin/config/config'
+require 'cocoapods-pahealth-bin/native/podfile'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Repo < Bin
+        class Push < Repo
+          self.summary = '发布组件.'
+          self.description = <<-DESC
+            发布组件
+          DESC
+
+          self.arguments = [
+              CLAide::Argument.new('NAME.podspec', false)
+          ]
+
+          def self.options
+            [
+                ['--trunk-dependencies', 'push 到官方源'],
+            ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
+          end
+
+          def initialize(argv)
+            @podspec = argv.shift_argument
+            @trunk_dependencies = argv.flag?('trunk-dependencies')
+            @sources = argv.option('sources') || []
+            super
+
+            @additional_args = argv.remainder!
+          end
+
+          def run
+            Podfile.execute_with_bin_plugin do
+              Podfile.execute_with_allow_prerelease(@allow_prerelease) do
+                Podfile.execute_with_use_binaries(!@code_dependencies) do
+                  argvs = [
+                      repo,
+                      "--sources=#{sources_option(!@trunk_dependencies, @sources)}",
+                      *@additional_args
+                  ]
+
+                  argvs << spec_file if spec_file
+
+                  push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+                  push.validate!
+                  push.run
+                end
+              end
+            end
+          ensure
+            clear_binary_spec_file_if_needed unless @reserve_created_spec
+          end
+
+          private
+
+          def spec_file
+            @spec_file ||= begin
+                             if @podspec
+                               find_spec_file(@podspec)
+                             else
+                               if code_spec_files.empty?
+                                 raise Informative, '当前目录下没有找到可用源码 podspec.'
+                               end
+
+                               spec_file = code_spec_files.first
+                               spec_file
+                             end
+                           end
+          end
+
+          def repo
+            code_source.name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-pahealth-bin/command/bin/repo/update.rb

@@ -13,19 +13,18 @@ module Pod
 
           def self.options
             [
-                ['--trunk-repo-update', '更新官方源']
             ].concat(super)
           end
 
           def initialize(argv)
-            @trunk = argv.flag?('trunk-repo-update',false )
             super
           end
 
           def run
             show_output = !config.silent?
-            Parallel.each(valid_sources(!@trunk), in_threads: 4) do |source|
+            Parallel.each(valid_sources, in_threads: 4) do |source|
               source.update(show_output)
+              # update_git_repo
             end
           end
         end

data/lib/cocoapods-pahealth-bin/command/bin/spec/lint.rb

@@ -17,23 +17,14 @@ module Pod
 
           def self.options
             [
-                ['--binary', 'lint 组件的二进制版本'],
-                ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
-                ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
-                ['--code-dependencies', '使用源码依赖进行 lint'],
-                ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
-                ['--allow-prerelease', '允许使用 prerelease 的版本 lint']
+                ['--release', '在 release 环境下进行 lint']
             ].concat(Pod::Command::Spec::Lint.options).concat(super).uniq
           end
 
           def initialize(argv)
             @podspec = argv.shift_argument
-            @loose_options = argv.flag?('loose-options')
-            @code_dependencies = argv.flag?('code-dependencies')
-            @sources = argv.option('sources') || []
-            @binary = argv.flag?('binary')
-            @reserve_created_spec = argv.flag?('reserve-created-spec')
-            @template_podspec = argv.option('template-podspec')
+            @release = argv.flag?('release',false )
+            @sources = argv.option('sources')
             @allow_prerelease = argv.flag?('allow-prerelease')
             super
 
@@ -43,43 +34,20 @@ module Pod
           def run
             Podfile.execute_with_bin_plugin do
               Podfile.execute_with_allow_prerelease(@allow_prerelease) do
-                Podfile.execute_with_use_binaries(!@code_dependencies) do
-                  argvs = [
-                      "--sources=#{sources_option(@code_dependencies, @sources)}",
-                      *@additional_args
-                  ]
-
-                  argvs << spec_file if spec_file
-
-                  if @loose_options
-                    argvs += ['--allow-warnings']
-                    if code_spec&.all_dependencies&.any?
-                      argvs << '--use-libraries'
-                    end
-                  end
-
-                  lint = Pod::Command::Spec::Lint.new(CLAide::ARGV.new(argvs))
-                  lint.validate!
-                  lint.run
-                end
+                argvs = [
+                    "--sources=#{sources_option(@release, @sources)+','+Pod::TrunkSource::TRUNK_REPO_URL}",
+                    *@additional_args
+                ]
+                argvs << spec_file if spec_file
+                lint = Pod::Command::Spec::Lint.new(CLAide::ARGV.new(argvs))
+                lint.validate!
+                lint.run
               end
             end
-          ensure
-            clear_binary_spec_file_if_needed unless @reserve_created_spec
           end
 
           private
 
-          def template_spec_file
-            @template_spec_file ||= begin
-                                      if @template_podspec
-                                        find_spec_file(@template_podspec)
-                                      else
-                                        binary_template_spec_file
-                                      end
-                                    end
-          end
-
           def spec_file
             @spec_file ||= begin
                              if @podspec
@@ -89,15 +57,7 @@ module Pod
                                  raise Informative, '当前目录下没有找到可用源码 podspec.'
                                end
 
-                               spec_file = if @binary
-                                             code_spec = Pod::Specification.from_file(code_spec_files.first)
-                                             if template_spec_file
-                                               template_spec = Pod::Specification.from_file(template_spec_file)
-                                             end
-                                             create_binary_spec_file(code_spec, template_spec)
-                                           else
-                                             code_spec_files.first
-                                           end
+                               spec_file = code_spec_files.first
                                spec_file
                              end
                            end

data/lib/cocoapods-pahealth-bin/command/bin/update.rb

@@ -1,4 +1,5 @@
 require 'cocoapods-pahealth-bin/command/bin/repo/update'
+require 'cocoapods-pahealth-bin/native/podfile'
 require 'cocoapods'
 
 module Pod
@@ -10,6 +11,11 @@ module Pod
             CLAide::Argument.new('NAME.podspec', false)
         ]
 
+        def self.options
+          [
+          ].concat(Pod::Command::Spec::Lint.options).concat(super).uniq
+        end
+
         def initialize(argv)
           super
         end
@@ -30,8 +36,7 @@ module Pod
 
         def pod_update_no_repo_update
           argvs = [
-              "--no-repo-update",
-              "--sources=#{sources_option(true, @sources)}"
+              "--no-repo-update"
           ]
           update = Pod::Command::Update.new(CLAide::ARGV.new(argvs))
           update.validate!

data/lib/cocoapods-pahealth-bin/config/config.rb

@@ -1,23 +1,61 @@
 require 'yaml'
+require 'cocoapods-pahealth-bin/native/podfile'
+require 'cocoapods-pahealth-bin/native/podfile_env'
+require 'cocoapods/generate'
 
 module CBin
   class Config
     def config_file
-      File.expand_path("#{Pod::Config.instance.home_dir}/bin.yml")
+      config_file_with_configuration_dependence(configuration_dependence)
     end
 
     def template_hash
       {
-          'code_repo_url' => { description: '私有源 Git 地址', default: 'http://domain/git/pahealth_private_repo.git' },
-          #'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@git.2dfire.net:ios/cocoapods-spec-binary.git' },
-          #'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://iosframeworkserver-shopkeeperclient.app.2dfire.com/download/%s/%s.zip' },
-          # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
-          #'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
+          'configuration_dependence' => { description: '依赖环境', default: 'uat', selection: %w[uat test] },
+          'code_repo_url' => { description: '私有源 Git 地址', default: 'uat环境:https://github.com/GitWangKai/ReleasePrivateRepo.git test环境:https://github.com/GitWangKai/TestPrivateRepo.git' },
       }
     end
 
+    def config_file_with_configuration_dependence(configuration_dependence)
+      file = config_uat_dependence_file
+      if configuration_dependence == "test"
+        file = config_test_dependence_file
+        puts "\n======  #{configuration_dependence} 环境 ========"
+      elsif configuration_dependence == "uat"
+        puts "\n======  #{configuration_dependence} 环境 ========"
+      else
+        raise "\n=====  #{configuration_dependence} 参数有误，请检查%w[uat test]===="
+      end
+
+      File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+    end
+
+    def configuration_dependence
+      #如果是dev 再去 podfile的配置文件中获取，确保是正确的， pod update时会用到
+      if @configuration_dependence == "uat" || @configuration_dependence == nil
+        if Pod::Config.instance.podfile
+          configuration_dependence ||= Pod::Config.instance.podfile.configuration_dependence
+        end
+        configuration_dependence ||= "uat"
+        @configuration_dependence = configuration_dependence
+      end
+      @configuration_dependence
+    end
+
+    def set_configuration_dependence(dependence)
+      @configuration_dependence = dependence
+    end
+
+    def config_test_dependence_file
+      "pahealth_test.yml"
+    end
+
+    def config_uat_dependence_file
+      "pahealth_uat.yml"
+    end
+
     def sync_config(config)
-      File.open(config_file, 'w+') do |f|
+      File.open(config_file_with_configuration_dependence(config['configuration_dependence']), 'w+') do |f|
         f.write(config.to_yaml)
       end
     end
@@ -38,6 +76,7 @@ module CBin
 
     def config
       @config ||= begin
+                    puts "====== cocoapods-pahealth-bin #{CocoapodsPahealthBin::VERSION} 版本 ======== \n"
                     @config = OpenStruct.new load_config
                     validate!
                     @config
@@ -75,5 +114,6 @@ module CBin
   def self.config
     @config ||= Config.new
   end
-end
 
+
+end

data/lib/cocoapods-pahealth-bin/config/config_asker.rb

@@ -40,8 +40,9 @@ module CBin
       def wellcome_message
         print <<~EOF
 
-          开始设置二进制化初始信息.
+          开始设置组件私有化初始信息.
           所有的信息都会保存在 #{CBin.config.config_file} 文件中.
+          %w[pahealth_test.yml pahealth_uat.yml] 
           你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
 
           #{CBin.config.default_config.to_yaml}
@@ -52,10 +53,5 @@ module CBin
         print "\n设置完成.\n".green
       end
     end
-
-    def binary_repo_url
-      # code here
-    end
   end
 end
-

data/lib/cocoapods-pahealth-bin/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPahealthBin
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/cocoapods-pahealth-bin/helpers/sources_helper.rb

@@ -6,32 +6,17 @@ module CBin
       Pod::Config.instance.sources_manager
     end
 
-    def binary_source
-      sources_manager.binary_source
-    end
-
     def code_source
       sources_manager.code_source
     end
 
-    def trunk_source
-      sources_manager.trunk_source
-    end
-
-    # 优先采用对应依赖的 source
-    # cocoapods 内部会先匹配前面符合的 specification
-    # 只允许二进制的 specification subspec 比源码的 specification subspec 多
-    #
-    def valid_sources(code_dependencies = false)
+    def valid_sources
       sources = [code_source]
-      unless code_dependencies
-        sources << trunk_source
-      end
       sources
     end
 
-    def sources_option(code_dependencies, additional_sources)
-      (valid_sources(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
+    def sources_option(additional_sources)
+      (valid_sources.map(&:url) + Array(additional_sources)).join(',')
     end
   end
 end

data/lib/cocoapods-pahealth-bin/native/podfile.rb

@@ -25,6 +25,11 @@ module Pod
         hash_pods_use_source += Array(pods)
         set_internal_hash_value(USE_SOURCE_PODS, hash_pods_use_source)
       end
+
+      def set_configuration_dependence(dependence = "uat")
+        set_internal_hash_value(CONFIGURATION_DEPENDENCE, dependence)
+      end
+
     end
 
     alias old_plugins plugins
@@ -55,11 +60,15 @@ module Pod
       get_internal_hash_value(USE_SOURCE_PODS, []) + String(ENV[USE_SOURCE_PODS]).split('|').uniq
     end
 
+    def configuration_dependence
+      get_internal_hash_value(CONFIGURATION_DEPENDENCE, "uat") ||  ENV[CONFIGURATION_DEPENDENCE] == "uat"
+    end
+
     private
 
     def valid_bin_plugin
-      unless plugins.keys.include?('cocoapods-bin')
-        raise Pod::Informative, 'You should add `plugin \'cocoapods-bin\'` before using its DSL'
+      unless plugins.keys.include?('cocoapods-pahealth-bin')
+        raise Pod::Informative, 'You should add `plugin \'cocoapods-pahealth-bin\'` before using its DSL'
       end
     end
 

data/lib/cocoapods-pahealth-bin/native/podfile_env.rb

@@ -5,8 +5,10 @@ module Pod
     USE_BINARIES_SELECTOR = 'use_binaries_selector'
     ALLOW_PRERELEASE = 'allow_prerelease'
     USE_PLUGINS = 'use_plugins'
+    CONFIGURATION_DEPENDENCE = 'configuration_dependence'
 
     module ENVExecutor
+
       def execute_with_bin_plugin(&block)
         execute_with_key(USE_PLUGINS, -> { 'cocoapods-pahealth-bin' }, &block)
       end

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

@@ -4,19 +4,16 @@ require 'cocoapods-pahealth-bin/config/config'
 module Pod
   class Source
     class Manager
-      # 源码 source
+      # 私有源
       def code_source
         source_with_name_or_url(CBin.config.code_repo_url)
       end
 
-      # 二进制 source
-      def binary_source
-        source_with_name_or_url(CBin.config.binary_repo_url)
-      end
-
+      # 公有源 source
       def trunk_source
         source_with_name_or_url('https://github.com/CocoaPods/Specs.git')
       end
+
     end
   end
 end

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

@@ -0,0 +1,17 @@
+require 'cocoapods-pahealth-bin/native/sources_manager'
+require 'cocoapods-pahealth-bin/native/podfile'
+require 'cocoapods'
+
+Pod::HooksManager.register('cocoapods-pahealth-bin', :source_provider) do |context, _|
+  sources_manager = Pod::Config.instance.sources_manager
+  podfile = Pod::Config.instance.podfile
+
+  if podfile
+    # 添加源
+    added_sources = [sources_manager.trunk_source]
+    added_sources << sources_manager.code_source
+    added_sources.reverse!
+
+    added_sources.each { |source| context.add_source(source) }
+  end
+end

data/lib/cocoapods_plugin.rb

@@ -1 +1,3 @@
 require 'cocoapods-pahealth-bin/command'
+require 'cocoapods-pahealth-bin/source_provider_hook'
+require 'cocoapods-pahealth-bin/gem_version.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pahealth-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - GitWangKai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -91,6 +91,7 @@ files:
 - lib/cocoapods-pahealth-bin/command.rb
 - lib/cocoapods-pahealth-bin/command/bin.rb
 - lib/cocoapods-pahealth-bin/command/bin/init.rb
+- lib/cocoapods-pahealth-bin/command/bin/repo/push.rb
 - lib/cocoapods-pahealth-bin/command/bin/repo/update.rb
 - lib/cocoapods-pahealth-bin/command/bin/spec.rb
 - lib/cocoapods-pahealth-bin/command/bin/spec/lint.rb
@@ -106,6 +107,7 @@ files:
 - lib/cocoapods-pahealth-bin/native/podfile.rb
 - lib/cocoapods-pahealth-bin/native/podfile_env.rb
 - lib/cocoapods-pahealth-bin/native/sources_manager.rb
+- lib/cocoapods-pahealth-bin/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/EXAMPLE/cocoapods-pahealth-bin
 licenses: