bd_pod_cache_lock 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f06457454a7e8cf5a0a07b8af301b3cdd199ead72a469ae7464397226cf166
-  data.tar.gz: 5f7e6c150730e4956a2dc7d530a8259b7e0392ed415963091c0da04a40f4bc44
+  metadata.gz: 6629c951a4631ea0570c53146e1dfc572676c404fa811d6315a69dab046e92a9
+  data.tar.gz: a2e8752abf48edc1e51d2843ea8e682f459aa1e9f39586b5e5f871728def4326
 SHA512:
-  metadata.gz: 3d6eb03c5b46f7fc772d550f3397044bf180de8f436e26b17172fa81bd04b696b2c5469acfe371a84b8182605f82f32715fd3d04bd92dfeda9d7d617ebb332fa
-  data.tar.gz: 630d515b7ccc9c7f0cf671abc04f0ffccae1eb5c71391a6073f634484e032b6dc1cb86e325eb9ed876fc67a8e03e11327fef4c4752160b9d464969ca3e25d865
+  metadata.gz: 1d0ccf81d22bad9d97472676730b7fc6a6e9fc3eaabfa48847d82b8b447e2481d71794fdd969d2b44651e19d821f1a3c93f0b3723759ea7e95737c301f72f715
+  data.tar.gz: 07d8e56b92cd3040240450e239d7676b06ce6c1cc21348b5f353c4a866d7c69dfe05031b6be1ceadd90431cd84a295c1fac39fb6ac8c2afa3ee49ab821f83925

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bd_pod_cache_lock (1.0.0)
+    bd_pod_cache_lock (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/bd_pod_cache_lock.rb

@@ -4,93 +4,80 @@ require 'tmpdir'
 require 'digest/sha1'
 
 ROOT_PROCESS_ID = Process.pid
+$locked = false
 
-$pod_cache_lock_dir = Pod::Config.instance.cache_root + 'Pods' + 'CacheLock'
+$pod_cache_dir = Pod::Config.instance.cache_root + 'Pods'
+$pod_cache_lock_dir = $pod_cache_dir + 'CacheLock'
+$pod_install_lock_file = $pod_cache_dir + 'pod_install.lock'
 
 at_exit do
-  if(Process.pid == ROOT_PROCESS_ID)
-    FileUtils.rm_rf($pod_cache_lock_dir)
-    puts "Unlocked"
+  if(Process.pid == ROOT_PROCESS_ID && $locked)
+    FileUtils.rm_rf($pod_install_lock_file)
+    puts "UnLock Pod install"
   end
 end
 
 module Pod
-  module Downloader
-    # The class responsible for managing Pod downloads, transparently caching
-    # them in a cache directory.
+  class Installer
+    # Installs the Pods.
     #
-    class Cache
-
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @param  [Hash<Symbol,String>] slug_opts
-      #         the download options that should be used in constructing the
-      #         cache slug for this request.
-      #
-      # @return [String] The lock file path for the Pod downloaded from the given
-      #         `request`.
-      #
-      def lock_path_for_pod(request, slug_opts = {})
-        lock_dir = root + "CacheLock"
-        Dir.mkdir($pod_cache_lock_dir) unless Dir.exist?($pod_cache_lock_dir)
-        request_sha1 = Digest::SHA1.hexdigest(request.slug(slug_opts))
-        return ($pod_cache_lock_dir + request_sha1).to_s + '.lock'
-      end
-
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @return [Response] The download response for the given `request` that
-      #         was not found in the download cache.
-      #
-      def uncached_pod(request)
-        in_tmpdir do |target|
-          result, podspecs = download(request, target)
-          result.location = nil
-
-          podspecs.each do |name, spec|
-            destination = path_for_pod(request, :name => name, :params => result.checkout_options)
-
-            destination.parent.mkpath
-            lock_file_path = lock_path_for_pod(request, :name => name, :params => result.checkout_options)
-
-            puts lock_file_path
-            File.new(lock_file_path, File::CREAT) unless File.exist? lock_file_path
-            File.open(lock_file_path) do |file|
-              flock(file, File::LOCK_EX) { copy_and_clean(target, destination, spec) }
-            end
+    # The installation process is mostly linear with a few minor complications
+    # to keep in mind:
+    #
+    # - The stored podspecs need to be cleaned before the resolution step
+    #   otherwise the sandbox might return an old podspec and not download
+    #   the new one from an external source.
+    # - The resolver might trigger the download of Pods from external sources
+    #   necessary to retrieve their podspec (unless it is instructed not to
+    #   do it).
+    #
+    # @return [void]
+    #
+    def install!
+      Dir.mkdir($pod_cache_dir) unless Dir.exist?($pod_cache_dir)
 
-            write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
-            if request.name == name
-              result.location = destination
-            end
-          end
+      lock_file_path = $pod_install_lock_file
 
-          result
-        end
+      File.new(lock_file_path, File::CREAT) unless File.exist? lock_file_path
+      File.open(lock_file_path) do |file|
+        flock(file, File::LOCK_EX) { 
+          puts "Lock Pod install"
+          $locked = true
+          prepare
+          resolve_dependencies
+          download_dependencies
+        }
+      end
+      
+      validate_targets
+      generate_pods_project
+      if installation_options.integrate_targets?
+        integrate_user_project
+      else
+        UI.section 'Skipping User Project Integration'
       end
+      perform_post_install_actions
+    end
 
-      # @param  [File] file
-      #         should be locked file.
-      #
-      # @param  [mode] mode
-      #         the file lock mode.
-      #
-      # @return [Boolean] The result of lock specific file and mode.
-      #
-      def flock(file, mode)
-        success = file.flock(mode)
-        if success
-          begin
-            yield file
-          ensure
-            file.flock(File::LOCK_UN)
-          end
+    # @param  [File] file
+    #         should be locked file.
+    #
+    # @param  [mode] mode
+    #         the file lock mode.
+    #
+    # @return [Boolean] The result of lock specific file and mode.
+    #
+    def flock(file, mode)
+      success = file.flock(mode)
+      if success
+        begin
+          yield file
+        ensure
+          file.flock(File::LOCK_UN)
         end
-        success
       end
-
+      success
     end
   end
 end
+

data/lib/bd_pod_cache_lock/version.rb

@@ -1,3 +1,3 @@
 module BdPodCacheLock
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bd_pod_cache_lock
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - liuyan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler