cocoapods-bin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5d790603abfbbc6e4624f826b0102b94753d15
-  data.tar.gz: 976cfee2a3ebb99b648b6bf7f0e293fb662cadc2
+  metadata.gz: b029e2430ee8a2dc54dfc919930fa13c9d92a130
+  data.tar.gz: da795a5e512bc1b729ec5d9cb69216c42d1ede4f
 SHA512:
-  metadata.gz: 3c187df578219cf4f1f465061614ffee3c84dc0a740998fcd4560acf5c1646aab11b71060f009cfbd56003bb7a7db3f60231751507ef739d2bedab7f26a665b7
-  data.tar.gz: 458effc98e7baeea263496fef51a39465eadf71f512ce0479dfd277e594fa7cadc5a814d567bc43ef066399ba7eedea6993728963f6dec197c1f988c21ac3aa7
+  metadata.gz: 6939eb1cdfc4d21cd07b901e17348751b6197283336c8ace9556875f3f1363027771f9acef247f9045df969d02ca2a3d986b3453e599ea7548f14651cb54e57a
+  data.tar.gz: 1b6c3b98739b91de7725a3a90c9e8677b2fdc35ebd46cc5034a129a272cfe0c8c56195eff142c2b90373546370527f54de20f030f893626e5e1a50b3423ad303

data/Gemfile.lock

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

data/cocoapods-bin.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = CBin::VERSION
   spec.authors       = ['tripleCC']
   spec.email         = ['triplec.linux@gmail.com']
-  spec.description   = %q{cocoapods pods source switcher.}
+  spec.description   = %q{cocoapods-bin is a plugin which helps develpers switching pods between source code and binary.}
   spec.summary       = %q{cocoapods-bin is a plugin which helps develpers switching pods between source code and binary.}
   spec.homepage      = 'https://github.com/tripleCC/cocoapods-bin'
   spec.license       = 'MIT'

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

@@ -21,6 +21,7 @@ module Pod
             [
               ['--code-dependencies', '使用源码依赖进行 lint'],
               ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
+              ['--allow-prerelease', '允许使用 prerelease 的版本 lint']
             ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
           end
 
@@ -28,6 +29,7 @@ module Pod
             @loose_options = argv.flag?('loose-options')
             @code_dependencies = argv.flag?('code-dependencies')
             @sources = argv.option('sources') || []
+            @allow_prerelease = argv.flag?('allow-prerelease')
             @podspec = argv.shift_argument
             super
 
@@ -35,21 +37,23 @@ module Pod
           end
 
           def run 
-            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_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

@@ -21,7 +21,8 @@ module Pod
               ['--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)'],s
+              ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
+              ['--allow-prerelease', '允许使用 prerelease 的版本 lint']
             ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
           end
 
@@ -33,29 +34,32 @@ module Pod
             @sources = argv.option('sources') || []
             @reserve_created_spec = argv.flag?('reserve-created-spec')
             @template_podspec = argv.option('template-podspec')
+            @allow_prerelease = argv.flag?('allow-prerelease')
             super
 
             @additional_args = argv.remainder!
           end
 
           def run 
-            Podfile.execute_with_use_binaries(!@code_dependencies) do 
-              argvs = [
-                repo,
-                "--sources=#{sources_option(@code_dependencies, @sources)}",
-                *@additional_args
-              ]
+            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
           ensure
             clear_binary_spec_file_if_needed unless @reserve_created_spec

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

@@ -22,6 +22,7 @@ module Pod
               ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
               ['--code-dependencies', '使用源码依赖进行 lint'],
               ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
+              ['--allow-prerelease', '允许使用 prerelease 的版本 lint']
             ].concat(Pod::Command::Lib::Spec.options).concat(super).uniq
           end
 
@@ -33,28 +34,31 @@ module Pod
             @binary = argv.flag?('binary')
             @reserve_created_spec = argv.flag?('reserve-created-spec')
             @template_podspec = argv.option('template-podspec')
+            @allow_prerelease = argv.flag?('allow-prerelease')
             super
 
             @additional_args = argv.remainder!
           end
 
           def run 
-            Podfile.execute_with_use_binaries(!@code_dependencies) do 
-              argvs = [
-                "--sources=#{sources_option(@code_dependencies, @sources)}",
-                *@additional_args
-              ]
+            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
           ensure
             clear_binary_spec_file_if_needed unless @reserve_created_spec

data/lib/cocoapods-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end
 
 module Pod

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

@@ -5,9 +5,14 @@ module Pod
     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
+      def allow_prerelease!
+        set_internal_hash_value(ALLOW_PRERELEASE, true)
+      end
+
       def use_binaries!(flag = true)
         set_internal_hash_value(USE_BINARIES, flag)
       end
@@ -26,6 +31,10 @@ module Pod
     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
@@ -46,6 +55,10 @@ module Pod
       get_internal_hash_value(USE_BINARIES_SELECTOR, nil)
     end
 
+    def allow_prerelease?
+      get_internal_hash_value(ALLOW_PRERELEASE, false) || ENV[ALLOW_PRERELEASE] == 'true'
+    end
+
     def use_binaries?
       get_internal_hash_value(USE_BINARIES, false) || ENV[USE_BINARIES] == 'true'
     end

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

@@ -7,6 +7,37 @@ require 'cocoapods-bin/gem_version'
 
 module Pod
   class Resolver
+
+    if Pod.match_version?('~> 1.4') 
+      def specifications_for_dependency(dependency, additional_requirements = [])
+        requirement = Requirement.new(dependency.requirement.as_list + additional_requirements.flat_map(&:as_list))
+        requirement = Requirement.new(dependency.requirement.as_list.map { |r| r + '.a' } + additional_requirements.flat_map(&:as_list)) if podfile.allow_prerelease? && !requirement.prerelease?
+        find_cached_set(dependency).
+          all_specifications(installation_options.warn_for_multiple_pod_sources).
+          select { |s| requirement.satisfied_by? s.version }.
+          map { |s| s.subspec_by_name(dependency.name, false, true) }.
+          compact
+      end
+    end
+
+    if Pod.match_version?('~> 1.6') 
+      alias_method :old_valid_possibility_version_for_root_name?, :valid_possibility_version_for_root_name?
+      def valid_possibility_version_for_root_name?(requirement, activated, spec)
+        return true if podfile.allow_prerelease?
+        old_valid_possibility_version_for_root_name?(requirement, activated, spec)
+      end
+    elsif Pod.match_version?('~> 1.4')
+      def requirement_satisfied_by?(requirement, activated, spec)
+        version = spec.version
+        return false unless requirement.requirement.satisfied_by?(version)
+        shared_possibility_versions, prerelease_requirement = possibility_versions_for_root_name(requirement, activated)
+        return false if !shared_possibility_versions.empty? && !shared_possibility_versions.include?(version)
+        return false if !podfile.allow_prerelease? && version.prerelease? && !prerelease_requirement
+        return false unless spec_is_platform_compatible?(activated, requirement, spec)
+        true
+      end
+    end
+
     # >= 1.4.0 才有 resolver_specs_by_target 以及 ResolverSpecification
     # >= 1.5.0 ResolverSpecification 才有 source，供 install 或者其他操作时，输入 source 变更
     # 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - tripleCC
@@ -66,7 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: cocoapods pods source switcher.
+description: cocoapods-bin is a plugin which helps develpers switching pods between
+  source code and binary.
 email:
 - triplec.linux@gmail.com
 executables: []