cocoapods-binary 0.1.2 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d5ce1e59aef6cd59958b1ae0a97a4ac1048be724
-  data.tar.gz: 51760a1c0972ba70fdfd4cecda153594027e9c70
+SHA256:
+  metadata.gz: 16f6d7d397c71e854a7e9d6639fa6ca5db285be1baf54e9af54231badc8f53a9
+  data.tar.gz: a2a2e8bd6c1010f2ef7c2d03ae46d24ba76d1347b30b586d44ddcf5aaba1ac13
 SHA512:
-  metadata.gz: 6cf6c852f46e9bdcd7d7a9cba0158a82796df981e76c9dde9e9787b613b0df3f357d2d7d035f25a2140a6de6727c8aa5d18df67185731b5a77795ebe25c32c1d
-  data.tar.gz: 8a9ee829a215cb263a0f1b0d698d6372523ed96b348158c7e5118fc328d93891e83a0365ec860e6432c32c568109d82cca6d895872646a5abfa9ecb016d873ac
+  metadata.gz: 3db502e1c9655092e9f2b38a129d27ead17e48d2bd9bc9cb1d143de5b85d606d49d3d8783b2147851da2d17dab66b69508cedd8acee2ef61a136b4074c946970
+  data.tar.gz: 21a1c41d15eb85daf2ecd05cce73b990f73f2b0119c4021bcd9b4e7875362d7af8a9804642a11aa5667acf18c8c378b7f02e793ff9799d93a460d64647878bb5

data/lib/cocoapods-binary/Integration.rb

@@ -2,6 +2,12 @@ require_relative 'podfile_options'
 require_relative 'feature_switches'
 require_relative 'prebuild_sandbox'
 
+# NOTE:
+# This file will only be loaded on normal pod install step
+# so there's no need to check is_prebuild_stage
+
+
+
 # Provide a special "download" process for prebuilded pods.
 #
 # As the frameworks is already exsited in local folder. We
@@ -41,12 +47,20 @@ module Pod
         def remove_target_files_if_needed
 
             changes = Pod::Prebuild.framework_changes
-            return if changes == nil
-            added = changes[:added] || []
-            changed = changes[:changed] || []
-            deleted = changes[:removed] || []
+            updated_names = []
+            if changes == nil
+                puts "aaaaa"
+                updated_names = PrebuildSandbox.from_standard_sandbox(self.sandbox).exsited_framework_names
+            else
+                puts "bbbbb"
+                puts changes
+                added = changes[:added] || []
+                changed = changes[:changed] || []
+                deleted = changes[:removed] || []
+                updated_names = added + changed + deleted
+            end
 
-            (added + changed + deleted).each do |name|
+            updated_names.each do |name|
                 root_name = Specification.root_name(name)
                 next if self.sandbox.local?(root_name)
 
@@ -62,21 +76,19 @@ module Pod
         old_method2 = instance_method(:resolve_dependencies)
         define_method(:resolve_dependencies) do
 
-            if Pod.is_prebuild_stage
-                old_method2.bind(self).()
-            else
-                # Remove the old target files, else it will not notice file changes
-                self.remove_target_files_if_needed
-                old_method2.bind(self).()
-
-                self.analysis_result.specifications.each do |spec|
-                    next unless self.prebuild_pod_names.include? spec.name
-                    spec.attributes_hash["vendored_frameworks"] = "#{spec.name}.framework"
-                    spec.attributes_hash["source_files"] = []
-
-                    # to avoid the warning of missing license
-                    spec.attributes_hash["license"] = {} 
-                end
+            puts "ddddddddd"
+
+            # Remove the old target files, else it will not notice file changes
+            self.remove_target_files_if_needed
+            old_method2.bind(self).()
+
+            self.analysis_result.specifications.each do |spec|
+                next unless self.prebuild_pod_names.include? spec.name
+                spec.attributes_hash["vendored_frameworks"] = "#{spec.name}.framework"
+                spec.attributes_hash["source_files"] = []
+
+                # to avoid the warning of missing license
+                spec.attributes_hash["license"] = {} 
             end
 
         end
@@ -86,10 +98,6 @@ module Pod
         old_method = instance_method(:install_source_of_pod)
         define_method(:install_source_of_pod) do |pod_name|
 
-            if Pod.is_prebuild_stage
-                return old_method.bind(self).(pod_name)
-            end
-
             # copy from original
             pod_installer = create_pod_installer(pod_name)
             # \copy from original

data/lib/cocoapods-binary/Main.rb

@@ -1,10 +1,15 @@
 # encoding: UTF-8
 
-require_relative 'feature_switches'
-require_relative 'prebuild_sandbox'
+require_relative 'podfile_options'
 
 Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_context|
     
+    require_relative 'feature_switches'
+    if Pod.is_prebuild_stage
+        next
+    end
+    
+    # [Check Environment]
     # check user_framework is on
     podfile = installer_context.podfile
     podfile.target_definition_list.each do |target_definition|
@@ -14,61 +19,56 @@ Pod::HooksManager.register('cocoapods-binary', :pre_install) do |installer_conte
             exit
         end
     end
