lg_pod_plugin 1.1.6.0 → 1.1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf74181198e5c879bdbf6ef84ca2de6286d56fa355665a9f68db20fda87b9ba
-  data.tar.gz: bc480be0ff2a011c60aa23a48355c03c6b329c0a6360708c9c7aa5e1a26b44a2
+  metadata.gz: 75b2349a1ddeb538035e926a25be2f3a18589e307c158dce81e3282e9c656e5d
+  data.tar.gz: 284ee67f49b9d6dba2123aba1c0649f8c525a5528666f772568a81c24c489b87
 SHA512:
-  metadata.gz: ce2163d8778eb68adef6fec76595ba9a2cd66be2abea079011c8294155b30f84d48bc659dc510f27e046a1637a9e554357e81d3ceb5cb0a45a11e23f364d34f7
-  data.tar.gz: 79005659b57432323474fc0237f1c0e01aff28602d6d72cd349e42f8e6ef755b2fc09519f3f577c4a483d17275cc2dac4bd0491d776a349aefbf32d8ceab234c
+  metadata.gz: dd8f333635e20d8f19a76bb0077ba52e48dd92d700941b22584ec5c875044ff827dec95eba287f8af1f820ac592140b98d76869f29b5d38e5fd21678e9c4ca08
+  data.tar.gz: 99c8fe2a58f062dc236862e2af6802afa2d7832a8a3a0a9c4d2c1ba9a1c814c18fb51fd8bde6686e301e4a9d61a1baef1bb77f7c788f51d0ae347c6167c922a6

data/lib/lg_pod_plugin/downloader/downloader.rb

@@ -54,10 +54,8 @@ module LgPodPlugin
       # 发现本地有缓存, 不需要更新缓存
       pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
       if pod_is_exist
-        is_delete = self.request.params["is_delete"] ||= false
-        LProject.shared.need_update_pods.delete(name) if is_delete
         LgPodPlugin.log_green "find the cache of `#{name}`, you can use it now."
-         nil
+        return nil
       else
         LgPodPlugin.log_green "find the new commit of `#{name}`, Git downloading now."
         # 本地 git 下载 pod 目录

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -17,7 +17,7 @@ module LgPodPlugin
       if (File.exist?(destination) && !destination.children.empty?) && cache_pod_spec.exist?
         return [true, destination, cache_pod_spec]
       else
-        [false, destination, cache_pod_spec]
+        return [false, destination, cache_pod_spec]
       end
     end
 
@@ -58,12 +58,12 @@ module LgPodPlugin
       Pathname.new(path.to_path + '.podspec.json')
     end
 
-    def self.cached_spec(request)
-      path = path_for_spec(request)
-      path.file? && Specification.from_file(path)
-    rescue JSON::ParserError
-      nil
-    end
+    # def self.cached_spec(request)
+    #   path = path_for_spec(request)
+    #   path.file? && Specification.from_file(path)
+    # rescue JSON::ParserError
+    #   nil
+    # end
 
     def self.get_local_spec(request, target)
       result = Pod::Downloader::Response.new
@@ -86,7 +86,7 @@ module LgPodPlugin
       [result, local_specs]
     end
 
-    def self.group_sub_specs_by_platform(spec)
+    def self.group_subspecs_by_platform(spec)
       specs_by_platform = {}
       [spec, *spec.recursive_subspecs].each do |ss|
         ss.available_platforms.each do |platform|
@@ -98,7 +98,7 @@ module LgPodPlugin
     end
 
     def self.copy_and_clean(source, destination, spec)
-      specs_by_platform = group_sub_specs_by_platform(spec)
+      specs_by_platform = group_subspecs_by_platform(spec)
       destination.parent.mkpath
       self.write_lock(destination) do
         FileUtils.rm_rf(destination)
@@ -109,7 +109,8 @@ module LgPodPlugin
     end
 
     def self.clean_pod_unused_files(destination, spec)
-      specs_by_platform = group_sub_specs_by_platform(spec)
+      specs_by_platform = group_subspecs_by_platform(spec)
+      destination.parent.mkpath
       self.write_lock(destination) do
         Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
         Pod::Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
@@ -117,37 +118,37 @@ module LgPodPlugin
     end
 
     def self.write_lock(location, &block)
-      self.lock(location, File::LOCK_EX, &block)
-    end
-
-    def self.lock(location, lock_type)
-      raise ArgumentError, 'no block given' unless block_given?
-      lockfile = "#{location}.lock"
-      f = nil
-      loop do
-        f.close if f
-        f = File.open(lockfile, File::CREAT, 0o644)
-        f.flock(lock_type)
-        break if self.valid_lock?(f, lockfile)
-      end
-      begin
-        yield location
-      ensure
-        if lock_type == File::LOCK_SH
-          f.flock(File::LOCK_EX)
-          File.delete(lockfile) if self.valid_lock?(f, lockfile)
-        else
-          File.delete(lockfile)
-        end
-        f.close
-      end
-    end
-
-    def self.valid_lock?(file, filename)
-      file.stat.ino == File.stat(filename).ino
-    rescue Errno::ENOENT
-      false
-    end
+      Pod::Downloader::Cache.lock(location, File::LOCK_SH, &block)
+    end
+
+    # def self.lock(location, lock_type)
+    #   raise ArgumentError, 'no block given' unless block_given?
+    #   lockfile = "#{location}.lock"
+    #   f = nil
+    #   loop do
+    #     f.close if f
+    #     f = File.open(lockfile, File::CREAT, 0o644)
+    #     f.flock(lock_type)
+    #     break if self.valid_lock?(f, lockfile)
+    #   end
+    #   begin
+    #     yield location
+    #   ensure
+    #     if lock_type == File::LOCK_SH
+    #       f.flock(File::LOCK_EX)
+    #       File.delete(lockfile) if self.valid_lock?(f, lockfile)
+    #     else
+    #       File.delete(lockfile)
+    #     end
+    #     f.close
+    #   end
+    # end
+
+    # def self.valid_lock?(file, filename)
+    #   file.stat.ino == File.stat(filename).ino
+    # rescue Errno::ENOENT
+    #   false
+    # end
 
     public
     def self.write_spec(spec, path)

data/lib/lg_pod_plugin/downloader/request.rb

@@ -24,12 +24,6 @@ module LgPodPlugin
         @lg_spec = pod.spec
       end
       self.preprocess_request
-      # require 'benchmark'
-      # col_width = 10
-      # Benchmark.bm(col_width) do |bm|
-      #   bm.report("time") do
-      #   end
-      # end
     end
 
     def preprocess_request
@@ -113,11 +107,6 @@ module LgPodPlugin
       hash_map[:git] = git if git
       if git && tag
         hash_map[:tag] = tag
-        if tag != lock_tag
-          hash_map["is_delete"] = false
-        else
-          hash_map["is_delete"] = true
-        end
         return hash_map
       elsif git && branch
         hash_map[:branch] = branch
@@ -127,7 +116,6 @@ module LgPodPlugin
           new_commit = pod_info[:sha] ||= ""
           if lock_branch == branch && new_commit == lock_commit
             hash_map[:commit] = lock_commit
-            hash_map["is_delete"] = true
             return hash_map
           end
         end
@@ -137,19 +125,7 @@ module LgPodPlugin
         elsif lock_commit && !lock_commit.empty?
           hash_map[:commit] = lock_commit
         end
-        if !new_commit || !lock_commit || new_commit.empty? || lock_commit.empty?
-          hash_map["is_delete"] = false
-        elsif new_commit != lock_commit
-          hash_map["is_delete"] = false
-        else
-          hash_map["is_delete"] = true
-        end
       elsif git && commit
-        if commit != lock_commit
-          hash_map["is_delete"] = false
-        else
-          hash_map["is_delete"] = true
-        end
         hash_map[:commit] = commit
         return hash_map
       else
@@ -173,7 +149,6 @@ module LgPodPlugin
             if new_branch
               hash_map[:branch] = new_branch
             end
-            hash_map["is_delete"] = true
             return hash_map
           end
         end
@@ -182,11 +157,6 @@ module LgPodPlugin
         if new_commit && !new_commit.empty?
           hash_map[:commit] = new_commit
         end
-        if !new_commit || new_commit.empty?
-          hash_map["is_delete"] = true
-        else
-          hash_map["is_delete"] = false
-        end
       end
       hash_map
     end

data/lib/lg_pod_plugin/installer/install.rb

@@ -21,7 +21,10 @@ module LgPodPlugin
     def install(pod)
       hash = pod.checkout_options
       path = hash[:path]
-      return nil if path
+      unless path.nil?
+        LProject.shared.need_update_pods[pod.name] = "1"
+        return nil
+      end
       @downloader = LDownloader.new(pod)
       self.download_params = @downloader.pre_download_pod
       return self.download_params
@@ -61,35 +64,32 @@ module LgPodPlugin
       else
         pod_is_exist = false
       end
-      if pod_is_exist
-        is_delete = request.params["is_delete"] ||= false
-        LProject.shared.need_update_pods.delete(name) if is_delete
+      return if pod_is_exist
+
+      git = checkout_options[:git]
+      return unless git
+      cache_podspec = request.lg_spec.spec if request.lg_spec
+      branch = checkout_options[:branch]
+      checkout_options[:name] = name if name
+      unless branch
+        branch = self.request.params[:branch] if request.params[:branch]
+        checkout_options[:branch] = branch if branch
+      end
+      lg_pod_path = LFileManager.cache_workspace(LProject.shared.workspace)
+      lg_pod_path.mkdir(0700) unless lg_pod_path.exist?
+      checkout_options[:path] = lg_pod_path
+      FileUtils.chdir lg_pod_path
+      git_clone = GitRepository.new(checkout_options)
+      download_params = git_clone.download
+      return unless download_params && File.exist?(download_params)
+      FileUtils.chdir download_params
+      if request.single_git
+        LgPodPlugin::LCache.cache_pod(name, download_params, { :git => git }, cache_podspec, request.released_pod)
       else
-        git = checkout_options[:git]
-        return unless git
-        cache_podspec = request.lg_spec.spec if request.lg_spec
-        branch = checkout_options[:branch]
-        checkout_options[:name] = name if name
-        unless branch
-          branch = self.request.params[:branch] if request.params[:branch]
-          checkout_options[:branch] = branch if branch
-        end
-        lg_pod_path = LFileManager.cache_workspace(LProject.shared.workspace)
-        lg_pod_path.mkdir(0700) unless lg_pod_path.exist?
-        checkout_options[:path] = lg_pod_path
-        FileUtils.chdir lg_pod_path
-        git_clone = GitRepository.new(checkout_options)
-        download_params = git_clone.download
-        return unless download_params && File.exist?(download_params)
-        FileUtils.chdir download_params
-        if request.single_git
-          LgPodPlugin::LCache.cache_pod(name, download_params, { :git => git }, cache_podspec, request.released_pod)
-        else
-          LgPodPlugin::LCache.cache_pod(name, download_params, request.get_cache_key_params, cache_podspec, request.released_pod)
-        end
-        FileUtils.chdir(LFileManager.download_director)
-        FileUtils.rm_rf(download_params)
+        LgPodPlugin::LCache.cache_pod(name, download_params, request.get_cache_key_params, cache_podspec, request.released_pod)
       end
+      FileUtils.chdir(LFileManager.download_director)
+      FileUtils.rm_rf(download_params)
 
     end
 

data/lib/lg_pod_plugin/installer/main.rb

@@ -44,7 +44,9 @@ module LgPodPlugin
           installer = LPodInstaller.new
           download_params = installer.install(pod)
           if download_params
-            all_installers[download_params["name"]] = installer
+            name = download_params["name"]
+            all_installers[name] = installer
+            LProject.shared.need_update_pods[name] = "1"
           end
         end
       end

data/lib/lg_pod_plugin/installer/project.rb

@@ -35,7 +35,7 @@ module LgPodPlugin
       end
       @cache_specs = Hash.new
       @external_pods = Hash.new.merge!(external_pods)
-      @need_update_pods = Hash.new.merge!(external_pods)
+      @need_update_pods = Hash.new
       @redirect_url_hash = Hash.new
       return self
     end

data/lib/lg_pod_plugin/pod/release-pod.rb

@@ -21,7 +21,7 @@ module LgPodPlugin
     end
 
     def self.resolve_dependencies(lockfile, installer)
-      installer.resolve_dependencies
+      installer.send(:resolve_dependencies)
       external_pods = LProject.shared.external_pods ||= {}
       analysis_result = installer.send(:analysis_result)
       return unless analysis_result
@@ -47,8 +47,7 @@ module LgPodPlugin
             http = "https://ghproxy.com/" + http
             source["http"] = http
           end
-          version = attributes_hash["version"]
-          requirements = {:http => http, :version => version}
+          requirements = {:http => http }
         elsif git && tag
           tag = tag.to_s unless LUtils.is_a_string? tag
           requirements = { :git => git, :tag => tag }
@@ -74,14 +73,17 @@ module LgPodPlugin
       # 通过 swift 可执行文件进行异步下载任务
       LgPodPlugin::Concurrency.async_download_pods all_installers
     end
+    
 
-    def self.dependencies(installer)
-      installer.download_dependencies
+    def self.download_dependencies(installer)
+      installer.send(:download_dependencies)
       installer.send(:validate_targets)
+      installer.send(:clean_sandbox)
       installation_options = installer.send(:installation_options)
       skip_pods_project_generation = installation_options.send(:skip_pods_project_generation)
       if skip_pods_project_generation
         installer.show_skip_pods_project_generation_message
+        installer.send(:run_podfile_post_install_hooks)
       else
         installer.integrate
       end
@@ -132,7 +134,7 @@ module LgPodPlugin
         raise Pod::Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
       end
     end
-
+    
     def self.install_release_pod(update, repo_update, verbose, clean_install)
       #切换工作目录到当前工程下, 开始执行pod install
       workspace = LProject.shared.workspace
@@ -173,7 +175,7 @@ module LgPodPlugin
       installer.clean_install = clean_install
       installer.prepare
       resolve_dependencies(lockfile, installer)
-      dependencies(installer)
+      download_dependencies(installer)
     end
 
   end

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.6.0"
+  VERSION = "1.1.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.6.0
+  version: 1.1.6.3
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement