cocoapods-bin 0.1.25 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f632f9b4f18ed2c88a9be2346807dcb22ae70c195d892859b06f85cc95aad2
-  data.tar.gz: 24b2cb8937a8e27e9a39d07ce7c6ce5969324c65268e9317749d68bd9ed751b5
+  metadata.gz: 44ecc61e6e298bfa16b5d98bfbc7ac5d6a071e8334bca37fe1f7ade766356843
+  data.tar.gz: 8d4becffa40c380abbf869af59811d81e0d80b44ee0641da8ff40460e0d34362
 SHA512:
-  metadata.gz: 3f13ed9d68f96970587b44ac57a04bde83bc2c4c6a030d7b933f33d2c692be9deb7884725b20d40041dfd278df56fc0c8440d9592a0ff0fa5a043422c7c8da34
-  data.tar.gz: 5391f2105a5527b9532036753e84ceea33d9c4789644cc649cc4245e21d3f1833f2881d9094230929825721cc4190e43c28b817a1ac21b8de3e2d864a2d4b8e4
+  metadata.gz: 3477c312e417d8a2f7161d22813c73aa19cd923e08fd3ddfc2a18cb8eef8a446f950c150642715282845fe01a00c990dc11f78c6da75a73dfebf1538c84be8be
+  data.tar.gz: a48cc361ce45617a2522fb39110cfd3fb0c7f2675850fc2e0bf89c2f4f19a5f0dcd2e57f8af4b30a3f6680e09626db0ea18fa83adcaae541f4a39ffca4229e1f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-bin (0.1.25)
+    cocoapods-bin (0.1.30)
       cocoapods (~> 1.4)
       cocoapods-generate (~> 1.4)
       parallel
@@ -72,7 +72,7 @@ GEM
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    parallel (1.19.1)
+    parallel (1.19.2)
     prettybacon (0.0.2)
       bacon (~> 1.2)
     rake (13.0.0)

data/README.md

@@ -6,6 +6,25 @@
 
 [Demo 工程](https://github.com/for-example-test/cocoapods-bin-example)
 
+## 更新
+
+#### 0.1.28
+
+新增本地组件依赖配置文件 BinPodfile ，
+
+场景: 不希望把本地采用的源码/二进制配置传到远程仓库。
+
+使用: 在 Podfile 同级目录下创建 BinPodfile ，并将其加入 .gitignore 。BinPodfile 中的配置选项优先级比 Podfile 高，支持和 Podfile 相同的配置语句，如 :
+
+```ruby
+# BinPodfile
+
+use_binaries!
+set_use_source_pods ['YYModel']
+
+```
+
+
 ## 概要
 
 本插件所关联的组件二进制化策略：

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

@@ -35,6 +35,7 @@ module Pod
           @zip = argv.flag?('zip', true)
           @sources = argv.option('sources') || []
           @platform = Platform.new(:ios)
+          @podspec = argv.shift_argument
           super
 
           @additional_args = argv.remainder!

data/lib/cocoapods-bin/gem_version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CBin
-  VERSION = '0.1.25'
+  VERSION = '0.1.30'
 end
 
 module Pod

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

@@ -3,6 +3,7 @@
 # copy from https://github.com/CocoaPods/cocoapods-packager
 
 require 'cocoapods-bin/helpers/framework.rb'
+require 'English'
 
 module CBin
   class Framework
@@ -176,7 +177,7 @@ module CBin
         command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration Release -target #{target_name} -project ./Pods.xcodeproj 2>&1"
         output = `#{command}`.lines.to_a
 
-        if $?.exitstatus != 0
+        if $CHILD_STATUS.exitstatus != 0
           raise <<~EOF
             Build command failed: #{command}
             Output:

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

@@ -72,13 +72,13 @@ module Pod
             has_changed_repo = !previous_spec_repo.nil? && current_repo && (current_repo != previous_spec_repo)
             title = "Installing #{spec.name} #{spec.version}"
             if has_changed_version && has_changed_repo
-              title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
+              title += " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
               end
             if has_changed_version && !has_changed_repo
-              title << " (was #{previous_version})"
+              title += " (was #{previous_version})"
               end
             if !has_changed_version && has_changed_repo
-              title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
+              title += " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
               end
           else
             title = "Installing #{spec}"

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

@@ -31,8 +31,7 @@ module Pod
 
     if Pod.match_version?('~> 1.4')
       def specifications_for_dependency(dependency, additional_requirements_frozen = [])
-        additional_requirements = additional_requirements_frozen.dup
-        additional_requirements.compact!
+        additional_requirements = additional_requirements_frozen.dup.compact
         requirement = Requirement.new(dependency.requirement.as_list + additional_requirements.flat_map(&:as_list))
         if podfile.allow_prerelease? && !requirement.prerelease?
           requirement = Requirement.new(dependency.requirement.as_list.map { |r| r + '.a' } + additional_requirements.flat_map(&:as_list))
@@ -50,6 +49,7 @@ module Pod
         else
           specifications = find_cached_set(dependency)
                            .all_specifications(options.warn_for_multiple_pod_sources)
+                           .select { |s| requirement.satisfied_by? s.version }
         end
 
         specifications

data/lib/cocoapods-bin/source_provider_hook.rb

@@ -4,6 +4,24 @@ require 'cocoapods-bin/native/sources_manager'
 
 Pod::HooksManager.register('cocoapods-bin', :pre_install) do |_context, _|
   require 'cocoapods-bin/native'
+
+  # 同步 BinPodfile 文件
+  project_root = Pod::Config.instance.project_root
+  path = File.join(project_root.to_s, 'BinPodfile')
+
+  next unless File.exist?(path)
+
+  contents = File.open(path, 'r:utf-8', &:read)
+
+  podfile = Pod::Config.instance.podfile
+  podfile.instance_eval do
+    begin
+      eval(contents, nil, path)
+    rescue Exception => e
+      message = "Invalid `#{path}` file: #{e.message}"
+      raise Pod::DSLError.new(message, path, e, contents)
+    end
+  end
 end
 
 Pod::HooksManager.register('cocoapods-bin', :source_provider) do |context, _|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.30
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel