lg_pod_plugin 1.1.4.3 → 1.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c661389be97295bc4212695eb7309ad7e2649c8ace5ebaab3ee0353f772831
-  data.tar.gz: dcf0e7768f3e036385bead612fcbe36244c273432cc8f70c80ad113cc541bd9a
+  metadata.gz: 4a4c2d321812e6bfcf156a1bb701d9fb8c39fa2c575bb0a6e3272c4346cf9ef2
+  data.tar.gz: 0bcd6f9e9861fbb172e32abd728f32d766a2f395e17466465360f12f3bad5a08
 SHA512:
-  metadata.gz: 85c16f9a50df851ae650f987d48a831cd0f399a2dbd09e5a0804c2949a84fd2862e8f0122cff679794f40094c38231791a2a298328dc1b451c5701a381d76360
-  data.tar.gz: 8d6181fbd175682983edf0c20f22856d4fb315063070cb051e91de739a3766d1e8915030bb21e5f54dc6f666c63f2717d29426c0b8be302f769ce5b1f18b0bac
+  metadata.gz: 0d10240bf1bff5772f97367e479f86375d083854ccd993cd2534358228fe398f9321572d38887230ed1b58fe49576b0c6f251531837ffee4d1ed1bcee4fdb961
+  data.tar.gz: c83e8e656698ad8f5029f0bff89bd9d6850af8ffb505dc39c3634cadab6a896aeea7ead949a3800b4e0171bbf09ccac6d0c5813ab62596b818a0c0f077a621d1

data/lib/lg_pod_plugin/config/l_config.rb

@@ -40,7 +40,6 @@ module LgPodPlugin
           user_info = new_user_info
         end
       end
-
       config = LConfig.new
       config.host = uri.hostname
       config.access_token = user_info.access_token
@@ -52,7 +51,6 @@ module LgPodPlugin
         config.project = GitLabAPI.request_project_info(config.host, config.project_name, config.access_token, git)
       end
       return config
-
     end
 
   end

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -13,9 +13,8 @@ module LgPodPlugin
 
     public
     def pod_cache_exist(name, options, spec = nil, released_pod = false)
-      target = LProject.shared.workspace.join("Pods").join(name)
       destination, cache_pod_spec = self.find_pod_cache name, options, spec, released_pod
-      if (File.exist?(destination) && !destination.children.empty?) && File.exist?(target) && !target.children.empty?
+      if (File.exist?(destination) && !destination.children.empty?)
         [true, destination, cache_pod_spec]
       else
         [false, destination, cache_pod_spec]

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -20,7 +20,6 @@ module LgPodPlugin
     end
 
     public
-
     # 获取 GitLab access_token
     def self.request_gitlab_access_token(host, username, password)
       user_id = LUserAuthInfo.get_user_id(host)
@@ -40,6 +39,10 @@ module LgPodPlugin
           json = JSON.parse(res.body)
         else
           json = JSON.parse(res.body)
+          error = json["error"]
+          if error == "invalid_grant"
+            LSqliteDb.shared.delete_user_info(user_id)
+          end
           raise json["error_description"]
         end
         access_token = json["access_token"]
@@ -50,7 +53,6 @@ module LgPodPlugin
         LSqliteDb.shared.insert_user_info(user_model)
         LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
       rescue => exception
-        LSqliteDb.shared.delete_user_info(user_id)
         LgPodPlugin.log_red "获取 `access_token` 失败, error => #{exception.to_s}"
       end
     end

data/lib/lg_pod_plugin/git/gitlab_archive.rb

@@ -90,6 +90,7 @@ module LgPodPlugin
       lg_spec.source_files.each_key do |key|
         next if key == "All" || key == "LICENSE" || key == "License"
         path = LUtils.url_encode(key)
+        # download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2#{"\\?"}" + "sha#{"\\="}#{sha}"
         download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2#{"\\?"}" + "path#{"\\="}#{path}#{"\\&"}sha#{"\\="}#{sha}"
         download_url += "\\&access_token\\=#{token}" if token
         download_params.append({ "filename" => "#{path}.tar.bz2", "url" => download_url })

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.4.3"
+  VERSION = "1.1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.4.3
+  version: 1.1.5.1
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -76,16 +76,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: 封装了自定义podfile 中pod 方法