lg_pod_plugin 1.1.6.3 → 1.1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b2349a1ddeb538035e926a25be2f3a18589e307c158dce81e3282e9c656e5d
-  data.tar.gz: 284ee67f49b9d6dba2123aba1c0649f8c525a5528666f772568a81c24c489b87
+  metadata.gz: aa46fff13f24c1345099a41de0fd69d57f52ea6d701944c964dc602fc71f82be
+  data.tar.gz: 1918987895e07fed61e3a07e521f571210472f0baade5aad98e91a0a19145dd7
 SHA512:
-  metadata.gz: dd8f333635e20d8f19a76bb0077ba52e48dd92d700941b22584ec5c875044ff827dec95eba287f8af1f820ac592140b98d76869f29b5d38e5fd21678e9c4ca08
-  data.tar.gz: 99c8fe2a58f062dc236862e2af6802afa2d7832a8a3a0a9c4d2c1ba9a1c814c18fb51fd8bde6686e301e4a9d61a1baef1bb77f7c788f51d0ae347c6167c922a6
+  metadata.gz: 81ff396511000ce3a021c365d2dd1d5959373e5d3005af4c768a09bd22fd203ba0e858ab9d79d4e128428b0cc358f1dbe23f6c32490316551d70dc1783d83cac
+  data.tar.gz: e8354d1b63266ec23978d13c6abcdac7a2a2b9e137f00cedc83ee1712fb19928d9c96fac552df26d9550b2eb2d77ed712c17b44ce01cba47395db1d2192ea34c

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

@@ -82,27 +82,11 @@ 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
@@ -110,53 +94,15 @@ module LgPodPlugin
         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
-            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
+        hash_map[:commit] = new_commit if new_commit
       elsif git && commit
         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
-            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
+        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/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/version.rb

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