lg_pod_plugin 1.1.7.3 → 1.1.8.1

data/lib/lg_pod_plugin/downloader/overload_cache.rb

@@ -1,6 +1,3 @@
-# frozen_string_literal: true
-
-require 'cocoapods'
 require 'fileutils'
 require 'tmpdir'
 
@@ -10,155 +7,9 @@ module Pod
     # them in a cache directory.
     #
     class Cache
-      # @return [Pathname] The root directory where this cache store its
-      #         downloads.
-      #
-      attr_reader :root
-
-      # Initialize a new instance
-      #
-      # @param  [Pathname,String] root
-      #         see {#root}
-      #
-      def initialize(root)
-        @root = Pathname(root)
-        ensure_matching_version
-      end
-
-      # Downloads the Pod from the given `request`
-      #
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @return [Response] the response from downloading `request`
-      #
-      def download_pod(request)
-        cached_pod(request) || uncached_pod(request)
-      rescue Informative
-        raise
-      rescue
-        UI.puts("\n[!] Error installing #{request.name}".red)
-        raise
-      end
-
-      # @return [Hash<String, Hash<Symbol, String>>]
-      #         A hash whose keys are the pod name
-      #         And values are a hash with the following keys:
-      #         :spec_file : path to the spec file
-      #         :name      : name of the pod
-      #         :version   : pod version
-      #         :release   : boolean to tell if that's a release pod
-      #         :slug      : the slug path where the pod cache is located
-      #
-      def cache_descriptors_per_pod
-        specs_dir = root + 'Specs'
-        release_specs_dir = specs_dir + 'Release'
-        return {} unless specs_dir.exist?
-
-        spec_paths = specs_dir.find.select { |f| f.fnmatch('*.podspec.json') }
-        spec_paths.reduce({}) do |hash, spec_path|
-          spec = Specification.from_file(spec_path)
-          hash[spec.name] ||= []
-          is_release = spec_path.to_s.start_with?(release_specs_dir.to_s)
-          request = Downloader::Request.new(:spec => spec, :released => is_release)
-          hash[spec.name] << {
-            :spec_file => spec_path,
-            :name => spec.name,
-            :version => spec.version,
-            :release => is_release,
-            :slug => root + request.slug,
-          }
-          hash
-        end
-      end
 
-      # Convenience method for acquiring a shared lock to safely read from the
-      # cache. See `Cache.lock` for more details.
-      #
-      # @param  [Pathname] location
-      #         the path to require a lock for.
-      #
-      # @param  [block] &block
-      #         the block to execute inside the lock.
-      #
-      # @return [void]
-      #
-      def self.read_lock(location, &block)
-        Cache.lock(location, File::LOCK_SH, &block)
-      end
-
-      # Convenience method for acquiring an exclusive lock to safely write to
-      # the cache. See `Cache.lock` for more details.
-      #
-      # @param  [Pathname] location
-      #         the path to require a lock for.
-      #
-      # @param  [block] &block
-      #         the block to execute inside the lock.
-      #
-      # @return [void]
-      #
-      def self.write_lock(location, &block)
-        Cache.lock(location, File::LOCK_EX, &block)
-      end
-
-      # Creates a .lock file at `location`, aquires a lock of type
-      # `lock_type`, checks that it is valid, and executes passed block while
-      # holding on to that lock. Afterwards, the .lock file is deleted, which is
-      # why validation of the lock is necessary, as you might have a lock on a
-      # file that doesn't exist on the filesystem anymore.
-      #
-      # @param  [Pathname] location
-      #         the path to require a lock for.
-      #
-      # @param  [locking_constant] lock_type
-      #         the type of lock, either exclusive (File::LOCK_EX) or shared
-      #         (File::LOCK_SH).
-      #
-      # @return [void]
-      #
-      def self.lock(location, lock_type)
-        raise ArgumentError, 'no block given' unless block_given?
-        lockfile = "#{location}.lock"
-        f = nil
-        loop do
-          f.close if f
-          f = File.open(lockfile, File::CREAT, 0o644)
-          f.flock(lock_type)
-          break if Cache.valid_lock?(f, lockfile)
-        end
-        begin
-          yield location
-        ensure
-          if lock_type == File::LOCK_SH
-            f.flock(File::LOCK_EX)
-            File.delete(lockfile) if Cache.valid_lock?(f, lockfile)
-          else
-            File.delete(lockfile)
-          end
-          f.close
-        end
-      end
-
-      # Checks that the lock is on a file that still exists on the filesystem.
-      #
-      # @param  [File] file
-      #         the actual file that we have a lock for.
-      #
-      # @param  [String] filename
-      #         the filename of the file that we have a lock for.
-      #
-      # @return [Boolean]
-      #         true if `filename` still exists and is the same file as `file`
-      #
-      def self.valid_lock?(file, filename)
-        file.stat.ino == File.stat(filename).ino
-      rescue Errno::ENOENT
-        false
-      end
 
       private
-
       # Ensures the cache on disk was created with the same CocoaPods version as
       # is currently running.
       #
@@ -178,152 +29,31 @@ module Pod
         end
       end
 
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @param  [Hash<Symbol,String>] slug_opts
-      #         the download options that should be used in constructing the
-      #         cache slug for this request.
-      #
-      # @return [Pathname] The path for the Pod downloaded from the given
-      #         `request`.
-      #
-      def path_for_pod(request, slug_opts = {})
-        root + request.slug(**slug_opts)
-      end
-
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @param  [Hash<Symbol,String>] slug_opts
-      #         the download options that should be used in constructing the
-      #         cache slug for this request.
-      #
-      # @return [Pathname] The path for the podspec downloaded from the given
-      #         `request`.
-      #
-      def path_for_spec(request, slug_opts = {})
-        path = root + 'Specs' + request.slug(**slug_opts)
-        Pathname.new(path.to_path + '.podspec.json')
-      end
-
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @return [Response] The download response for the given `request` that
-      #         was found in the download cache.
-      #
-      def cached_pod(request)
-        cached_spec = cached_spec(request)
-        path = path_for_pod(request)
-
-        return unless cached_spec && path.directory?
-        spec = request.spec || cached_spec
-        Response.new(path, spec, request.params)
-      end
-
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @return [Specification] The cached specification for the given
-      #         `request`.
-      #
-      def cached_spec(request)
-        path = path_for_spec(request)
-        path.file? && Specification.from_file(path)
-      rescue JSON::ParserError
-        nil
-      end
-
-      # @param  [Request] request
-      #         the request to be downloaded.
-      #
-      # @return [Response] The download response for the given `request` that
-      #         was not found in the download cache.
-      #
-      def uncached_pod(request)
-        in_tmpdir do |target|
-          result, podspecs = download(request, target)
-          result.location = nil
-
-          podspecs.each do |name, spec|
-            destination = path_for_pod(request, :name => name, :params => result.checkout_options)
-            copy_and_clean(target, destination, spec)
-            write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
-            if request.name == name
-              result.location = destination
-            end
-          end
-
-          result
-        end
-      end
-
-      def download(request, target)
-        Downloader.download_request(request, target)
-      end
-
-      # Performs the given block inside a temporary directory,
-      # which is removed at the end of the block's scope.
-      #
-      # @return [Object] The return value of the given block
-      #
-      def in_tmpdir(&blk)
-        tmpdir = Pathname(Dir.mktmpdir)
-        blk.call(tmpdir)
-      ensure
-        FileUtils.remove_entry(tmpdir, :force => true) if tmpdir && tmpdir.exist?
-      end
-
-      # Copies the `source` directory to `destination`, cleaning the directory
-      # of any files unused by `spec`.
-      #
-      # @param  [Pathname] source
-      #
-      # @param  [Pathname] destination
-      #
-      # @param  [Specification] spec
-      #
-      # @return [Void]
-      #
+      public
       def copy_and_clean(source, destination, spec)
+        attributes_hash = spec.send(:attributes_hash) || {}
+        name = attributes_hash["name"] ||= ""
         specs_by_platform = group_subspecs_by_platform(spec)
         destination.parent.mkpath
-        Cache.write_lock(destination) do
-          FileUtils.rm_rf(destination)
-          FileUtils.cp_r(source, destination)
-          Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
-          Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
-        end
-      end
-
-      def group_subspecs_by_platform(spec)
-        specs_by_platform = {}
-        [spec, *spec.recursive_subspecs].each do |ss|
-          ss.available_platforms.each do |platform|
-            specs_by_platform[platform] ||= []
-            specs_by_platform[platform] << ss
+        Pod::Downloader::Cache.write_lock(destination) do
+          if source && source.exist? && !source.children.empty?
+            FileUtils.rm_rf(destination)
+            FileUtils.cp_r(source, destination)
           end
+          LgPodPlugin.log_green "-> Copy #{name} from #{source} to #{destination}"
+          Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
+          Pod::Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
         end
-        specs_by_platform
       end
 
-      # Writes the given `spec` to the given `path`.
-      #
-      # @param  [Specification] spec
-      #         the specification to be written.
-      #
-      # @param  [Pathname] path
-      #         the path the specification is to be written to.
-      #
-      # @return [Void]
-      #
+      public
       def write_spec(spec, path)
         path.dirname.mkpath
-        Cache.write_lock(path) do
+        Pod::Downloader::Cache.write_lock(path) do
           path.open('w') { |f| f.write spec.to_pretty_json }
         end
       end
+
     end
   end
-end
+end

data/lib/lg_pod_plugin/downloader/request.rb

@@ -6,7 +6,7 @@ module LgPodPlugin
   class LRequest
     attr_reader :target
     attr_reader :name
-    attr_accessor :lg_spec
+    attr_accessor :podspec
     attr_reader :released_pod
     attr_accessor :single_git
     attr_accessor :config
@@ -16,12 +16,10 @@ module LgPodPlugin
     attr_accessor :checkout_options
     def initialize(pod)
       @name = pod.name
+      @podspec = pod.spec
       @target = pod.target
       @released_pod = pod.released_pod
       @checkout_options = pod.checkout_options
-      if pod.spec
-        @lg_spec = pod.spec
-      end
       self.preprocess_request
     end
 

data/lib/lg_pod_plugin/git/github_api.rb

@@ -5,7 +5,7 @@ module LgPodPlugin
 
   class GithubAPI
 
-    #获取 gitlab最新 commit_id
+    # 获取 gitlab最新 commit_id
     def self.request_github_refs_heads(git, branch)
       base_url = LUtils.get_gitlab_base_url git
       if base_url.include?("https://github.com/")
@@ -55,6 +55,7 @@ module LgPodPlugin
     end
 
     public
+
     def self.get_gitlab_repository_tree(git, sha)
       base_url = LUtils.get_gitlab_base_url git
       if base_url.include?("https://github.com/")
@@ -85,54 +86,6 @@ module LgPodPlugin
       end
     end
 
-    public
-
-    def self.get_podspec_file_content(git, sha, filename)
-      base_url = LUtils.get_gitlab_base_url git
-      if base_url.include?("https://github.com/")
-        repo_name = base_url.split("https://github.com/", 0).last
-      elsif base_url.include?("git@github.com:")
-        repo_name = base_url.split("git@github.com:", 0).last
-      else
-        repo_name = nil
-      end
-      return nil unless repo_name
-      trees = self.get_gitlab_repository_tree git, sha
-      return nil if trees.empty?
-      request_url = nil
-      trees.each do |dict|
-        type = dict["type"]
-        next if type == "tree"
-        path = dict["path"]
-        next unless path.include?(".podspec")
-        if path == filename
-          request_url = dict["url"]
-          break
-        end
-      end
-      begin
-        uri = URI(request_url)
-        res = Net::HTTP.get_response(uri)
-        if res.body
-          json = JSON.parse(res.body)
-        else
-          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"
-          content = LUtils.base64_decode(content)
-          return content
-        else
-          return nil
-        end
-      rescue
-        return nil
-      end
-    end
-
   end
 
 end

data/lib/lg_pod_plugin/git/github_archive.rb

@@ -1,15 +1,17 @@
 require 'uri'
 require_relative 'git_download'
 require_relative '../utils/l_util'
-require_relative '../config/podspec'
 
 module LgPodPlugin
 
   class GitHubArchive
     private
+
     attr_reader :checkout_options
+
     public
-    REQUIRED_ATTRS ||= %i[git tag name commit branch config path spec].freeze
+
+    REQUIRED_ATTRS ||= %i[git tag name commit branch config path].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
     def initialize(checkout_options = {})
@@ -17,7 +19,6 @@ module LgPodPlugin
       self.tag = checkout_options[:tag]
       self.name = checkout_options[:name]
       self.path = checkout_options[:path]
-      self.spec = checkout_options[:spec]
       self.config = checkout_options[:config]
       self.commit = checkout_options[:commit]
       self.branch = checkout_options[:branch]
@@ -41,15 +42,7 @@ module LgPodPlugin
       download_params["name"] = self.name
       download_params["type"] = "github-tag"
       download_params["path"] = root_path.to_path
-      download_params["download_urls"] = download_urls
-      if self.spec
-        download_params["podspec"] = self.spec
-        download_params["source_files"] = self.spec.source_files.keys
-        download_params["podspec_content"] = nil
-      else
-        download_params["podspec"] = nil
-        download_params["source_files"] = ["All"]
-      end
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -60,14 +53,7 @@ module LgPodPlugin
       download_params["name"] = self.name
       download_params["type"] = "github-branch"
       download_params["path"] = root_path.to_path
-      download_params["download_urls"] = download_urls
-      if self.spec
-        download_params["podspec"] = self.spec
-        download_params["source_files"] = self.spec.source_files.keys
-      else
-        download_params["podspec"] = nil
-        download_params["source_files"] = ["All"]
-      end
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -78,14 +64,7 @@ module LgPodPlugin
       download_params["name"] = self.name
       download_params["type"] = "github-commit"
       download_params["path"] = root_path.to_path
-      download_params["download_urls"] = download_urls
-      if self.spec
-        download_params["podspec"] = self.spec
-        download_params["source_files"] = self.spec.source_files.keys
-      else
-        download_params["podspec"] = nil
-        download_params["source_files"] = ["All"]
-      end
+      download_params = download_params.merge(download_urls)
       download_params
     end
 
@@ -102,18 +81,18 @@ module LgPodPlugin
       return nil unless repo_name
       if self.git && self.tag
         download_url = "https://codeload.github.com/#{repo_name}/tar.gz/refs/tags/#{self.tag}"
-        [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+        { "filename" => "#{project_name}.tar.gz", "url" => download_url }
       elsif self.git && self.branch
         if self.branch == "HEAD"
           download_url = "https://gh.api.99988866.xyz/" + "#{base_url}" + "/archive/#{self.branch}.tar.gz"
-          [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+          { "filename" => "#{project_name}.tar.gz", "url" => download_url }
         else
           download_url = "https://codeload.github.com/#{repo_name}/tar.gz/refs/heads/#{self.branch}"
-          [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+          { "filename" => "#{project_name}.tar.gz", "url" => download_url }
         end
       elsif self.git && self.commit
         download_url = "https://codeload.github.com/#{repo_name}/tar.gz/#{self.commit}"
-        return [{ "filename" => "#{project_name}.tar.gz", "url" => download_url }]
+        return { "filename" => "#{project_name}.tar.gz", "url" => download_url }
       else
         nil
       end

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -23,10 +23,11 @@ module LgPodPlugin
         return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if encrypt_access_token.nil?
       end
       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"] ||= Time.now.to_i
-      user_model = LUserAuthInfo.new(user_id, "", "", uri.hostname, access_token, refresh_token, (created_at + expires_in))
+      created_at = json["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
@@ -48,13 +49,12 @@ module LgPodPlugin
     def self.check_gitlab_access_token_valid(uri, user_info)
       time_now = Time.now.to_i
       refresh_token = user_info.refresh_token
-      # 判断 token 是否失效
-      if user_info.expires_in  <= time_now
-        if refresh_token.nil? || 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_vaild = GitLabAPI.request_user_emails(uri.hostname, user_info.access_token)
-          if token_vaild == "success"
-            new_user_info = LUserAuthInfo.new(user_info.id, "", "", uri.hostname, user_info.access_token, nil, (time_now + 7879680))
+          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
@@ -63,21 +63,25 @@ module LgPodPlugin
             return self.get_gitlab_access_token_input(uri, user_info.id, nil, nil)
           end
         else
-          # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
-          return refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
+          return user_info
         end
       else
-        update_time = user_info.update_time.to_i
-        if time_now - update_time > 1800
-          user_info = refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
-          return  user_info
+        # 判断 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
-          return user_info
+          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.refreshUserToken(uri, refresh_token, user_id, username, password)
+    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
@@ -109,7 +113,7 @@ module LgPodPlugin
         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)
+        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
@@ -148,6 +152,7 @@ module LgPodPlugin
         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
@@ -259,46 +264,46 @@ 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.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