cocoapods-bin 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8408fffb94c3f172b6062eaf706871b7659ef43
-  data.tar.gz: 178ec5208be05c3b14b71e136a304085a62af687
+  metadata.gz: da7e02c4a75fce8b60ddc9f9575863846d1a9d03
+  data.tar.gz: e40f144b646e287b756472779abd5f299dadc8b0
 SHA512:
-  metadata.gz: d9fcdb7cfbb2dc7d756119debca1626cff2c0261ce4a036cd2f1ed668462f0fed98f7b45ea9b94244867c46166a17640a7b91c633fa406eb8355d6b4d9d1c14b
-  data.tar.gz: 0f26ea1b64c1ab8d324783ad5834620057bc93da0710677e259e5cbc424ab4a32da3533aa941807c72529069ddb3b47afd2092d4714b50d13c5bde82a9a0570a
+  metadata.gz: cbcc17d1b13421da3dfa305b76adc80ebe1dc1b187d4dd61b96fa7d9debaf36b9269a6b6a9937e1ba8882fbdac9146b667dd123047120c50bdd9bfdb7b95bb7d
+  data.tar.gz: '0849fc6226f2a9a8069619e79184154eaba82c61c603ec275c41692cf8436c5ad0a0680e3fac8df535e5bc92f45f944203cbf542499e19358924dd527394f7ff'

data/Gemfile.lock

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

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

@@ -15,24 +15,19 @@ module Pod
             CLAide::Argument.new('NAME.podspec', false),
           ]
 
+          # lib lint 不会下载 source，所以不能进行二进制 lint
+          # 要 lint 二进制版本，需要进行 spec lint，此 lint 会去下载 source
           def self.options
             [
-              ['--binary', 'lint 组件的二进制版本'],
-              ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
               ['--code-dependencies', '使用源码依赖进行 lint'],
-              ['--loose-options', '添加宽松的 options, 可能包括 --use-libraries (可能会造成 entry point (start) undefined)'],
-              ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
+              ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
             ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
           end
 
           def initialize(argv)
-            @podspec = argv.shift_argument
-            @binary = argv.flag?('binary')
             @loose_options = argv.flag?('loose-options')
             @code_dependencies = argv.flag?('code-dependencies')
             @sources = argv.option('sources') || []
-            @reserve_created_spec = argv.flag?('reserve-created-spec')
-            @template_podspec = argv.option('template-podspec')
             super
 
             @additional_args = argv.remainder!
@@ -44,53 +39,19 @@ module Pod
                 "--sources=#{sources_option(@code_dependencies, @sources)}",
                 *@additional_args
               ]
-
-              argvs << spec_file if spec_file
               
               if @loose_options
                 argvs << '--allow-warnings'
-                argvs << '--use-libraries' if code_spec.all_dependencies.any?
+                argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
               end
             
               lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
               lint.validate!
               lint.run
             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
-                find_spec_file(@podspec) 
-              else
-                raise Informative, "当前目录下没有找到可用源码 podspec." if code_spec_files.empty?
-
-                spec_file = if @binary
-                              code_spec = Pod::Specification.from_file(code_spec_files.first)
-                              template_spec = Pod::Specification.from_file(template_spec_file) if template_spec_file
-                              create_binary_spec_file(code_spec, template_spec)
-                            else
-                              code_spec_files.first
-                            end
-                spec_file
-              end
-            end
-          end
+          
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Pod
               ['--binary', '发布组件的二进制版本'],
               ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
               ['--code-dependencies', '使用源码依赖进行 lint'],
-              ['--loose-options', '添加宽松的 options, 可能包括 --use-libraries (可能会造成 entry point (start) undefined)'],
+              ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
               ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
             ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
           end
@@ -50,7 +50,7 @@ module Pod
 
               if @loose_options
                 argvs += ['--allow-warnings', '--use-json']
-                argvs << '--use-libraries' if code_spec.all_dependencies.any?
+                argvs << '--use-libraries' if code_spec&.all_dependencies&.any?
               end
             
               push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))

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

@@ -12,20 +12,27 @@ module Pod
           DESC
 
           self.arguments = [
-            CLAide::Argument.new(%w(NAME.podspec DIRECTORY http://PATH/NAME.podspec), false, true)
+            CLAide::Argument.new(%w(NAME.podspec DIRECTORY http://PATH/NAME.podspec), false, true),
           ]
 
           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'],
+              ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
             ].concat(Pod::Command::Lib::Spec.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')
             super
 
             @additional_args = argv.remainder!
@@ -37,13 +44,51 @@ module Pod
                 "--sources=#{sources_option(@code_dependencies, @sources)}",
                 *@additional_args
               ]
-              
-              argvs += ['--allow-warnings', '--use-libraries'] if @loose_options
+
+              argvs << spec_file if spec_file
+
+              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
             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
+                find_spec_file(@podspec) || @podspec
+              else
+                raise Informative, "当前目录下没有找到可用源码 podspec." if code_spec_files.empty?
+
+                spec_file = if @binary
+                              code_spec = Pod::Specification.from_file(code_spec_files.first)
+                              template_spec = Pod::Specification.from_file(template_spec_file) if template_spec_file
+                              create_binary_spec_file(code_spec, template_spec)
+                            else
+                              code_spec_files.first
+                            end
+                spec_file
+              end
+            end
           end
         end
       end

data/lib/cocoapods-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
 
 module Pod

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

@@ -76,6 +76,8 @@ module CBin
 				spec_hash = @spec.to_hash
 				# spec_hash.delete('license')
 				spec_hash.delete('resource_bundles')
+				spec_hash.delete('exclude_files')
+				spec_hash.delete('preserve_paths')
 
 				# Filter platforms
 				platforms = spec_hash['platforms']

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

@@ -13,15 +13,12 @@ module Pod
 		if Pod.match_version?('~> 1.4') 
 			old_resolver_specs_by_target = instance_method(:resolver_specs_by_target)
 			define_method(:resolver_specs_by_target) do 
-				resolver_specs_by_target = old_resolver_specs_by_target.bind(self).call()
-
-				# 过滤出用户工程
-				user_specs_by_target = resolver_specs_by_target.reject { |st| st.name.end_with?('_Tests') || st.name == 'Pods' }
+				specs_by_target = old_resolver_specs_by_target.bind(self).call()
 
 				sources_manager = Config.instance.sources_manager
 				use_source_pods = podfile.use_source_pods
 
-				user_specs_by_target.each do |target, rspecs|
+				specs_by_target.each do |target, rspecs|
 					# use_binaries 并且 use_source_pods 不包含
 					use_binary_rspecs = if podfile.use_binaries? || podfile.use_binaries_selector
 																rspecs.select do |rspec| 
@@ -33,7 +30,7 @@ module Pod
 														  end
 
 					# Parallel.map(rspecs, in_threads: 8) do |rspec| 
-					resolver_specs_by_target[target] = rspecs.map do |rspec|
+					specs_by_target[target] = rspecs.map do |rspec|
 						# 含有 subspecs 的组件暂不处理
 						# next rspec if rspec.spec.subspec? || rspec.spec.subspecs.any?
 
@@ -72,7 +69,7 @@ module Pod
 					end.compact
 				end
 
-				resolver_specs_by_target
+				specs_by_target
 			end
 		end
 	end

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

@@ -0,0 +1,18 @@
+module Pod
+  class Installer
+    class Analyzer
+    	class SandboxAnalyzer
+    		# def pod_changed?(pod)
+      #     spec = root_spec(pod)
+
+      #     return true if spec.version != sandbox_version(pod)
+      #     return true if spec.checksum != sandbox_checksum(pod)
+      #     return true if resolved_spec_names(pod) != sandbox_spec_names(pod)
+      #     return true if sandbox.predownloaded?(pod)
+      #     return true if folder_empty?(pod)
+      #     false
+      #   end
+    	end
+    end
+  end
+end

data/lib/cocoapods-bin/native.rb

@@ -13,6 +13,7 @@ if Pod.match_version?('~> 1.4')
 	require 'cocoapods-bin/native/source'
 	require 'cocoapods-bin/native/validator'
 	require 'cocoapods-bin/native/acknowledgements'
+	require 'cocoapods-bin/native/sandbox_analyzer'
 end
 
 require 'cocoapods-bin/native/source_provider_hook'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - tripleCC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -112,6 +112,7 @@ files:
 - lib/cocoapods-bin/native/pod_source_installer.rb
 - lib/cocoapods-bin/native/podfile.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