cocoapods-pahealth-bin 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 548ec031b506a3415e358a531b7164c58ffa5f98bd60a6bdd39b2a7bb1fbc5da
-  data.tar.gz: 26a9775ac5184aaee5543bb7e732f1c9781039ca42b7e942ba9f0e2a45b6ef78
+  metadata.gz: c425660864d3b8b05518e496fb36bff6a558f0146a2072442669aadf4c2d946b
+  data.tar.gz: d3001b8edad764f0d0112a4dafb869832958ba7fe7cf6a6e1dcf30e342fc96e2
 SHA512:
-  metadata.gz: 782b67edcf136c3f51523eb15a30ece5f293b17ca5f3c013384d93911a376787111231456c5f10165104b1d27ceffeb9310ac607605892d7640656f8d4c62ec6
-  data.tar.gz: 5f106a5efb491af72858e877b084f5a6fb225d4c3f2cc5b3cc6b1edba1cf35ded83421f2ca0ab299e17dc9d2c23e1eb5c65ff8cebc80abd200527e5d23fe6c9e
+  metadata.gz: f567e671d1d5794c8393cc794dabaa25df139d5276955ef3e13f81c98faf34f95282d0f33c8188d720d6d826c23c5099338889918e4e8cef987320b21f479be6
+  data.tar.gz: 4e25e4dfb7543767ab1927a15b6a9117cd0f7a6edce7fce7a0f6c3ed0124875a8d78cb9cf0dffc4dcc090d0fc13c27dcaac2b080ea9054df09c25796d09ff248

data/lib/cocoapods-pahealth-bin.rb

@@ -1 +1,2 @@
 require 'cocoapods-pahealth-bin/gem_version'
+require 'cocoapods-pahealth-bin/native/sources_manager'

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

@@ -17,39 +17,31 @@ module Pod
 
           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') || []
+            @sources = argv.option('sources')
+            @code_dependencies = argv.flag?('code-dependencies')
             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 = [
+                repo,
+                "--sources=#{sources_option(@code_dependencies, @sources)+','+Pod::TrunkSource::TRUNK_REPO_URL}",
+                *@additional_args
+            ]
 
-                  argvs << spec_file if spec_file
+            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
+            push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+            push.validate!
+            push.run
           end
 
           private

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

@@ -17,16 +17,21 @@ module Pod
           end
 
           def initialize(argv)
+            @name = argv.shift_argument
             super
           end
 
           def run
             show_output = !config.silent?
-            Parallel.each(valid_sources, in_threads: 4) do |source|
-              source.update(show_output)
-              # update_git_repo
+            if @name
+              config.sources_manager.update(@name, show_output)
+            else
+              Parallel.each(valid_sources, in_threads: 4) do |source|
+                source.update(show_output)
+              end
             end
           end
+
         end
       end
     end

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

@@ -12,38 +12,32 @@ module Pod
           DESC
 
           self.arguments = [
-              CLAide::Argument.new(%w[NAME.podspec DIRECTORY http://PATH/NAME.podspec], false, true)
+              CLAide::Argument.new('NAME.podspec', false)
           ]
 
           def self.options
             [
-                ['--release', '在 release 环境下进行 lint']
             ].concat(Pod::Command::Spec::Lint.options).concat(super).uniq
           end
 
           def initialize(argv)
             @podspec = argv.shift_argument
-            @release = argv.flag?('release',false )
-            @sources = argv.option('sources')
-            @allow_prerelease = argv.flag?('allow-prerelease')
+            @sources = argv.option('sources') || []
+            @code_dependencies = argv.flag?('code-dependencies')
             super
 
             @additional_args = argv.remainder!
           end
 
           def run
-            Podfile.execute_with_bin_plugin do
-              Podfile.execute_with_allow_prerelease(@allow_prerelease) do
-                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
+            argvs = [
+                "--sources=#{sources_option(@code_dependencies, @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
 
           private

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

@@ -21,7 +21,7 @@ module Pod
         end
 
         def run
-          #1.clone Private repo
+          #1.更新 repo
           clone_private_repo
           #2.执行 pod update --no-repo-update
           pod_update_no_repo_update

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

@@ -1,61 +1,21 @@
+# frozen_string_literal: true
+
 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
-      config_file_with_configuration_dependence(configuration_dependence)
+      File.expand_path("#{Pod::Config.instance.home_dir}/bin.yml")
     end
 
     def template_hash
       {
-          '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' },
+          'code_repo_url' => { description: '私有源 Git 地址', default: 'git@github.com/cocoapods-spec.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_with_configuration_dependence(config['configuration_dependence']), 'w+') do |f|
+      File.open(config_file, 'w+') do |f|
         f.write(config.to_yaml)
       end
     end
@@ -114,6 +74,4 @@ module CBin
   def self.config
     @config ||= Config.new
   end
-
-
 end

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

@@ -42,7 +42,6 @@ module CBin
 
           开始设置组件私有化初始信息.
           所有的信息都会保存在 #{CBin.config.config_file} 文件中.
-          %w[pahealth_test.yml pahealth_uat.yml] 
           你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
 
           #{CBin.config.default_config.to_yaml}

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

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

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

@@ -10,13 +10,13 @@ module CBin
       sources_manager.code_source
     end
 
-    def valid_sources
+    def valid_sources(code_dependencies = false)
       sources = [code_source]
       sources
     end
 
-    def sources_option(additional_sources)
-      (valid_sources.map(&:url) + Array(additional_sources)).join(',')
+    def sources_option(code_dependencies, additional_sources)
+      (valid_sources(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
     end
   end
 end

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

@@ -26,10 +26,6 @@ module Pod
         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
@@ -60,10 +56,6 @@ 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

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

@@ -5,7 +5,6 @@ module Pod
     USE_BINARIES_SELECTOR = 'use_binaries_selector'
     ALLOW_PRERELEASE = 'allow_prerelease'
     USE_PLUGINS = 'use_plugins'
-    CONFIGURATION_DEPENDENCE = 'configuration_dependence'
 
     module ENVExecutor
 

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

@@ -2,16 +2,3 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pahealth-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - GitWangKai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel