lg_pod_plugin 1.1.5.6 → 1.1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a582e75b0b0847e488e68ee221be42aca9fe30556d85a9e280ff8e46a0a729
-  data.tar.gz: bfab01e6cc1f088c88c571157f8b42376b821e709725bff99f0d47cb62697a6e
+  metadata.gz: ebaf5437bed598ffa64a8ed94863d10c05c0cfcb848e9edbf726ad212662878b
+  data.tar.gz: 1e10a6ad2ec5b02e8771a2580db0374d635998320aaa8739bb4bebcf80eba0ba
 SHA512:
-  metadata.gz: 4049ace3059b7139348e5c36e700fdc52f5d7bb33f768cc45092ae618c99bcef44747de19bcfc41b204f01d5c10587d9453d724b500b5715165509d8e59df61f
-  data.tar.gz: 1941ad03e70d5a9d5e4bbb7496ac3b4df5f2ee037c10dd9fee6209bed74d7900163b9bacac8041572c740ba4fabc8617997862f58c5c1f5d18a3c9187fa84dda
+  metadata.gz: 629fa53e19b009413466cd44b9c6ecf28bffcfd7e500524cdf449d4ef6ef0f298a925f7eb0390b734d0937f57712f7cc078227afbe60950d39a923f845b4c026
+  data.tar.gz: 7772b927826ef6fe0476db3933e9863b27a98aced13853b58583d3141cdf89c09ff5655e2da90e2258f82e1697155aa2a6c0d24d1bb1729b288df6b6b93578fe

data/lib/lg_pod_plugin/config/l_config.rb

@@ -23,7 +23,7 @@ module LgPodPlugin
       user_info = LSqliteDb.shared.query_user_info(user_id)
       # 用户授权 token 不存在, 提示用户输入用户名密码
       unless user_info
-        user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_id, nil, nil)
+        user_info = GitLabAPI.get_gitlab_access_token_input(uri, user_id,nil ,nil )
         return nil unless user_info
       end
       time_now = Time.now.to_i

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_api.rb

@@ -27,19 +27,10 @@ module LgPodPlugin
         uri = URI("#{host}/oauth/token")
         hash_map = { "grant_type" => "password", "username" => username, "password" => password }
         LgPodPlugin.log_green "开始请求 access_token, url => #{uri.to_s} "
-        req = Net::HTTP::Post.new(uri)
-        req.set_form_data(hash_map)
-        res = Net::HTTP.start((uri.hostname ||= ""), uri.port) do |http|
-          http.open_timeout = 15
-          http.read_timeout = 15
-          http.request(req)
-        end
-        case res
-        when Net::HTTPSuccess, Net::HTTPRedirection
-          json = JSON.parse(res.body)
-        else
-          json = JSON.parse(res.body)
-          error = json["error"]
+        req = Net::HTTP.post_form(uri, hash_map)
+        json = JSON.parse(req.body)
+        error = json["error"]
+        if error != nil
           if error == "invalid_grant"
             LSqliteDb.shared.delete_user_info(user_id)
           end
@@ -195,34 +186,7 @@ module LgPodPlugin
       end
     end
 
-    #获取项目中仓库文件和目录的列表
-    # def self.get_gitlab_repository_tree(host, token, project_id, sha)
-    #   begin
-    #     hash_map = Hash.new
-    #     hash_map["ref"] = sha
-    #     hash_map["access_token"] = token
-    #     hash_map["per_page"] = 50
-    #     uri = URI("#{host}/api/v4/projects/#{project_id}/repository/tree")
-    #     uri.query = URI.encode_www_form(hash_map)
-    #     res = Net::HTTP.get_response(uri)
-    #     if res.body
-    #       array = JSON.parse(res.body)
-    #     else
-    #       array = nil
-    #     end
-    #     return Set.new unless array && array.is_a?(Array)
-    #     files = array.collect { |dict|
-    #       dict["path"]
-    #     }
-    #     set = Set.new.merge files
-    #     return set
-    #   rescue
-    #     return Set.new
-    #   end
-    # end
-
     public
-
     def self.get_podspec_file_content(host, token, project_id, sha, filepath)
       begin
         hash_map = Hash.new

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/net/l_uri.rb

@@ -5,7 +5,6 @@ module LgPodPlugin
 
   class LURI
     public
-    attr_reader :ip
     attr_reader :path
     attr_reader :host
     attr_reader :scheme
@@ -29,53 +28,63 @@ module LgPodPlugin
         end
       end
       return unless uri
-      ip_address = getaddress(uri)
-      return unless ip_address
       if git.include?("ssh") || git.include?("git@gitlab") || git.include?("git@")
-        @uri = URI("http://#{ip_address}#{uri.path}")
+        redirect_url = get_redirect_url("https://#{uri.host}#{uri.path}")
+        @uri = URI(redirect_url)
       else
-        @uri = URI("#{uri.scheme}://#{ip_address}#{uri.path}")
+        redirect_url = get_redirect_url("#{uri.scheme}://#{uri.host}#{uri.path}")
+        @uri = URI(redirect_url)
       end
-      @ip = ip_address
       @host = @uri.host ||= ""
       @path = @uri.path ||= ""
       @scheme = @uri.scheme ||= ""
       @hostname =  @scheme + "://" + @host
     end
 
-    private
-    #判断是否是 IP 地址
-    def is_address(host)
-      match = %r{^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$}.match(host)
-      !(match.nil?)
-    end
-
-    # 获取 ip 地址
-    private
-    def getaddress(uri)
+    def get_redirect_url(host)
+      redirect_url = Net::HTTP.get_response(URI(host))['location']
       begin
-        if self.is_address(uri.host)
-          ip = uri.host
-          return ip
-        else
-          ip_address = Resolv.getaddress uri.host
-          return ip_address
-        end
+        uri = URI(redirect_url)
+        return uri.scheme + "://" + uri.host
       rescue
-        result = %x(ping #{uri.host} -t 1)
-        return if !result || result == "" || result.include?("timeout")
-        match = %r{\d+.\d+.\d+.\d+}.match(result)
-        return if match.nil?
-        ip_address = match ? match[0] : ""
-        begin
-          return ip_address if IPAddr.new(ip_address)
-        rescue => exception
-          LgPodPlugin.log_red exception
-          return nil
-        end
+        return host
       end
     end
 
+
+    private
+    #判断是否是 IP 地址
+    # def is_address(host)
+    #   match = %r{^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$}.match(host)
+    #   !(match.nil?)
+    # end
+
+    # 获取 ip 地址
+    # private
+    # def getaddress(uri)
+    #   begin
+    #     if self.is_address(uri.host)
+    #       ip = uri.host
+    #       return ip
+    #     else
+    #       ip_address = Resolv.getaddress uri.host
+    #       return ip_address
+    #     end
+    #   rescue
+    #     result = %x(ping #{uri.host} -t 1)
+    #     return if !result || result == "" || result.include?("timeout")
+    #     match = %r{\d+.\d+.\d+.\d+}.match(result)
+    #     return if match.nil?
+    #     ip_address = match ? match[0] : ""
+    #     begin
+    #       return ip_address if IPAddr.new(ip_address)
+    #     rescue => exception
+    #       LgPodPlugin.log_red exception
+    #       return nil
+    #     end
+    #   end
+    # end
+
     public def to_s
       return "" unless @uri
       @uri.to_s

data/lib/lg_pod_plugin/net/net-ping.rb

@@ -12,7 +12,7 @@ module LgPodPlugin
       uri = LURI.new(url)
       if uri.host
         self.uri = uri
-        self.ip = uri.ip
+        self.ip = uri.host
         self.network_ok = true
       else
         self.uri = nil

data/lib/lg_pod_plugin/version.rb

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