-end
-
-# hook the install command to install twice (first for the prebuilding)
-module Pod
-    class Config
-        attr_writer :sandbox
-        attr_writer :lockfile
+    
+    
+    # -- step 1: prebuild framework ---
+    # Execute a sperated pod install, to generate targets for building framework,
+    # then compile them to framework files.
+    require_relative 'prebuild_sandbox'
+    require_relative 'Prebuild'
+    
+    Pod::UI.puts "🚀  Prebuild frameworks"
+    
+    
+    # control features
+    Pod.is_prebuild_stage = true
+    Pod::Podfile::DSL.enable_prebuild_patch true  # enable sikpping for prebuild targets
+    Pod::Installer.force_disable_integration true # don't integrate targets
+    Pod::Config.force_disable_write_lockfile true # disbale write lock file for perbuild podfile
+    Pod::Installer.disable_install_complete_message true # disable install complete message
+    
+    # make another custom sandbox
+    standard_sandbox = installer_context.sandbox
+    prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sandbox)
+    
+    # get the podfile for prebuild
+    prebuild_podfile = Pod::Podfile.from_ruby(podfile.defined_in_file)
+    
+    # install
+    binary_installer = Pod::Installer.new(prebuild_sandbox, prebuild_podfile , nil)
+    
+    if binary_installer.have_exact_prebuild_cache?
+        binary_installer.install_when_cache_hit!
+    else
+        binary_installer.repo_update = false
+        binary_installer.update = false
+        binary_installer.install!
     end
+    
+    
+    # reset the environment
+    Pod.is_prebuild_stage = false
+    Pod::Installer.force_disable_integration false
+    Pod::Podfile::DSL.enable_prebuild_patch false
+    Pod::Config.force_disable_write_lockfile false
+    Pod::Installer.disable_install_complete_message false
+    
+    
+    # -- step 2: prebuild framework ---
+    # install
+    Pod::UI.puts "\n"
+    Pod::UI.puts "🤖  Pod Install"
+    require_relative 'Integration'
+    # go on the normal install step ...
+end
 
-    class Command
-        class Install
-
-            
-            # --- patch ---
-            old_method = instance_method(:run)
-            
-            define_method(:run) do 
-
-                # -- step 1: prebuild framework ---
-
-                # control features
-                Pod.is_prebuild_stage = true
-                Pod::Podfile::DSL.enable_prebuild_patch true  # enable sikpping for prebuild targets
-                Pod::Installer.force_disable_integration true # don't integrate targets
-                Pod::Config.force_disable_write_lockfile true # disbale write lock file for perbuild podfile
-                Pod::Installer.disable_install_complete_message true # disable install complete message
-
-                # make another custom sandbox
-                standard_sandbox = self.config.sandbox
-                prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sandbox)
-                self.config.sandbox = prebuild_sandbox
-                
-                # install
-                Pod::UI.puts "✔️  Prebuild frameworks"
-                old_method.bind(self).()
-
-                
-                # -- step 2: prebuild framework ---
-
-                # reset the environment
-                self.config.podfile = nil
-                self.config.lockfile = nil
-                self.config.sandbox = standard_sandbox
-                Pod.is_prebuild_stage = false
-                Pod::Installer.force_disable_integration false
-                Pod::Podfile::DSL.enable_prebuild_patch false
-                Pod::Config.force_disable_write_lockfile false
-                Pod::Installer.disable_install_complete_message false
-
-                # install
-                Pod::UI.puts "\n"
-                Pod::UI.puts "✔️  Pod Install"
-                old_method.bind(self).()
-            end
-          
-        end
-    end
-end

data/lib/cocoapods-binary/Prebuild.rb

@@ -6,16 +6,58 @@ module Pod
     end
 end
 
+
 # patch prebuild ability
 module Pod
+    class Installer
 
-    class_attr_accessor :old_manifest_lock_file
+        def local_manifest 
+            if not @local_manifest_inited
+                @local_manifest_inited = true
+                raise "This method should be call before generate project" unless self.analysis_result == nil
+                @local_manifest = self.sandbox.manifest
+            end
+            @local_manifest
+        end
 
-    class Installer
         
+        # check if need to prebuild
+        def have_exact_prebuild_cache?
+            # check if need build frameworks
+            return false if local_manifest == nil
+            
+            changes = local_manifest.detect_changes_with_podfile(podfile)
+            puts changes
+            Pod::Prebuild.framework_changes = changes # save the chagnes info for later stage
+            added = changes[:added] || []
+            changed = changes[:changed] || []
+            unchanged = changes[:unchanged] || []
+            deleted = changes[:removed] || []
+            
+            unchange_framework_names = added + unchanged
+            exsited_framework_names = sandbox.exsited_framework_names
+            missing = unchanged.select do |pod_name|
+                not exsited_framework_names.include?(pod_name)
+            end
+
+            needed = (added + changed + deleted + missing)
+            return needed.empty?
+        end
+        
+        
+        # The install method when have completed cache
+        def install_when_cache_hit!
+            # just print log
+            self.sandbox.exsited_framework_names.each do |name|
+                UI.puts "Using #{name}"
+            end
+        end
+    
+
+        # Build the needed framework files
         def prebuild_frameworks 
 
-            local_manifest = Pod.old_manifest_lock_file
+            local_manifest = self.local_manifest
             sandbox_path = sandbox.root
             existed_framework_folder = sandbox.generate_framework_path
 
@@ -70,51 +112,7 @@ module Pod
 
         end
 
-        # check if need to prebuild
-        old_method = instance_method(:install!)
-        define_method(:install!) do
-            return old_method.bind(self).() unless Pod.is_prebuild_stage
-
-            # check if need build frameworks
-            local_manifest = self.sandbox.manifest
-            Pod::Prebuild.framework_changes = nil
-            return old_method.bind(self).() if local_manifest == nil
-
-            changes = local_manifest.detect_changes_with_podfile(podfile)
-            added = changes[:added] || []
-            changed = changes[:changed] || []
-            unchanged = changes[:unchanged] || []
-            deleted = changes[:removed] || []
-            Pod::Prebuild.framework_changes = changes # save the chagnes info for later stage
-            
-            unchange_framework_names = added + unchanged
-            exsited_framework_names = sandbox.exsited_framework_names
-            missing = unchanged.select do |pod_name|
-                not exsited_framework_names.include?(pod_name)
-            end
-            
-            if (added + changed + missing).empty? 
-                deleted.each do |framework_name|
-                    path = sandbox.framework_path_for_pod_name framework_name
-                    if path.exist?
-                        path.rmtree
-                        UI.puts "Delete #{framework_name}"
-                    end
-                end
 
-                # don't do the install
-                exsited_framework_names.each do |name|
-                    UI.puts "Using #{name}"
-                end
-                return
-            end
-            
-            # normal install
-            # Save manifest before generate a new one
-            Pod.old_manifest_lock_file = local_manifest
-            old_method.bind(self).()
-        end
-        
         # patch the post install hook
         old_method2 = instance_method(:run_plugins_post_install_hooks)
         define_method(:run_plugins_post_install_hooks) do 

data/lib/cocoapods-binary/feature_switches.rb

@@ -1,3 +1,6 @@
+require_relative 'tool/tool'
+require_relative 'prebuild_sandbox'
+
 module Pod
 
     # a flag that indicate stages
@@ -67,7 +70,7 @@ module Pod
     # option to disable write lockfiles
     class Config
 
-        @@force_disable_write_lockfile
+        @@force_disable_write_lockfile = false
         def self.force_disable_write_lockfile(value)
             @@force_disable_write_lockfile = value
         end
@@ -75,7 +78,8 @@ module Pod
         old_method = instance_method(:lockfile_path)
         define_method(:lockfile_path) do 
             if @@force_disable_write_lockfile
-                return self.sandbox.root + 'Manifest.lock.bak'
+                # As config is a singleton, sandbox_root refer to the standard sandbox.
+                return PrebuildSandbox.from_standard_sanbox_path(sandbox_root).root + 'Manifest.lock.tmp'
             else
                 return old_method.bind(self).()
             end

data/lib/cocoapods-binary/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-  VERSION = "0.1.2"
+  VERSION = "0.2"
 end

data/lib/cocoapods-binary/prebuild_sandbox.rb

@@ -20,7 +20,7 @@ module Pod
         end
 
         def exsited_framework_names
-            [] unless generate_framework_path.exist?
+            return [] unless generate_framework_path.exist?
             generate_framework_path.children.map do |framework_name|
                 extension = File.extname(framework_name)
                 if extension == ".framework"

data/lib/cocoapods-binary/tool/tool.rb

@@ -9,4 +9,28 @@
 #
 def class_attr_accessor(symbol)
     self.class.send(:attr_accessor, symbol)
+end
+
+
+
+class Object
+    def deep_clone
+      return @deep_cloning_obj if @deep_cloning
+      @deep_cloning_obj = clone
+      @deep_cloning_obj.instance_variables.each do |var|
+        val = @deep_cloning_obj.instance_variable_get(var)
+        begin
+          @deep_cloning = true
+          val = val.deep_clone
+        rescue TypeError
+          next
+        ensure
+          @deep_cloning = false
+        end
+        @deep_cloning_obj.instance_variable_set(var, val)
+      end
+      deep_cloning_obj = @deep_cloning_obj
+      @deep_cloning_obj = nil
+      deep_cloning_obj
+    end
 end

data/lib/cocoapods_plugin.rb

@@ -1,9 +1,2 @@
-require 'cocoapods-binary/tool/tool'
-
-require 'cocoapods-binary/podfile_options'
-require 'cocoapods-binary/prebuild_sandbox'
-
-require 'cocoapods-binary/Integration'
-require 'cocoapods-binary/Prebuild'
 require 'cocoapods-binary/Main'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
 platform: ruby
 authors:
 - leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A longer description of cocoapods-binary.