lg_pod_plugin 1.1.6.2 → 1.1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec02e7287d7905d93048a8620d22946077d9b60078df1531986db93559cd6d4
-  data.tar.gz: a13a7706ad353e97a931fcd96581f20d70e2c6aaef4d63c5dbf3eb1c7fa698a1
+  metadata.gz: 75b2349a1ddeb538035e926a25be2f3a18589e307c158dce81e3282e9c656e5d
+  data.tar.gz: 284ee67f49b9d6dba2123aba1c0649f8c525a5528666f772568a81c24c489b87
 SHA512:
-  metadata.gz: b930234998ecfaa0376344d2e4c9efd74cb4be730bbd6e0379fad087718355e24805babe26443019a791df623fe1938c6e8d71def6480ec2b85f1505fd928c8a
-  data.tar.gz: ab48391439c46f2730f0133c9350ee256cc6bfb3690a142588da6633d6c0516b88c6d26e5e46b90ba3deafebe3ac9b78598b1a87b38c9290fc38c395da762bd9
+  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/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
@@ -75,8 +75,8 @@ module LgPodPlugin
     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)
@@ -175,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.2"
+  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.2
+  version: 1.1.6.3
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods