cocoapods-bin 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66ddaf92807762c972bad0aad0d854c8a408c80
-  data.tar.gz: be00a1dc37583397149733463362b1413621c7d1
+  metadata.gz: 7659c97e073a001e2ebdf133d08f85e2ee186c15
+  data.tar.gz: 054c458cdd2b9675d25f529803d6fc0f48d445d8
 SHA512:
-  metadata.gz: 0c48432d6626d8b64ea426736466123c674819700d659f79a26dd923c270f53c381ef706c2c406cb8db124e3842a3ae9679bf4b6ffeb17d1e83646bc985f88b5
-  data.tar.gz: 9c796beba91dd941248a0c017a5f4ffdca237b52e095d10e625973ae8969ff30e0cae39eb4005373693be571218d01a75eb0a60f9b077f5c738bf783e2470e18
+  metadata.gz: 60fa57fa0d67d9a05cc47d47a08ff78358beebe3c9052382defa468a1b3dd93e63d32f1eae53d4936698d372870f12e2def7c61b2ac93170a7c4cbd2f2b32347
+  data.tar.gz: fc2fd9f4856e777edf153d166fdf109a912da641a499dc053f38b7a8442718384b9fd0ea6e52e6b5f2cf78c1b7061afabe5c56a15e93b1ab08ac54be7fed6f4d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-bin (0.1.6)
+    cocoapods-bin (0.1.7)
       cocoapods (~> 1.4)
       parallel
 

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

@@ -37,22 +37,24 @@ module Pod
           end
 
           def run 
-            Podfile.execute_with_allow_prerelease(@allow_prerelease) do 
-              Podfile.execute_with_use_binaries(!@code_dependencies) do 
-                argvs = [
-                  @podspec || code_spec_files.first,
-                  "--sources=#{sources_option(@code_dependencies, @sources)}",
-                  *@additional_args
-                ]
+            Podfile.execute_with_bin_plugin do 
+              Podfile.execute_with_allow_prerelease(@allow_prerelease) do 
+                Podfile.execute_with_use_binaries(!@code_dependencies) do 
+                  argvs = [
+                    @podspec || code_spec_files.first,
+                    "--sources=#{sources_option(@code_dependencies, @sources)}",
+                    *@additional_args
+                  ]
+                  
+                  if @loose_options
+                    argvs << '--allow-warnings'
+                    argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
+                  end
                 
-                if @loose_options
-                  argvs << '--allow-warnings'
-                  argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
+                  lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
+                  lint.validate!
+                  lint.run
                 end
-              
-                lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
-                lint.validate!
-                lint.run
               end
             end
           end

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

@@ -41,24 +41,26 @@ module Pod
           end
 
           def run 
-            Podfile.execute_with_allow_prerelease(@allow_prerelease) do 
-              Podfile.execute_with_use_binaries(!@code_dependencies) do 
-                argvs = [
-                  repo,
-                  "--sources=#{sources_option(@code_dependencies, @sources)}",
-                  *@additional_args
-                ]
+            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(@code_dependencies, @sources)}",
+                    *@additional_args
+                  ]
 
-                argvs << spec_file if spec_file
+                  argvs << spec_file if spec_file
 
-                if @loose_options
-                  argvs += ['--allow-warnings', '--use-json']
-                  argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
+                  if @loose_options
+                    argvs += ['--allow-warnings', '--use-json']
+                    argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
+                  end
+                
+                  push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+                  push.validate!
+                  push.run
                 end
-              
-                push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
-                push.validate!
-                push.run
               end
             end
           ensure

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

@@ -41,23 +41,25 @@ module Pod
           end
 
           def run 
-            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
-                ]
+            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
+                  argvs << spec_file if spec_file
 
-                if @loose_options
-                  argvs += ['--allow-warnings']
-                  argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
-                end
+                  if @loose_options
+                    argvs += ['--allow-warnings']
+                    argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
+                  end
 
-                lint = Pod::Command::Spec::Lint.new(CLAide::ARGV.new(argvs))
-                lint.validate!
-                lint.run
+                  lint = Pod::Command::Spec::Lint.new(CLAide::ARGV.new(argvs))
+                  lint.validate!
+                  lint.run
+                end
               end
             end
           ensure

data/lib/cocoapods-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end
 
 module Pod

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

@@ -1,4 +1,4 @@
-require 'cocoapods-bin/native'
+require 'cocoapods-bin/native/sources_manager.rb'
 
 module CBin
 	module SourcesHelper

data/lib/cocoapods-bin/helpers/spec_files_helper.rb

@@ -1,4 +1,5 @@
-require 'cocoapods-bin/native'
+require 'cocoapods-bin/native/sources_manager.rb'
+require 'cocoapods-bin/helpers/spec_creator'
 
 module CBin
 	module SpecFilesHelper

data/lib/cocoapods-bin/native.rb

@@ -15,5 +15,3 @@ if Pod.match_version?('~> 1.4')
 	require 'cocoapods-bin/native/acknowledgements'
 	require 'cocoapods-bin/native/sandbox_analyzer'
 end
-
-require 'cocoapods-bin/native/source_provider_hook'

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

@@ -1,11 +1,8 @@
 require 'cocoapods'
+require 'cocoapods-bin/native/podfile_env'
 
 module Pod
   class Podfile
-    USE_BINARIES = 'use_binaries'.freeze
-    USE_SOURCE_PODS = 'use_source_pods'.freeze
-    USE_BINARIES_SELECTOR = 'use_binaries_selector'.freeze
-    ALLOW_PRERELEASE = 'allow_prerelease'.freeze
     # TREAT_DEVELOPMENTS_AS_NORMAL = 'treat_developments_as_normal'.freeze
 
     module DSL
@@ -30,27 +27,19 @@ module Pod
       end
     end
 
-    module ENVExecutor
-      def execute_with_allow_prerelease(allow_prerelease, &block)
-        execute_with_key(ALLOW_PRERELEASE, -> { allow_prerelease ? 'true' : 'false' }, &block)
-      end
-      
-      def execute_with_use_binaries(use_binaries, &block)
-        execute_with_key(USE_BINARIES, -> { use_binaries ? 'true' : 'false' }, &block)
-      end
-
-      def execute_with_key(key, value_returner, &block)
-        origin_value = ENV[key]
-        ENV[key] = value_returner.call
-
-        yield if block_given?
-
-        ENV[key] = origin_value
+    alias_method :old_plugins, :plugins 
+    def plugins
+      if ENV[USE_PLUGINS]
+        env_plugins = ENV[USE_PLUGINS].split(',').reduce({}) do |result, name| 
+          result[name] = {} 
+          result
+        end
+        env_plugins.merge!(old_plugins)
+      else 
+        old_plugins
       end
     end
 
-    extend ENVExecutor
-
     def use_binaries_selector
       get_internal_hash_value(USE_BINARIES_SELECTOR, nil)
     end
@@ -68,8 +57,14 @@ module Pod
     end
 
     private
+    def valid_bin_plugin
+      raise Pod::Informative, 'You should add `plugin \'cocoapods-bin\'` before using its DSL' unless plugins.keys.include?('cocoapods-bin')
+    end
+
     # set_hash_value 有 key 限制
     def set_internal_hash_value(key, value)
+      valid_bin_plugin
+
       internal_hash[key] = value
     end
 

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

@@ -0,0 +1,34 @@
+module Pod
+  class Podfile
+    USE_BINARIES = 'use_binaries'.freeze
+    USE_SOURCE_PODS = 'use_source_pods'.freeze
+    USE_BINARIES_SELECTOR = 'use_binaries_selector'.freeze
+    ALLOW_PRERELEASE = 'allow_prerelease'.freeze
+    USE_PLUGINS = 'use_plugins'.freeze
+
+    module ENVExecutor
+      def execute_with_bin_plugin(&block)
+        execute_with_key(USE_PLUGINS, -> {'cocoapods-bin'}, &block)
+      end
+
+      def execute_with_allow_prerelease(allow_prerelease, &block)
+        execute_with_key(ALLOW_PRERELEASE, -> { allow_prerelease ? 'true' : 'false' }, &block)
+      end
+      
+      def execute_with_use_binaries(use_binaries, &block)
+        execute_with_key(USE_BINARIES, -> { use_binaries ? 'true' : 'false' }, &block)
+      end
+
+      def execute_with_key(key, value_returner, &block)
+        origin_value = ENV[key]
+        ENV[key] = value_returner.call
+
+        yield if block_given?
+
+        ENV[key] = origin_value
+      end
+    end
+
+    extend ENVExecutor
+  end
+end

data/lib/cocoapods-bin/source_provider_hook.rb

@@ -0,0 +1,17 @@
+require 'cocoapods-bin/native/sources_manager'
+
+Pod::HooksManager.register('cocoapods-bin', :pre_install) do |context, _|
+	require 'cocoapods-bin/native'
+end
+
+Pod::HooksManager.register('cocoapods-bin', :source_provider) do |context, _|
+  sources_manager = Pod::Config.instance.sources_manager
+  podfile = Pod::Config.instance.podfile
+
+  if podfile
+	  # 添加二进制私有源 && 源码私有源
+	  added_sources = [sources_manager.code_source, sources_manager.binary_source]
+	  added_sources.reverse! if podfile.use_binaries? || podfile.use_binaries_selector
+	  added_sources.each { |source| context.add_source(source) }
+	end
+end

data/lib/cocoapods_plugin.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -112,13 +112,14 @@ files:
 - lib/cocoapods-bin/native/path_source.rb
 - lib/cocoapods-bin/native/pod_source_installer.rb
 - lib/cocoapods-bin/native/podfile.rb
+- lib/cocoapods-bin/native/podfile_env.rb
 - lib/cocoapods-bin/native/resolver.rb
 - lib/cocoapods-bin/native/sandbox_analyzer.rb
 - lib/cocoapods-bin/native/source.rb
-- lib/cocoapods-bin/native/source_provider_hook.rb
 - lib/cocoapods-bin/native/sources_manager.rb
 - lib/cocoapods-bin/native/specification.rb
 - lib/cocoapods-bin/native/validator.rb
+- lib/cocoapods-bin/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
 - spec/command/bin_spec.rb
 - spec/spec_helper.rb

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

@@ -1,11 +0,0 @@
-require 'cocoapods-bin/native/sources_manager'
-
-Pod::HooksManager.register('cocoapods-bin', :source_provider) do |context, _|
-  sources_manager = Pod::Config.instance.sources_manager
-  podfile = Pod::Config.instance.podfile
-
-  # 添加二进制私有源 && 源码私有源
-  added_sources = [sources_manager.code_source, sources_manager.binary_source]
-  added_sources.reverse! if podfile.use_binaries? || podfile.use_binaries_selector
-  added_sources.each { |source| context.add_source(source) }
-end