lg_pod_plugin 1.1.8.2 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aafc9f0e84eb60f2f5a215573e20d4496446d31ad7fa4e8829c309872ad682cc
-  data.tar.gz: a1d6ef6d263704e67e90de93cd4d756e52e67ad385eaebfb2907691c1f83db4e
+  metadata.gz: 4d24b5f9bdfaba6416cf330a12dedd8ea1188bbb88ac3c833282662f2aea34fe
+  data.tar.gz: 5a5de669f9e3db6867afa241bdf6fb80f00703e7359f860cec24cea5ef58a5e8
 SHA512:
-  metadata.gz: 7a002fe8a446c71ebc2d82f2d95f860571a58a68dfecf5816b01258c550e3ba2dceaf4765227f6caed75af4829908a195da4c9efa1875c0fa24e11d9e309f48f
-  data.tar.gz: f143f3a417584ef027c445d7ebaf6130187f4cce2b75d780fc3a4af1f8ac22f27e676bebacd85c5bac6efc805c2ab2d50129b4376b312d03c59a1ba348842ad9
+  metadata.gz: c597e21e3e7b4d7717a43e189bf8100af12c0a519fd61a7101c4c621ed0f14a314a4c4e85d99e6ac4c9762aa5a402da1fe7a116b754ba728144d2a15061430cc
+  data.tar.gz: 0c0ae53f0b22bae3b8e0c008d237cdebc7415f963cf1b56d1640488a3e68ddaca324875b45750b2fb3717eb724dbe33c99da55f5e14ab158213c1f82dccbd5ad

data/lib/lg_pod_plugin/config/l_config.rb

@@ -21,9 +21,7 @@ module LgPodPlugin
       return nil unless LUtils.is_gitlab_uri(git, uri.hostname)
       user_id = LUserAuthInfo.get_user_id(uri.hostname)
       user_info = LSqliteDb.shared.query_user_info(user_id)
-      if user_info != nil
-        user_info = GitLabAPI.check_gitlab_access_token_valid(uri, user_info)
-      else
+      if user_info == nil
         user_info = GitLabAPI.get_gitlab_access_token(uri, user_id)
       end
       return nil unless user_info

data/lib/lg_pod_plugin/downloader/l_cache.rb

@@ -31,9 +31,7 @@ module LgPodPlugin
     end
 
     # 判断缓存是否存在且有效命中缓存
-
     public
-
     def find_pod_cache(name, options, spec = nil, released_pod = false)
       hash_map = Hash.new.merge!(options)
       if hash_map.has_key?(:version)
@@ -79,11 +77,6 @@ module LgPodPlugin
       [result, podspecs]
     end
 
-    # def self.root_cache
-    #   cache_path = LFileManager.cache_root_path
-    #   return Pod::Downloader::Cache.new(cache_path)
-    # end
-
     # MARK - 缓存方法
     def self.path_for_pod(request, slug_opts = {})
       root_path + request.slug(**slug_opts)
@@ -94,28 +87,6 @@ module LgPodPlugin
       return Pathname.new(path.to_path + '.podspec.json')
     end
 
-    #
-    # def self.get_local_spec(request, target)
-    #   result = Pod::Downloader::Response.new
-    #   result.location = target
-    #   if request.released_pod?
-    #     result.spec = request.spec
-    #     local_specs = { request.name => request.spec }
-    #     return [request, local_specs]
-    #   else
-    #     local_specs = {}
-    #     pods_pecs = Pod::Sandbox::PodspecFinder.new(target).podspecs
-    #     pods_pecs[request.name] = request.spec if request.spec
-    #     pods_pecs.each do |name, spec|
-    #       if request.name == name
-    #         result.spec = spec
-    #         local_specs[request.name] = spec
-    #       end
-    #     end
-    #   end
-    #   [result, local_specs]
-    # end
-
     def self.group_subspecs_by_platform(spec)
       specs_by_platform = {}
       [spec, *spec.recursive_subspecs].each do |ss|

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -9,157 +9,29 @@ module LgPodPlugin
 
     # 通过读取本地文件获取 access_token
     def self.get_gitlab_access_token(uri, user_id)
-      db_path = LFileManager.download_director.join("database")
-      db_path.mkdir unless db_path.exist?
-      token_file = db_path.join("access_token.json")
-      return self.get_gitlab_access_token_input(uri, user_id, nil, nil) unless token_file.exist?
-      json = JSON.parse(File.read("#{token_file.to_path}"))
-      access_token = json["access_token"]
-      return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if access_token.nil?
-      token_vaild = GitLabAPI.request_user_emails(uri.hostname, access_token)
-      if token_vaild == "invalid token"
-        FileUtils.rm_rf token_file
-        return self.get_gitlab_access_token_input(uri, user_id, nil, nil)
-      end
+      access_token = "TAun4FNUjCdtwsUrwsLG"
       user_id = LUserAuthInfo.get_user_id(uri.hostname)
       now_time = Time.now.to_i
-      refresh_token = json["refresh_token"]
-      expires_in = json["expires_in"] ||= 7879680
-      created_at = json["created_at"] ||= now_time
+      refresh_token = access_token
+      expires_in = 7879680
+      created_at = now_time
       user_model = LUserAuthInfo.new(user_id, "", "", uri.hostname, access_token, refresh_token, (created_at + expires_in), now_time, 1)
       LSqliteDb.shared.insert_user_info(user_model)
       LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
       return user_model
     end
 
-    # 通过输入用户名和密码 获取 access_token
-    def self.get_gitlab_access_token_input(uri, user_id, username = nil, password = nil)
-      unless username && password
-        LgPodPlugin.log_yellow "请输入 `#{uri.to_s}` 的用户名"
-        username = STDIN.gets.chomp
-        LgPodPlugin.log_yellow "请输入 `#{uri.to_s}` 的密码"
-        password = STDIN.noecho(&:gets).chomp
-      end
-      GitLabAPI.request_gitlab_access_token(uri.hostname, username, password)
-      user_info = LSqliteDb.shared.query_user_info(user_id)
-      return user_info
-    end
     # 检查 token 是否在有效期内
-    def self.check_gitlab_access_token_valid(uri, user_info)
-      time_now = Time.now.to_i
-      refresh_token = user_info.refresh_token
-      if user_info.type == 1
-        if user_info.expires_in  <= time_now
-          project_name = LUtils.get_git_project_name(uri.to_s)
-          token_valid = GitLabAPI.request_user_emails(uri.hostname, user_info.access_token)
-          if token_valid == "success"
-            new_user_info = LUserAuthInfo.new(user_info.id, "", "", uri.hostname, user_info.access_token, nil, (time_now + 7879680), time_now, 1)
-            LSqliteDb.shared.insert_user_info(user_info)
-            return new_user_info
-          else
-            token_file = LFileManager.download_director.join("database").join("access_token.json")
-            FileUtils.rm_rf token_file if token_file.exist?
-            return self.get_gitlab_access_token_input(uri, user_info.id, nil, nil)
-          end
-        else
-          return user_info
-        end
-      else
-        # 判断 token 是否失效
-        if user_info.expires_in  <= time_now
-          return refresh_user_token uri, refresh_token, user_info.id, user_info.username, user_info.password
-        else
-          update_time = user_info.update_time.to_i
-          if time_now - update_time > 1800
-            user_info = refresh_user_token uri, refresh_token, user_info.id, user_info.username, user_info.password
-            return  user_info
-          else
-            return user_info
-          end
-        end
-      end
-    end
-
-    def self.refresh_user_token(uri, refresh_token, user_id, username, password)
-      # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
-      new_user_info = GitLabAPI.refresh_gitlab_access_token uri.hostname, refresh_token
-      unless new_user_info
-        return GitLabAPI.get_gitlab_access_token_input(uri, user_id, username, password)
-      end
-      return new_user_info
-    end
-
-    public
-    # 获取 GitLab access_token
-    def self.request_gitlab_access_token(host, username, password)
-      user_id = LUserAuthInfo.get_user_id(host)
-      begin
-        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_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)
-            LgPodPlugin.log_yellow "LSqliteDb.shared.delete_user_info(#{user_id}"
-          end
-          raise json["error_description"]
-        end
-        access_token = json["access_token"]
-        refresh_token = json["refresh_token"]
-        expires_in = json["expires_in"] ||= 7200
-        created_at = json["created_at"] ||= Time.now.to_i
-        time_now = Time.now.to_i
-        user_model = LUserAuthInfo.new(user_id, username, password, host, access_token, refresh_token, (created_at + expires_in), time_now, 0)
-        LSqliteDb.shared.insert_user_info(user_model)
-        LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
-      rescue => exception
-        LgPodPlugin.log_red "获取 `access_token` 失败, error => #{exception.to_s}"
-      end
-    end
-
-    # 刷新gitlab_token
-    def self.refresh_gitlab_access_token(host, refresh_token)
-      begin
-        hash_map = Hash.new
-        hash_map["scope"] = "api"
-        hash_map["grant_type"] = "refresh_token"
-        hash_map["refresh_token"] = refresh_token
-        uri = URI("#{host}/oauth/token")
-        res = Net::HTTP.post_form(uri, hash_map)
-        if res.body
-          json = JSON.parse(res.body)
-        else
-          json   = nil
-        end
-        return nil unless json.is_a?(Hash)
-        error = json["error"]
-        if error != nil
-          error_description = json["error_description"]
-          raise error_description
-        end
-        time_now = Time.now.to_i
-        access_token = json["access_token"]
-        refresh_token = json["refresh_token"]
-        expires_in = json["expires_in"] ||= 7200
-        created_at = json["created_at"] ||= time_now
-        user_id = LUserAuthInfo.get_user_id(host)
-        user_model = LSqliteDb.shared.query_user_info(user_id)
-        user_model.expires_in = (created_at + expires_in)
-        user_model.access_token = access_token
-        user_model.refresh_token = refresh_token
-        user_model.update_time = time_now
-        user_model.type = 0
-        LSqliteDb.shared.insert_user_info(user_model)
-        LgPodPlugin.log_green "刷新token成功: `refresh_token` => #{refresh_token}, expires_in => #{expires_in}"
-        return user_model
-      rescue => exception
-        LgPodPlugin.log_yellow "刷新 `access_token` 失败, error => #{exception.to_s}"
-        return nil
-      end
-    end
+    # def self.check_gitlab_access_token_valid(uri, user_info)
+    #   token_vaild = GitLabAPI.request_user_emails(uri.hostname, user_info.access_token)
+    #   if token_vaild == "success"
+    #     return user_info
+    #   else
+    #     LSqliteDb.shared.delete_user_info(user_info.id)
+    #     LgPodPlugin.log_yellow "LSqliteDb.shared.delete_user_info(#{user_info.id}"
+    #     return get_gitlab_access_token(uri, user_info.id)
+    #   end
+    # end
 
     # 通过名称搜索项目信息
     def self.request_project_info(host, project_name, access_token, git = nil)
@@ -263,47 +135,6 @@ module LgPodPlugin
       end
     end
 
-    # public
-    # def self.get_podspec_file_content(host, token, project_id, sha, filepath)
-    #   begin
-    #     hash_map = Hash.new
-    #     hash_map["ref"] = sha
-    #     hash_map["access_token"] = token
-    #     uri = URI("#{host}/api/v4/projects/#{project_id}/repository/files/#{filepath}")
-    #     uri.query = URI.encode_www_form(hash_map)
-    #     res = Net::HTTP.get_response(uri)
-    #     case res
-    #     when Net::HTTPSuccess, Net::HTTPRedirection
-    #       json = JSON.parse(res.body)
-    #     else
-    #       body = JSON.parse(res.body)
-    #       message = body["message"]
-    #       if message == "404 Project Not Found"
-    #         LSqliteDb.shared.delete_project_by_id(project_id)
-    #       end
-    #       json = nil
-    #     end
-    #     return nil unless json && json.is_a?(Hash)
-    #     content = json["content"]
-    #     return nil unless content && LUtils.is_a_string?(content)
-    #     encoding = json["encoding"] ||= "base64"
-    #     if encoding == "base64"
-    #       require 'base64'
-    #       content = Base64.decode64(content)
-    #       if content.respond_to?(:encoding) && content.encoding.name != 'UTF-8'
-    #         text = content.force_encoding("gb2312").force_encoding("utf-8")
-    #         return text
-    #       else
-    #         return content
-    #       end
-    #     else
-    #       return nil
-    #     end
-    #   rescue
-    #     return nil
-    #   end
-    # end
-
     # 通过名称搜索项目信息
     public
     def self.request_user_emails(host, access_token)

data/lib/lg_pod_plugin/git/gitlab_archive.rb

@@ -56,8 +56,8 @@ module LgPodPlugin
       else
         return nil
       end
-      download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2\\?" + "sha\\=#{sha}"
-      download_url += "\\&access_token\\=#{token}" if token
+      download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.tar.bz2?" + "sha=#{sha}"
+      download_url += "&access_token=#{token}" if token
       download_params = { "filename" => "#{self.name}.tar.bz2", "url" => download_url }
     end
 

data/lib/lg_pod_plugin/installer/main.rb

@@ -16,14 +16,9 @@ module LgPodPlugin
       end
     end
 
-    def self.ensure_matching_version
-      cache = Pod::Downloader::Cache.new(LFileManager.cache_root_path)
-    end
-
     public
     def self.run(command, options = {})
       clean_sandbox()
-      ensure_matching_version()
       workspace = Pathname(Dir.pwd)
       update = (command == "update")
       LSqliteDb.shared.init_database
@@ -45,6 +40,8 @@ module LgPodPlugin
       all_installers = Hash.new
       project.targets.each do |target|
         target.dependencies.each do |_, pod|
+          checkout_options = pod.checkout_options
+          next unless checkout_options.has_key?(:git)
           installer = LPodInstaller.new
           download_params = installer.install(pod)
           if download_params

data/lib/lg_pod_plugin/pod/release-pod.rb

@@ -67,11 +67,10 @@ module LgPodPlugin
     
 
     def self.download_dependencies(installer)
-      installer.send(:download_dependencies)
+      installer.download_dependencies
       installer.send(:validate_targets)
       installer.send(:clean_sandbox)
-      installation_options = installer.send(:installation_options)
-      skip_pods_project_generation = installation_options.send(:skip_pods_project_generation)
+      skip_pods_project_generation = installer.send(:installation_options).send(:skip_pods_project_generation)
       if skip_pods_project_generation
         installer.show_skip_pods_project_generation_message
         installer.send(:run_podfile_post_install_hooks)

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.8.2"
+  VERSION = "1.2.2"
 end

data/lib/lg_pod_plugin.rb

@@ -26,7 +26,6 @@ require_relative 'lg_pod_plugin/git/gitlab_archive'
 require_relative 'lg_pod_plugin/downloader/downloader'
 require_relative 'lg_pod_plugin/git/git_download'
 require_relative 'lg_pod_plugin/git/git_clone'
-require_relative 'lg_pod_plugin/downloader/overload_cache'
 
 module LgPodPlugin
   autoload :Command, 'command/command'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.8.2
+  version: 1.2.2
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +115,6 @@ files:
 - lib/lg_pod_plugin/db/database.rb
 - lib/lg_pod_plugin/downloader/downloader.rb
 - lib/lg_pod_plugin/downloader/l_cache.rb
-- lib/lg_pod_plugin/downloader/overload_cache.rb
 - lib/lg_pod_plugin/downloader/request.rb
 - lib/lg_pod_plugin/git/git_clone.rb
 - lib/lg_pod_plugin/git/git_download.rb
@@ -171,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: 封装了自定义podfile 中pod 方法

data/lib/lg_pod_plugin/downloader/overload_cache.rb

@@ -1,34 +0,0 @@
-require 'fileutils'
-require 'tmpdir'
-
-module Pod
-  module Downloader
-    # The class responsible for managing Pod downloads, transparently caching
-    # them in a cache directory.
-    #
-    class Cache
-
-
-      private
-      # Ensures the cache on disk was created with the same CocoaPods version as
-      # is currently running.
-      #
-      # @return [Void]
-      #
-      def ensure_matching_version
-        version_file = root + 'VERSION'
-        if version_file.file?
-          version = version_file.read.strip
-        else
-          version = Pod::VERSION
-        end
-        pod_version = %x(bundle exec pod --version).split("\n").first
-        if version != pod_version
-          version = pod_version
-          version_file.open('w') { |f| f << version }
-        end
-      end
-
-    end
-  end
-end