cocoapods-freezer 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beabd9ae3fe3c6b4c2273db5b17720eccb71d74b
-  data.tar.gz: 0b488040d271093e925ae2124686a72abfe85ae5
+  metadata.gz: 21166efd3df3dbcfdacf250b9c679f996f16f481
+  data.tar.gz: 8719db832ee221b5995e411508a0b347ed5dbd91
 SHA512:
-  metadata.gz: 0546101bc1fc939debfb0521f3d2f9b5e0ccba5807b165f9cc59188fcd9c3bf72578fb4336e042013c733f2676b8c56a44803ed5d855ed6445ec755b98791b35
-  data.tar.gz: c2fd2e22ec588ae40bd45ae854c55864ca4d0c5c7cf81cc571545652a36378f786df31eba6d304ed2c5738d9dac0ee96c81f1cb119e36044835c56b1725fa759
+  metadata.gz: eba6c6144d398fab7a60ea551a3698bb55a5154f21177fd6fd734581d42c72dd7cb8f83935ea629291270df86643abbb80a3663e3a9f44b49237a479db18a8e9
+  data.tar.gz: 114d4fc5e6075506ce076aa8d4a572e887d6e9208ca8f3395c404b147401daebf88c2db8c9438baf5184c3f22bde8df6b0b83cccedfb59039fb31e695501e5d2

data/README_CH.md

@@ -31,17 +31,17 @@ $ pod install --user-freezer
 ## 计划
 
 - 预编译相关
-	[] 支持多subspecs编译
-  [] 支持全平台（Platform）、全配置（Configuration）缓存
-  [] 支持Framework(Dynamic\Static)方式构建
-  [] 支持local类型
-  [] 支持swift类型
-	[] 缓存路径定制
-	[] 打包脚本定制？
-	[] Configuration定制？
+  - [] 支持全平台（Platform）、全配置（Configuration）缓存
+  - [] 支持Framework(Dynamic\Static)方式构建
+  - [] 支持local类型
+  - [] 支持swift类型
+	- [] 缓存路径定制
+	- [] 打包脚本定制？
+	- [] Configuration定制？
+	- [] 多Target使用相同Pod但不同subspec相应缓存
 
 - 命令相关
-	[] 支持'pod update'命令工作
-	[] 支持'pod freeze'命令的查询、缓存操作
+	- [] 支持'pod update'命令工作
+	- [] 支持'pod freeze'命令的查询、缓存操作
 
 如果你喜欢这个插件，请留下🌟！欢迎提出遇到的问题，以及希望增加的功能！

data/lib/cocoapods-freezer/freezer.rb

@@ -56,12 +56,6 @@ module Pod
       # freeze!
 			specs_for_freezing.each do |spec|
 
-        # subspec not support;
-        if spec.subspecs.count > 0
-          Pod::UI.puts "`#{spec.name}` can't freeze because it has subspecs!".red
-          next
-        end
-
         # local not support; 
         if sandbox.local?(spec.name)
           Pod::UI.puts "`#{spec.name}` can't freeze because it is local!".red
@@ -73,93 +67,87 @@ module Pod
 					target.root_spec.name == spec.name
 				end || []
 
-        unless pod_targets.count > 0
-          Pod::UI.puts "`#{spec.name}` can't freeze because it nil!".red
+        # todo(ca1md0wn)
+        # Pod has only one target in one platform.
+        # 1. pod has multi target beacause of multi platforms in workspace!
+        # 2. pod has multi target beacause it define in diffenent targets with diffenent subspec!
+        unless pod_targets.count == 1
+          Pod::UI.puts "`#{spec.name}` can't freeze because it has multi targets in workspace!".red
           next
         end
 
-        not_support = false
-        pod_targets.each do |target|
-          # todo(ca1md0wn)
-          # should_not_build not support 
-          if !target.should_build?
-            Pod::UI.puts "`#{spec.name}` can't freeze because it should not build!".red
-            not_support = true
-            break
-          end
+        pod_target = pod_targets.first
 
-          # todo(ca1md0wn)
-          # swift not support; 
-          if target.uses_swift?
-            Pod::UI.puts "`#{spec.name}` can't freeze because it use swift!".red
-            not_support = true
-            break
-          end
+        # target should not build; 
+        if !pod_target.should_build?
+          Pod::UI.puts "`#{spec.name}` can't freeze because it should not build!".red
+          next
+        end
 
-          # todo(ca1md0wn)
-          # build_as_framework not support;
-          if target.requires_frameworks?
-            Pod::UI.puts "`#{spec.name}` don't support to freeze because it will build as framework!".red
-            not_support = true
-            break
-          end
+        # todo(ca1md0wn)
+        # freezer not support swift; 
+        if pod_target.uses_swift?
+          Pod::UI.puts "`#{spec.name}` can't freeze because it use swift!".red
+          next
+        end
 
-          # todo(ca1md0wn)
-          # multiplatform not support(just support ios now!)
-          if target.platform.name != :ios
-            Pod::UI.puts "`#{spec.name}` don't support to freeze because it is not ios!".red
-            not_support = true
-            break
-          end
+        # todo(ca1md0wn)
+        # freezer not support to build as framework;
+        if pod_target.requires_frameworks?
+          Pod::UI.puts "`#{spec.name}` don't support to freeze because it will build as framework!".red
+          next
         end
-        next if not_support
 
-        frozen_pod = FrozenPod.new(spec.name)
+        # todo(ca1md0wn)
+        # freezer just support to build at ios; (just support ios now!)
+        if pod_target.platform.name != :ios
+          Pod::UI.puts "`#{spec.name}` don't support to freeze because it is not ios!".red
+          next
+        end
 
         # setup!
-				pod_targets.each do |target|
-          # target build when
-          # 1.spec change/add 2.product not exist
-          if !unchange_spec_names.include?(spec.name) || !(root + target.product_name).exist?
-
-            product_path = nil
-            case target.platform.name
-            when :ios then
-              # build iphonesimulator!
-              iphonesimulator_paths = Pod::Xcodebuild::build_iphonesimulator!(installer.sandbox.project_path.realdirpath, target.name, target.product_name)
-              if !iphonesimulator_paths || iphonesimulator_paths.count == 0 
-                next
-              end
-
-              # build iphoneos!
-              iphoneos_paths = Pod::Xcodebuild::build_iphoneos!(installer.sandbox.project_path.realdirpath, target.name, target.product_name)
-              if !iphoneos_paths || iphoneos_paths.count == 0
-                next
-              end
-
-              # lipo!
-              product_path = Pod::Lipo::create!(iphoneos_paths + iphonesimulator_paths, target.product_name)
-
-            when :osx then 
-              # todo
-            when :watchos then
-              # todo
-            when :tvos then
-              # todo
+				# pod_target build when
+        # 1.spec change/add 2.product not exist
+        if !unchange_spec_names.include?(spec.name) || !(root + pod_target.product_name).exist?
+          product_path = nil
+          case pod_target.platform.name
+          when :ios then
+            # build iphonesimulator!
+            iphonesimulator_paths = Pod::Xcodebuild::build_iphonesimulator!(installer.sandbox.project_path.realdirpath, pod_target.name, pod_target.product_name)
+            if !iphonesimulator_paths || iphonesimulator_paths.count == 0 
+              Pod::UI.puts "`#{spec.name}` don't support to freeze because it build failed!".red
+              next
             end
 
-            next unless product_path
-            
-            FileUtils.cp_r(product_path, root + target.product_name, :remove_destination => true)
-          end
+            # build iphoneos!
+            iphoneos_paths = Pod::Xcodebuild::build_iphoneos!(installer.sandbox.project_path.realdirpath, pod_target.name, pod_target.product_name)
+            if !iphoneos_paths || iphoneos_paths.count == 0
+              Pod::UI.puts "`#{spec.name}` don't support to freeze because it build failed!".red
+              next
+            end
 
-          frozen_pod.mark!(target.product_name)
-				end
+            # lipo!
+            product_path = Pod::Lipo::create!(iphoneos_paths + iphonesimulator_paths, pod_target.product_name)
+
+          when :osx then 
+            # todo
+          when :watchos then
+            # todo
+          when :tvos then
+            # todo
+          end
 
-        unless frozen_pod.empty?
-          @frozen_pods += [frozen_pod]
+          if !product_path
+            Pod::UI.puts "`#{spec.name}` don't support to freeze because it build failed!".red
+            next
+          end
+          
+          FileUtils.cp_r(product_path, root + pod_target.product_name, :remove_destination => true)
         end
 
+        frozen_pod = FrozenPod.new(pod_target.pod_name, pod_target.product_name)
+        @frozen_pods += [frozen_pod]
+
         Pod::UI.puts "`#{spec.name}` freeze!".green
 			end
 
@@ -189,54 +177,32 @@ module Pod
       return false
     end
 
-    def freezed_product?(product_name)
-      @frozen_pods.each do |frozen_pod|
-        frozen_pod.product_names.each do |name|
-          if name == product_name
-            return true
-          end
+    def export!(pod_name, path)
+      @frozen_pods.select do |frozen_pod|
+        if frozen_pod.pod_name == pod_name
+          FileUtils.cp_r(root + frozen_pod.product_name, path + frozen_pod.product_name, :remove_destination => true)
+          break;
         end
       end
-
-      return false
-    end
-
-    def export!(product_name, path)
-      if !path || !freezed_product?(product_name)
-        return
-      end
-
-      FileUtils.cp_r(root + product_name, path.to_s, :remove_destination => true)
     end
 
 		private
 
     class FrozenPod
-      # String
+      # [String]
       attr_reader :pod_name
 
-      # Array<String>
-      attr_reader :product_names
+      # [String]
+      attr_reader :product_name
 
-      def initialize(pod_name)
+      def initialize(pod_name, product_name)
+        raise "Params error" unless pod_name.length > 0 && product_name.length > 0
         @pod_name = pod_name
-        @product_names = []
-      end
-
-      def mark!(product_name)
-        @product_names += [product_name]
-      end
-
-      def empty?
-        if @product_names.count > 0
-          return false
-        end
-
-        return true
+        @product_name = product_name
       end
     end
     
-    # Array<FrozenPod>
+    # [Array<FrozenPod>]
     @frozen_pods
 
 		def root

data/lib/cocoapods-freezer/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFreezer
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/cocoapods-freezer/installer.rb

@@ -20,39 +20,34 @@ module Pod
     end
 
     def resolve_dependencies_about_freezed
-      major_specs.each do |spec|
-        next unless Pod::Freezer.shared.freezed_pod?(spec.root.name)
+      major_specs.each do |major_spec|
+        next unless Pod::Freezer.shared.freezed_pod?(major_spec.name)
 
         targets = pod_targets.select do |target|
-          target.pod_name == spec.root.name
+          target.pod_name == major_spec.name
         end
 
-        if !targets || targets.count == 0
+        # Pod has only one target
+        unless targets.count == 1
           next
         end
 
-        targets.each do |target|
+        target = targets.first
+
+        # Pod maybe include multi subspecs, 
+        all_specs = analysis_result.specifications.select do |spec|
+          spec.root.name == major_spec.name
+        end.each do |spec|
           spec.prepare_to_store_freezed(target.platform.name.to_s)
-          if Pod::Freezer.shared.freezed_product?(target.product_name)
-            spec.store_freezed(target.platform.name.to_s, target.product_name, target.product_type)
-          else # not freezed product in platform
-            spec.store_freezed_none(target.platform.name.to_s)
-          end
+          spec.store_freezed(target.platform.name.to_s, target.product_name, target.product_type)
+          spec.done_for_store_freezed
         end
-
-        spec.done_for_store_freezed
       end
     end
 
     def install_source_of_pod_about_freezed(pod_name)
       if Pod::Freezer.shared.freezed_pod?(pod_name)
-        pod_targets.select do |target|
-          target.pod_name == pod_name
-        end.map do |target|
-          target.product_name
-        end.each do |product_name|
-          Pod::Freezer.shared.export!(product_name, self.sandbox.pod_dir(pod_name) + product_name)
-        end
+        Pod::Freezer.shared.export!(pod_name, self.sandbox.pod_dir(pod_name))
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-freezer
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - ca1md0wn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods