lg_pod_plugin 1.1.5.5 → 1.1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aac9e3f7ae1ac1bec1f38f9faf0484bf7f79cd4f7cd70030203ac802b0c892e
-  data.tar.gz: 9c22ae4997c0bf795021a4bb1ab905786af8c585622398560fe8e97a5ca4ed27
+  metadata.gz: ce8fcf508c4622d896bc35d848db7c9d8238648722e38cde3dca35f5b30a5c42
+  data.tar.gz: 756567c34b08dc9d99af1f8f9c4fd8a3adf527d60afd4155315ed4c2e7a89616
 SHA512:
-  metadata.gz: caf7d0bd717856e93ab3c3f699c44879e69ae29762864c5d9d1a174b5e09ae800a87e8d3951bd23f071125e11232129449616a1ec971c26ba132ccaf956ce402
-  data.tar.gz: 81b84ca084996f062d6e33c26cc09001cb2cbacb50fea6c81fe8fb4b793be3e69fadf4f27387b1223d0d5e6ae6bc6e74d3dac160144d733597cc0598106b3ef9
+  metadata.gz: 0e35116e0824a397cfb7021ed6ffa793d1143f3300b8eab09c827a93e704292ed13b38bab506b8754ad3379d7fc682c34d537516545c2c4e9c89581158f399e3
+  data.tar.gz: defe217180c036512d189a183d7ad1ce1a20a6b90bbdc56ef957851c55d6bcfee279fbfeb5ce64ac8a762fda002b76c5601ae4f57ad6449e21cfe3984e304c9f

data/lib/command/install.rb

@@ -3,7 +3,7 @@ require 'claide'
 module LgPodPlugin
   class Command
     class Install < Command
-      REQUIRED_ATTRS ||= %i[log repo_update].freeze
+      REQUIRED_ATTRS ||= %i[log repo_update clean_install].freeze
       attr_accessor(*REQUIRED_ATTRS)
 
       self.summary = 'Install project dependencies according to versions from a Podfile.lock'
@@ -40,14 +40,24 @@ module LgPodPlugin
 
       def initialize(argv)
         self.log = argv.flag?('verbose')
-        self.repo_update = argv.flag?('repo-update')
+        repo_flag = argv.flag?('repo-update')
+        if repo_flag.nil?
+          self.repo_update = true
+        else
+          self.repo_update = repo_flag
+        end
+        if argv.flag?('clean-install').nil?
+          @clean_install = false
+        else
+          @clean_install = true
+        end
         super
       end
 
       def run
 
         begin_time = Time.now.to_i
-        LgPodPlugin::Main.run("install", { :verbose => self.log, :repo_update => self.repo_update })
+        LgPodPlugin::Main.run("install", { :verbose => self.log, :repo_update => self.repo_update, :clean_install => self.clean_install })
         end_time = Time.now.to_i
         LgPodPlugin.log_blue "`lg install`安装所需时间: #{end_time - begin_time}"
       end

data/lib/command/update.rb

@@ -2,7 +2,7 @@ require 'claide'
 module LgPodPlugin
   class Command
     class Update < Command
-      REQUIRED_ATTRS ||= %i[log repo_update].freeze
+      REQUIRED_ATTRS ||= %i[log repo_update clean_install].freeze
       attr_accessor(*REQUIRED_ATTRS)
       self.summary = 'Update outdated project dependencies and create new ' \
         'Podfile.lock'
@@ -27,13 +27,23 @@ module LgPodPlugin
 
       def initialize(argv)
         self.log = argv.flag?('verbose')
-        self.repo_update = argv.flag?('repo-update')
+        repo_flag = argv.flag?('repo-update')
+        if repo_flag.nil?
+          self.repo_update = true
+        else
+          self.repo_update = repo_flag
+        end
+        if argv.flag?('clean-install').nil?
+          @clean_install = false
+        else
+          @clean_install = true
+        end
         super
       end
 
       def run
         begin_time = Time.now.to_i
-        LgPodPlugin::Main.run("update", { :verbose => self.log, :repo_update => self.repo_update})
+        LgPodPlugin::Main.run("update", { :verbose => self.log, :repo_update => self.repo_update, :clean_install => self.clean_install })
         end_time = Time.now.to_i
         LgPodPlugin.log_blue "`lg update`安装所需时间: #{end_time - begin_time}"
       end

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/github_archive.rb

@@ -37,11 +37,6 @@ module LgPodPlugin
     def github_download_tag_zip(root_path)
       project_name = LUtils.get_git_project_name self.git
       download_urls = self.download_archive_zip(project_name)
-      # unless self.spec
-      #   podspec_filename = self.name + ".podspec"
-      #   podspec_content = GithubAPI.get_podspec_file_content self.git, self.commit, podspec_filename
-      #   self.spec = LgPodPlugin::PodSpec.form_string(podspec_content, root_path + "/#{podspec_filename}") if podspec_content
-      # end
       download_params = Hash.new
       download_params["name"] = self.name
       download_params["type"] = "github-tag"
@@ -54,7 +49,6 @@ module LgPodPlugin
       else
         download_params["podspec"] = nil
         download_params["source_files"] = ["All"]
-        # download_params["podspec_content"] = podspec_content if podspec_content
       end
       download_params
     end
@@ -62,11 +56,6 @@ module LgPodPlugin
     def github_download_branch_zip(root_path)
       project_name = LUtils.get_git_project_name self.git
       download_urls = self.download_archive_zip(project_name)
-      # unless self.spec
-      #   podspec_filename = self.name + ".podspec"
-      #   podspec_content = GithubAPI.get_podspec_file_content self.git, self.commit, podspec_filename
-      #   self.spec = LgPodPlugin::PodSpec.form_string(podspec_content, root_path + "/#{podspec_filename}") if podspec_content
-      # end
       download_params = Hash.new
       download_params["name"] = self.name
       download_params["type"] = "github-branch"
@@ -78,7 +67,6 @@ module LgPodPlugin
       else
         download_params["podspec"] = nil
         download_params["source_files"] = ["All"]
-        # download_params["podspec_content"] = podspec_content if podspec_content
       end
       download_params
     end
@@ -86,11 +74,6 @@ module LgPodPlugin
     def github_download_commit_zip(root_path)
       project_name = LUtils.get_git_project_name self.git
       download_urls = self.download_archive_zip(project_name)
-      # unless self.spec
-      #   podspec_filename = self.name + ".podspec"
-      #   podspec_content = GithubAPI.get_podspec_file_content self.git, self.commit, podspec_filename
-      #   self.spec = LgPodPlugin::PodSpec.form_string(podspec_content, root_path + "/#{podspec_filename}") if podspec_content
-      # end
       download_params = Hash.new
       download_params["name"] = self.name
       download_params["type"] = "github-commit"
@@ -102,7 +85,6 @@ module LgPodPlugin
       else
         download_params["podspec"] = nil
         download_params["source_files"] = ["All"]
-        # download_params["podspec_content"] = podspec_content if podspec_content
       end
       download_params
     end
@@ -118,27 +100,9 @@ module LgPodPlugin
         repo_name = nil
       end
       return nil unless repo_name
-      # network_ok = false
-      # result = %x(ping gh.api.99988866.xyz -t 1)
-      # if !result || result == "" || result.include?("timeout")
-      #   network_ok = false
-      # else
-      #   network_ok = true
-      # end
       if self.git && self.tag
         download_url = "https://codeload.github.com/#{repo_name}/tar.gz/refs/tags/#{self.tag}"
         [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
-        # if network_ok
-        #   repo_info = GithubAPI.get_repo_info(repo_name)
-        #   html_url = repo_info["html_url"]
-        #   if html_url
-        #     base_url = html_url
-        #   end
-        #   download_url = "https://gh.api.99988866.xyz/#{base_url}/archive/refs/tags/#{self.tag}.tar.gz"
-        #   [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
-        # else
-        #
-        # end
       elsif self.git && self.branch
         if self.branch == "HEAD"
           download_url = "https://gh.api.99988866.xyz/" + "#{base_url}" + "/archive/#{self.branch}.tar.gz"
@@ -147,12 +111,6 @@ module LgPodPlugin
           download_url = "https://codeload.github.com/#{repo_name}/tar.gz/refs/heads/#{self.branch}"
           [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
         end
-        # if network_ok
-        #   download_url = "https://gh.api.99988866.xyz/#{base_url}/archive/#{self.branch}.tar.gz"
-        #   [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
-        # else
-        #
-        # end
       elsif self.git && self.commit
         download_url = "https://codeload.github.com/#{repo_name}/tar.gz/#{self.commit}"
         return [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]

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/installer/main.rb

@@ -31,7 +31,8 @@ module LgPodPlugin
       self.install_external_pod(project)
       # # 安装开发版本pod
       verbose = options[:verbose] ||= false
-      ReleasePod.install_release_pod(update, repo_update, verbose)
+      clean_install = options[:clean_install] ||= false
+      ReleasePod.install_release_pod(update, repo_update, verbose, clean_install)
     end
 
     def self.install_external_pod(project)

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

@@ -133,7 +133,7 @@ module LgPodPlugin
       end
     end
 
-    def self.install_release_pod(update, repo_update, verbose)
+    def self.install_release_pod(update, repo_update, verbose, clean_install)
       #切换工作目录到当前工程下, 开始执行pod install
       workspace = LProject.shared.workspace
       FileUtils.chdir(workspace)
@@ -170,7 +170,7 @@ module LgPodPlugin
         installer.update = false
       end
       installer.deployment = false
-      installer.clean_install = false
+      installer.clean_install = clean_install
       installer.prepare
       resolve_dependencies(lockfile, installer)
       dependencies(installer)

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.5.5"
+  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.5
+  version: 1.1.5.7
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods