lg_pod_plugin 1.1.6.2 → 1.1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec02e7287d7905d93048a8620d22946077d9b60078df1531986db93559cd6d4
-  data.tar.gz: a13a7706ad353e97a931fcd96581f20d70e2c6aaef4d63c5dbf3eb1c7fa698a1
+  metadata.gz: aa46fff13f24c1345099a41de0fd69d57f52ea6d701944c964dc602fc71f82be
+  data.tar.gz: 1918987895e07fed61e3a07e521f571210472f0baade5aad98e91a0a19145dd7
 SHA512:
-  metadata.gz: b930234998ecfaa0376344d2e4c9efd74cb4be730bbd6e0379fad087718355e24805babe26443019a791df623fe1938c6e8d71def6480ec2b85f1505fd928c8a
-  data.tar.gz: ab48391439c46f2730f0133c9350ee256cc6bfb3690a142588da6633d6c0516b88c6d26e5e46b90ba3deafebe3ac9b78598b1a87b38c9290fc38c395da762bd9
+  metadata.gz: 81ff396511000ce3a021c365d2dd1d5959373e5d3005af4c768a09bd22fd203ba0e858ab9d79d4e128428b0cc358f1dbe23f6c32490316551d70dc1783d83cac
+  data.tar.gz: e8354d1b63266ec23978d13c6abcdac7a2a2b9e137f00cedc83ee1712fb19928d9c96fac552df26d9550b2eb2d77ed712c17b44ce01cba47395db1d2192ea34c

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

@@ -121,35 +121,6 @@ module LgPodPlugin
       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)
       path.dirname.mkpath

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
@@ -88,105 +82,27 @@ module LgPodPlugin
 
     public
     def get_lock_params
-      begin
-        _release_pods = self.lockfile.release_pods ||= []
-        _external_source = (self.lockfile.external_sources_data[self.name])
-        _external_source = {} unless _external_source
-        _checkout_options = self.lockfile.checkout_options_for_pod_named(self.name)
-      rescue
-        _release_pods = {}
-        _external_source = {}
-        _checkout_options = {}
-      end
-
       git = self.checkout_options[:git]
       tag = self.checkout_options[:tag]
       commit = self.checkout_options[:commit]
       branch = self.checkout_options[:branch]
 
-      lock_git = _external_source[:git] ||= _checkout_options[:git]
-      lock_tag = _external_source[:tag] ||= _release_pods[self.name]
-      lock_branch = _external_source[:branch] ||= ""
-      lock_commit = _checkout_options[:commit] ||= ""
-
       hash_map = Hash.new
       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
-        if lock_commit && !lock_commit.empty? && !LProject.shared.update
-          pod_info = LSqliteDb.shared.query_branch_with_sha(self.name, git, lock_commit)
-          lock_branch = pod_info[:branch] if lock_branch.empty?
-          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
         _, new_commit = git_ls_remote_refs(self.name, git, branch)
-        if new_commit && !new_commit.empty?
-          hash_map[:commit] = new_commit
-        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
+        hash_map[:commit] = new_commit if new_commit
       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
-        if lock_git && !LProject.shared.update
-          id = LPodLatestRefs.get_pod_id(self.name, git)
-          pod_info = LSqliteDb.shared.query_pod_refs(id)
-          if pod_info&.commit
-            if pod_info
-              new_commit = pod_info.commit
-            else
-              new_commit = nil
-            end
-            if pod_info
-              new_branch = pod_info.branch
-            else
-              new_branch = nil
-            end
-            if new_commit
-              hash_map[:commit] = new_commit
-            end
-            if new_branch
-              hash_map[:branch] = new_branch
-            end
-            hash_map["is_delete"] = true
-            return hash_map
-          end
-        end
         new_branch, new_commit = git_ls_remote_refs(self.name, git, nil)
         hash_map[:branch] = new_branch if new_branch
-        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
+        hash_map[:commit] = new_commit if new_commit
       end
       hash_map
     end

data/lib/lg_pod_plugin/git/github_api.rb

@@ -22,6 +22,7 @@ module LgPodPlugin
       else
         request_url += ("/commits/" + "HEAD")
       end
+      LgPodPlugin.log_blue "http reqeust: #{request_url}"
       begin
         uri = URI(request_url)
         res = Net::HTTP.get_response(uri)

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -178,11 +178,11 @@ module LgPodPlugin
         end
         return self.use_default_refs_heads git, branch
       end
-      commit, _ = GithubAPI.request_github_refs_heads git, branch
+      commit, _ = self.use_default_refs_heads git, branch
       if commit
         return [commit, branch]
       else
-        return self.use_default_refs_heads git, branch
+        return GithubAPI.request_github_refs_heads git, branch
       end
     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/net/l_uri.rb

@@ -29,24 +29,25 @@ module LgPodPlugin
         origin_uri = URI(git)
       end
       return if origin_uri.nil?
-      redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
-      if redirect_url
-        @uri = redirect_url
-      else
-        @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
-        LProject.shared.redirect_url_hash[origin_uri.host] = @uri
-      end
+      @uri = origin_uri
+      # redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
+      # if redirect_url
+      #   @uri = redirect_url
+      # else
+      #   @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
+      #   LProject.shared.redirect_url_hash[origin_uri.host] = @uri
+      # end
       @host = @uri.host
       @scheme = @uri.scheme ||= "https"
       @hostname =  @scheme + "://" + @host
     end
 
-    def get_redirect_url(host)
-      redirect_url = Net::HTTP.get_response(URI(host))['location']
-      return host unless redirect_url
-      uri = URI(redirect_url)
-      return uri.scheme + "://" + uri.host
-    end
+    # def get_redirect_url(host)
+    #   redirect_url = Net::HTTP.get_response(URI(host))['location']
+    #   return host unless redirect_url
+    #   uri = URI(redirect_url)
+    #   return uri.scheme + "://" + uri.host
+    # end
 
     private
     #判断是否是 IP 地址

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.4"
 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.4
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods