lg_pod_plugin 1.1.5.6 → 1.1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a582e75b0b0847e488e68ee221be42aca9fe30556d85a9e280ff8e46a0a729
-  data.tar.gz: bfab01e6cc1f088c88c571157f8b42376b821e709725bff99f0d47cb62697a6e
+  metadata.gz: ce8fcf508c4622d896bc35d848db7c9d8238648722e38cde3dca35f5b30a5c42
+  data.tar.gz: 756567c34b08dc9d99af1f8f9c4fd8a3adf527d60afd4155315ed4c2e7a89616
 SHA512:
-  metadata.gz: 4049ace3059b7139348e5c36e700fdc52f5d7bb33f768cc45092ae618c99bcef44747de19bcfc41b204f01d5c10587d9453d724b500b5715165509d8e59df61f
-  data.tar.gz: 1941ad03e70d5a9d5e4bbb7496ac3b4df5f2ee037c10dd9fee6209bed74d7900163b9bacac8041572c740ba4fabc8617997862f58c5c1f5d18a3c9187fa84dda
+  metadata.gz: 0e35116e0824a397cfb7021ed6ffa793d1143f3300b8eab09c827a93e704292ed13b38bab506b8754ad3379d7fc682c34d537516545c2c4e9c89581158f399e3
+  data.tar.gz: defe217180c036512d189a183d7ad1ce1a20a6b90bbdc56ef957851c55d6bcfee279fbfeb5ce64ac8a762fda002b76c5601ae4f57ad6449e21cfe3984e304c9f

data/lib/lg_pod_plugin/downloader/downloader.rb

@@ -50,11 +50,7 @@ module LgPodPlugin
       end
       hash_map = self.request.get_cache_key_params
       # 发现本地有缓存, 不需要更新缓存
-      if self.request.single_git
-        pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
-      else
-        pod_is_exist, destination, cache_pod_spec = LCache.new.pod_cache_exist(name, hash_map, podspec, self.request.released_pod)
-      end
+      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
@@ -102,7 +98,6 @@ module LgPodPlugin
                 download_params.delete("podspec_content")
               end
             end
-            FileUtils.rm_rf podspec_path
           end
           return download_params
         elsif File.exist?(download_params.to_s) && download_params

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -14,8 +14,8 @@ module LgPodPlugin
     public
     def pod_cache_exist(name, options, spec = nil, released_pod = false)
       destination, cache_pod_spec = self.find_pod_cache name, options, spec, released_pod
-      if (File.exist?(destination) && !destination.children.empty?)
-        [true, destination, cache_pod_spec]
+      if (File.exist?(destination) && !destination.children.empty?) && cache_pod_spec.exist?
+        return [true, destination, cache_pod_spec]
       else
         [false, destination, cache_pod_spec]
       end

data/lib/lg_pod_plugin/git/gitlab_archive.rb

@@ -68,17 +68,17 @@ module LgPodPlugin
         end
         pod_spec_file_path = sandbox_path.join("#{podspec_filename}")
         lg_spec = LgPodPlugin::PodSpec.form_string(podspec_content, pod_spec_file_path)
-        unless lg_spec
-          if podspec_content
-            begin
-              File.open(pod_spec_file_path, "w+") do |f|
-                f.write podspec_content
-              end
-            rescue => exception
-              LgPodPlugin.log_red "#{exception}"
+        if podspec_content
+          begin
+            File.open(pod_spec_file_path, "w+") do |f|
+              f.write podspec_content
             end
-            @podspec_content = podspec_content
+          rescue => exception
+            LgPodPlugin.log_red "#{exception}"
           end
+          @podspec_content = podspec_content
+        end
+        unless lg_spec
           download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2\\?" + "sha\\=#{sha}"
           download_url += "\\&access_token\\=#{token}" if token
           return [{ "filename" => "#{self.name}.tar.bz2", "url" => download_url }]

data/lib/lg_pod_plugin/installer/install.rb

@@ -37,29 +37,13 @@ module LgPodPlugin
       if request.lg_spec
         cache_podspec = request.lg_spec.spec
       else
-        cache_podspec = nil
-      end
-
-      unless cache_podspec
         cache_podspec = LProject.shared.cache_specs[name]
         request.lg_spec = LgPodPlugin::PodSpec.form_pod_spec cache_podspec if cache_podspec
       end
-
-      if cache_podspec
-        destination = self.download_params["destination"]
-        if destination && File.exist?(destination) && !Pathname(destination).children.empty?
-          pod_is_exist = true
-        else
-          pod_is_exist = false
-        end
-      else
-        destination = self.download_params["destination"]
-        if destination && File.exist?(destination) && !Pathname(destination).children.empty?
-          pod_is_exist = true
-        else
-          pod_is_exist = false
-        end
-        cache_pod_spec_path = self.download_params["cache_pod_spec_path"]
+      destination = self.download_params["destination"]
+      cache_pod_spec_path = self.download_params["cache_pod_spec_path"]
+      # podspec.json 不存在
+      unless cache_podspec
         local_spec_path = destination.glob("#{name}.podspec{,.json}").last
         if local_spec_path && File.exist?(local_spec_path)
           cache_podspec = Pod::Specification.from_file local_spec_path
@@ -71,6 +55,12 @@ module LgPodPlugin
         end
         request.lg_spec = LgPodPlugin::PodSpec.form_pod_spec cache_podspec if cache_podspec
       end
+      # 判断缓存是否下载成功
+      if (destination && File.exist?(destination) && !Pathname(destination).children.empty?) && (cache_pod_spec_path && File.exist?(cache_pod_spec_path))
+        pod_is_exist = true
+      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

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.5.6"
+  VERSION = "1.1.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.5.6
+  version: 1.1.5.7
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods