lg_pod_plugin 1.1.5.7 → 1.1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8fcf508c4622d896bc35d848db7c9d8238648722e38cde3dca35f5b30a5c42
-  data.tar.gz: 756567c34b08dc9d99af1f8f9c4fd8a3adf527d60afd4155315ed4c2e7a89616
+  metadata.gz: 8cf74181198e5c879bdbf6ef84ca2de6286d56fa355665a9f68db20fda87b9ba
+  data.tar.gz: bc480be0ff2a011c60aa23a48355c03c6b329c0a6360708c9c7aa5e1a26b44a2
 SHA512:
-  metadata.gz: 0e35116e0824a397cfb7021ed6ffa793d1143f3300b8eab09c827a93e704292ed13b38bab506b8754ad3379d7fc682c34d537516545c2c4e9c89581158f399e3
-  data.tar.gz: defe217180c036512d189a183d7ad1ce1a20a6b90bbdc56ef957851c55d6bcfee279fbfeb5ce64ac8a762fda002b76c5601ae4f57ad6449e21cfe3984e304c9f
+  metadata.gz: ce2163d8778eb68adef6fec76595ba9a2cd66be2abea079011c8294155b30f84d48bc659dc510f27e046a1637a9e554357e81d3ceb5cb0a45a11e23f364d34f7
+  data.tar.gz: 79005659b57432323474fc0237f1c0e01aff28602d6d72cd349e42f8e6ef755b2fc09519f3f577c4a483d17275cc2dac4bd0491d776a349aefbf32d8ceab234c

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/config/target.rb

@@ -4,10 +4,11 @@ module LgPodPlugin
   class LPodTarget
     attr_reader :name
     attr_reader :dependencies
+    attr_reader :internal_hash
     def initialize(target)
-      internal_hash = target.send(:internal_hash)
-      @name = internal_hash["name"]
-      array = Array.new(internal_hash['dependencies'] ||= [])
+      @internal_hash = target.send(:internal_hash)
+      @name = @internal_hash["name"]
+      array = Array.new(@internal_hash['dependencies'] ||= [])
       dependencies = array.reject do |e|
         if LUtils.is_a_string?(e)
           true
@@ -29,5 +30,6 @@ module LgPodPlugin
       end
       @dependencies = external_pods
     end
+
   end
 end

data/lib/lg_pod_plugin/downloader/downloader.rb

@@ -49,13 +49,13 @@ module LgPodPlugin
         LgPodPlugin.log_green "Using `#{name}`"
       end
       hash_map = self.request.get_cache_key_params
+      self.request.checkout_options.delete(:branch) if commit
+      self.request.checkout_options[:commit] = commit if commit
       # 发现本地有缓存, 不需要更新缓存
       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
-        self.request.checkout_options.delete(:branch) if commit
-        self.request.checkout_options[:commit] = commit if commit
         LgPodPlugin.log_green "find the cache of `#{name}`, you can use it now."
          nil
       else
@@ -106,8 +106,6 @@ module LgPodPlugin
           LgPodPlugin::LCache.cache_pod(name, download_params, self.request.get_cache_key_params,podspec, self.request.released_pod)
           FileUtils.chdir(LFileManager.download_director)
           FileUtils.rm_rf(download_params)
-          self.request.checkout_options.delete(:branch) if commit
-          self.request.checkout_options[:commit] = commit if commit
         end
         nil
       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/installer/install.rb

@@ -64,8 +64,6 @@ module LgPodPlugin
       if pod_is_exist
         is_delete = request.params["is_delete"] ||= false
         LProject.shared.need_update_pods.delete(name) if is_delete
-        request.checkout_options.delete(:branch) if commit
-        request.checkout_options[:commit] = commit if commit
       else
         git = checkout_options[:git]
         return unless git
@@ -91,8 +89,6 @@ module LgPodPlugin
         end
         FileUtils.chdir(LFileManager.download_director)
         FileUtils.rm_rf(download_params)
-        request.checkout_options.delete(:branch) if commit
-        request.checkout_options[:commit] = commit if commit
       end
 
     end

data/lib/lg_pod_plugin/installer/main.rb

@@ -19,7 +19,7 @@ module LgPodPlugin
 
     public
     def self.run(command, options = {})
-      self.clean_sandbox
+      clean_sandbox()
       workspace = Pathname(Dir.pwd)
       update = (command == "update")
       LSqliteDb.shared.init_database

data/lib/lg_pod_plugin/installer/project.rb

@@ -16,6 +16,7 @@ module LgPodPlugin
     attr_reader :external_pods
     attr_reader :need_update_pods
     attr_accessor :cache_specs
+    attr_accessor :redirect_url_hash
     def setup(workspace,podfile_path, update, repo_update)
       @podfile = Pod::Podfile.from_file(podfile_path)
       @update = update
@@ -35,7 +36,8 @@ module LgPodPlugin
       @cache_specs = Hash.new
       @external_pods = Hash.new.merge!(external_pods)
       @need_update_pods = Hash.new.merge!(external_pods)
-      self
+      @redirect_url_hash = Hash.new
+      return self
     end
 
     def self.shared

data/lib/lg_pod_plugin/net/l_uri.rb

@@ -5,8 +5,7 @@ module LgPodPlugin
 
   class LURI
     public
-    attr_reader :ip
-    attr_reader :path
+    # attr_reader :path
     attr_reader :host
     attr_reader :scheme
     attr_reader :hostname
@@ -14,35 +13,41 @@ module LgPodPlugin
     attr_reader :uri
     public
     def initialize(git)
-      begin
-        uri = URI(git)
-      rescue => exception
-        if git.include?("git@") && git.include?(":")
-          match = %r{(?<=git@).*?(?=:)}.match(git)
-          host = match ? match[0] : ""
+      if git.include?("git@") && git.include?(":")
+        match = %r{(?<=git@).*?(?=:)}.match(git)
+        host = match ? match[0] : ""
+        if is_address(host)
           base_url = LUtils.get_gitlab_base_url(git)
           path = base_url.split(":").last
-          uri = URI("http://#{host}/#{path}")
+          origin_uri = URI("http://#{host}/#{path}")
         else
-          LgPodPlugin.log_red exception
-          uri = nil
+          base_url = LUtils.get_gitlab_base_url(git)
+          path = base_url.split(":").last
+          origin_uri = URI("https://#{host}/#{path}")
         end
+      else
+        origin_uri = URI(git)
       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}")
+      return if origin_uri.nil?
+      redirect_url = LProject.shared.redirect_url_hash[origin_uri.host]
+      if redirect_url
+        @uri = redirect_url
       else
-        @uri = URI("#{uri.scheme}://#{ip_address}#{uri.path}")
+        @uri = URI(get_redirect_url(origin_uri.scheme + "://" + origin_uri.host))
+        LProject.shared.redirect_url_hash[origin_uri.host] = @uri
       end
-      @ip = ip_address
-      @host = @uri.host ||= ""
-      @path = @uri.path ||= ""
-      @scheme = @uri.scheme ||= ""
+      @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
+
     private
     #判断是否是 IP 地址
     def is_address(host)
@@ -51,30 +56,30 @@ module LgPodPlugin
     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
+    # 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

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.7"
+  VERSION = "1.1.6.0"
 end

metadata

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