lg_pod_plugin 1.1.4.4 → 1.1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4522864fb1905214bf36181a4b907124f404e74d7a623dce0cdd5097853cc2c
-  data.tar.gz: 0e766c6a057ab039a477b46d80ead8301312bbded21dc67c551773e2f8af1781
+  metadata.gz: 28939d9769c3829633eae8e6560123eaa26f0185a06d0705916cd27400e550b5
+  data.tar.gz: ba61c2e383b9cb9d56b9a4ff8567d6292a49ac2b7fa44a5953b54416b258530e
 SHA512:
-  metadata.gz: e08af1d628067781f24e8413e53072f52f8dae48c8edf26da80f0cdbb7b6cbc59dde5005e43301200ac760bf463b7c828fc041bbbeeffb0b741bc048227da184
-  data.tar.gz: f265d0167a58570fd7e393bb23b94bfd5afe821112630586144b0e49202febbe7ed5731808ee7d83c48da1521b0b03e1a5ffb995825b4f0e7b857f6e8b39cb26
+  metadata.gz: aee9ac47bf1bcb62fd9dd87d190dfab70354e9836fbe4ca342c1efe42c0093b8fb06111b4542e8a78be391107fdca02a4380b96b83e1711048df8d5e2629ddb2
+  data.tar.gz: f1eb565fa4bc16908c78960901666ca03138f153cbd6486ea7453f20f6ef8ffb6f0090d679908d5bee078f584a41dc33c2a3b795f2e44f7f474073851f67f2cf

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/downloader.rb

@@ -107,8 +107,8 @@ module LgPodPlugin
           return download_params
         elsif File.exist?(download_params.to_s) && download_params
           FileUtils.chdir download_params
-          LgPodPlugin::LCache.cache_pod(name, download_params.to_path, { :git => git }, podspec, self.request.released_pod) if self.request.single_git
-          LgPodPlugin::LCache.cache_pod(name, download_params.to_path, self.request.get_cache_key_params,podspec, self.request.released_pod)
+          LgPodPlugin::LCache.cache_pod(name, download_params, { :git => git }, podspec, self.request.released_pod) if self.request.single_git
+          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

data/lib/lg_pod_plugin/git/git_clone.rb

@@ -51,9 +51,12 @@ module LgPodPlugin
 
     # git clone commit
     def git_clone_by_commit(path, temp_name)
-      Git.init(temp_name)
+      unless File.exist?(temp_name)
+        FileUtils.mkdir(temp_name)
+      end
       FileUtils.chdir(temp_name)
-      LgPodPlugin.log_blue "git clone #{self.git}"
+      system("git init")
+      LgPodPlugin.log_blue "git clone -b #{self.commit} #{self.git}"
       system("git remote add origin #{self.git}")
       system("git fetch origin #{self.commit}")
       system("git reset --hard FETCH_HEAD")

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.4.4
+  version: 1.1.5.2
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-01-02 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