lg_pod_plugin 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f480038abd98e1d68267cdecb33fad97daf06f68c4bd542713635599485aff
-  data.tar.gz: bdb9387659bc7c27f4ed4225f5cb7652db6b6e0c9d20f099046c8230a28cd6c7
+  metadata.gz: '08d6552e96028f61341cb07bbfbe2df9ac251b1b1593e660b3b3b234736b39a3'
+  data.tar.gz: e4874317456dceb82367c673cb889808f5457dc1e2d745dd5425a48b9c36998c
 SHA512:
-  metadata.gz: 6458b71bf1c86653acdffa295adadbaeda165aa7890055f72fde54e03c43a7b99d7158ec6fa9eb41107c47f3093946d796f8b5b605bd5917a1f6889887a0ce66
-  data.tar.gz: 07a5cd8e0e9e6d4630978fd38033388ce97d656f2943fe8006ee328665000a1f527db5f00073b34667b44f920bad1561d3f492359a5ff3b28202ba338b591ea7
+  metadata.gz: 583abb98b34e909ab5db9ceb2553d248777f13d4e148a0b9c7c7e59e03bc82c605edbed6d4369feb73c8627fbe8a2f15f9705649ecced7f4596648cb27c2476f
+  data.tar.gz: 4b19537a073dad421432bebde6491f667db38a7b88db6a2674547cdb63a3e43756e50bb480222dcd33cf8ad873f992b5ac4156d5652d64b4b7f7064aac8ec1fa

data/lib/lg_pod_plugin/git_util.rb

@@ -22,7 +22,10 @@ module LgPodPlugin
 
     # 根据branch 下载 zip 包
     def git_download_branch_zip(path, temp_name)
-      token = ""
+      token = LRequest.shared.token
+      unless token
+        return self.git_clone_by_branch(path, temp_name)
+      end
       file_name = "#{temp_name}.zip"
       base_url = self.git[0...self.git.length - 4]
       project_name = base_url.split("/").last
@@ -48,7 +51,10 @@ module LgPodPlugin
 
     # 通过tag下载zip包
     def git_download_tag_zip(path, temp_name)
-      token = ""
+      token = LRequest.shared.token
+      unless token
+        return self.git_clone_by_tag(path, temp_name)
+      end
       base_url = self.git[0...self.git.length - 4]
       project_name = base_url.split("/").last
       unless project_name
@@ -74,7 +80,10 @@ module LgPodPlugin
     end
     # 通过 commit 下载zip包
     def git_download_commit_zip(path, temp_name)
-      token = ""
+      token = LRequest.shared.token
+      unless token
+        return self.git_clone_by_commit(path, temp_name)
+      end
       base_url = self.git[0...self.git.length - 4]
       project_name = base_url.split("/").last
       unless project_name
@@ -126,19 +135,19 @@ module LgPodPlugin
       FileUtils.chdir(path)
       temp_name = "lg_temp_pod"
       if self.git && self.tag
-        if self.git.include?("xxx/capp/iOS")
+        if self.git.include?("capp/iOS")
           return git_download_tag_zip(path, temp_name)
         else
           return self.git_clone_by_tag(path, temp_name)
         end
       elsif self.git && self.branch
-        if self.git.include?("xxx/capp/iOS")
+        if self.git.include?("capp/iOS")
           return self.git_download_branch_zip(path, temp_name)
         else
           return self.git_clone_by_branch(path, temp_name)
         end
       elsif self.git && self.commit
-        if self.git.include?("xxx/capp/iOS")
+        if self.git.include?("capp/iOS")
           return self.git_download_commit_zip(path, temp_name)
         else
           return self.git_clone_by_commit(path, temp_name)

data/lib/lg_pod_plugin/request.rb

@@ -1,5 +1,7 @@
-require 'singleton'
 require 'yaml'
+require 'json'
+require 'net/http'
+require 'singleton'
 require_relative 'l_cache'
 require_relative 'git_util'
 require_relative 'downloader.rb'
@@ -7,7 +9,7 @@ module LgPodPlugin
 
   class LRequest
     include Singleton
-    REQUIRED_ATTRS ||= %i[name options workspace cache downloader git_util lock_info lock_params is_update].freeze
+    REQUIRED_ATTRS ||= %i[name options workspace cache downloader git_util lock_info lock_params is_update token].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
     def is_update_pod
@@ -125,6 +127,9 @@ module LgPodPlugin
         hash_map[:commit] = new_commit
         hash_map[:branch] = new_branch
       end
+      if self.token == nil
+        self.token = self.request_gitlab_token(git)
+      end
       self.options = hash_map
       self.cache = LCache.new(self.workspace)
       self.git_util = LGitUtil.new(name, hash_map)
@@ -135,6 +140,27 @@ module LgPodPlugin
       return LRequest.instance
     end
 
+    def request_gitlab_token(git)
+      if git == nil
+        return nil
+      end
+      begin
+        #81.69.242.162
+        uri = URI('http://81.69.242.162:8080/v1/member/user/gitlab/token')
+        # uri = URI('http://127.0.0.1:8080/v1/member/user/gitlab/token')
+        params = {"url" => git}
+        res = Net::HTTP.post_form(uri, params)
+        json = JSON.parse(res.body)
+      rescue
+        return nil
+      end
+      unless json
+        return nil
+      end
+      token = json["data"]["token"]
+      return token
+    end
+
   end
 
 end

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - dongzb01