lg_pod_plugin 1.1.0 → 1.1.1

data/lib/lg_pod_plugin/gitlab_archive.rb

@@ -0,0 +1,287 @@
+require 'uri'
+require_relative 'request'
+require_relative 'l_util'
+require_relative 'l_config'
+require_relative 'podspec'
+require_relative 'gitlab_api'
+
+module LgPodPlugin
+
+  class GitLabArchive
+    REQUIRED_ATTRS ||= %i[git tag name commit branch].freeze
+    attr_accessor(*REQUIRED_ATTRS)
+
+    def initialize(name, git, branch, tag, commit)
+      self.git = git ||= LRequest.shared.request_params[:git]
+      self.tag = tag ||= LRequest.shared.request_params[:tag]
+      self.name = name ||= LRequest.shared.request_params[:name]
+      self.commit = commit ||= LRequest.shared.request_params[:commit]
+      self.branch = branch ||= LRequest.shared.request_params[:branch]
+    end
+
+    # 下载某个文件zip格式
+    def gitlab_download_file_by_name(path, filename, temp_name, project_name)
+      host = LRequest.shared.config.host
+      project = LRequest.shared.config.project
+      unless host
+        http = Ping.new(project.web_url)
+        host = http.uri.scheme + "://" + http.uri.hostname
+      end
+      if self.git && self.tag
+        sha = self.tag
+      elsif self.git && self.branch
+        sha = self.branch
+      elsif self.git && self.commit
+        sha = self.commit
+      end
+      token = LRequest.shared.config.access_token
+      begin
+        encode_fiename = LUtils.url_encode(filename)
+        download_url = host + "/api/v4/projects/" + "#{project.id}" + "/repository/archive.zip#{"\\?"}" + "path#{"\\="}#{encode_fiename}#{"\\&"}sha#{"\\="}#{sha}"
+      rescue => exception
+        return nil
+      end
+      LUtils.download_gitlab_zip_file(download_url, token, temp_name)
+      return nil unless File.exist?(temp_name)
+      return nil unless (result = LUtils.unzip_file(temp_name, "./"))
+      temp_zip_folder = nil
+      path.each_child do |f|
+        ftype = File::ftype(f)
+        next unless ftype == "directory"
+        next unless f.to_path.include?("#{filename}") || f.to_path.include?("#{project_name}")
+        temp_zip_folder = f
+        break
+      end
+      return nil unless temp_zip_folder && temp_zip_folder.exist?
+      begin
+        FileUtils.chdir(temp_zip_folder)
+        temp_zip_folder.each_child do |f|
+          ftype = File::ftype(f)
+          FileUtils.mv(f, path)
+        end
+        FileUtils.chdir(path)
+        FileUtils.rm_rf(temp_zip_folder)
+        FileUtils.rm_rf("./#{temp_name}")
+        return path
+      rescue => exception
+        pp exception
+        return path
+      end
+    end
+
+    # 从 GitLab下载 zip包
+    # 根据branch 下载 zip 包
+    def gitlab_download_branch_zip(root_path, temp_name)
+      project_path = root_path.join(self.name)
+      unless project_path.exist?
+        project_path.mkdir
+        FileUtils.chdir(project_path)
+      end
+      branch = self.branch ||= "master"
+      token = LRequest.shared.config.access_token
+      base_url = LRequest.shared.config.project.web_url
+      project_name = LRequest.shared.config.project.path
+      podspec_name = self.name + ".podspec"
+      LgPodPlugin.log_blue "开始下载 => #{base_url}"
+      self.gitlab_download_file_by_name(project_path, podspec_name,"#{podspec_name}.zip", project_name)
+      podspec_path = project_path.join(podspec_name)
+      return nil unless File.exist?(podspec_path)
+      begin
+        need_download_files = PodSpec.form_file(podspec_path).source_files
+      rescue
+        need_download_files = Set[]
+      end
+      unless !need_download_files.empty?
+        FileUtils.chdir(root_path)
+        file_name = "#{temp_name}.zip"
+        download_url = LUtils.get_gitlab_download_url(base_url, branch, nil, nil, project_name)
+        raise "download_url不存在" unless download_url
+        # LgPodPlugin.log_blue "开始下载 => #{download_url}"
+        LUtils.download_gitlab_zip_file(download_url, token, file_name)
+        raise "下载zip包失败, 尝试git clone #{self.git}" unless File.exist?(file_name)
+        # 解压文件
+        result = LUtils.unzip_file(root_path.join(file_name).to_path, "./")
+        new_file_name = "#{project_name}-#{branch}"
+        raise "解压文件失败, #{new_file_name}不存在" unless result && File.exist?(new_file_name)
+        return root_path.join(new_file_name)
+      end
+      need_download_files.each do |file|
+        next if project_path.join(file).exist?
+        self.gitlab_download_file_by_name(project_path, file,"#{file}.zip", project_name)
+      end
+      return project_path
+    end
+
+    # 通过tag下载zip包
+    def gitlab_download_tag_zip(root_path, temp_name)
+      project_path = root_path.join(self.name)
+      unless project_path.exist?
+        project_path.mkdir
+        FileUtils.chdir(project_path)
+      end
+      token = LRequest.shared.config.access_token
+      base_url = LRequest.shared.config.project.web_url
+      project_name = LRequest.shared.config.project.path
+      podspec_name = self.name + ".podspec"
+      LgPodPlugin.log_blue "开始下载 => #{base_url}"
+      self.gitlab_download_file_by_name(project_path, podspec_name,"#{podspec_name}.zip", project_name)
+      podspec_path = project_path.join(podspec_name)
+      return nil unless File.exist?(podspec_path)
+      begin
+        need_download_files = PodSpec.form_file(podspec_path).source_files
+      rescue
+        need_download_files = Set[]
+      end
+      unless !need_download_files.empty?
+        tag = self.tag
+        FileUtils.chdir(root_path)
+        file_name = "#{temp_name}.zip"
+        download_url = LUtils.get_gitlab_download_url(base_url, nil, tag, nil, project_name)
+        raise "download_url不存在" unless download_url
+        LUtils.download_gitlab_zip_file(download_url, token, file_name)
+        raise "下载zip包失败, 尝试git clone #{self.git}" unless File.exist?(file_name)
+        # 解压文件
+        result = LUtils.unzip_file(root_path.join(file_name).to_path, "./")
+        new_file_name = "#{project_name}-#{tag}"
+        raise "解压文件失败, #{new_file_name}不存在" unless result && File.exist?(new_file_name)
+        return root_path.join(new_file_name)
+      end
+      need_download_files.each do |file|
+        self.gitlab_download_file_by_name(project_path, file,"#{file}.zip", project_name)
+      end
+      return project_path
+    end
+
+    # 通过 commit 下载zip包
+    def gitlab_download_commit_zip(root_path, temp_name)
+      project_path = root_path.join(self.name)
+      unless project_path.exist?
+        project_path.mkdir
+        FileUtils.chdir(project_path)
+      end
+      token = LRequest.shared.config.access_token
+      base_url = LRequest.shared.config.project.web_url
+      project_name = LRequest.shared.config.project.path
+      podspec_name = self.name + ".podspec"
+      LgPodPlugin.log_blue "开始下载 => #{base_url}"
+      self.gitlab_download_file_by_name(project_path, podspec_name,"#{podspec_name}.zip", project_name)
+      podspec_path = project_path.join(podspec_name)
+      return nil unless File.exist?(podspec_path)
+      begin
+        need_download_files = PodSpec.form_file(podspec_path).source_files
+      rescue
+        need_download_files = Set[]
+      end
+      unless !need_download_files.empty?
+        FileUtils.chdir(root_path)
+        file_name = "#{temp_name}.zip"
+        download_url = LUtils.get_gitlab_download_url(base_url, nil, nil, self.commit, project_name)
+        raise "download_url不存在" unless download_url
+        # LgPodPlugin.log_blue "开始下载 => #{download_url}"
+        LUtils.download_gitlab_zip_file(download_url, token, file_name)
+        raise "下载zip包失败, 尝试git clone #{self.git}" unless File.exist?(file_name)
+        # 解压文件
+        result = LUtils.unzip_file(root_path.join(file_name).to_path, "./")
+        new_file_name = "#{project_name}-#{self.commit}"
+        raise "解压文件失败, #{new_file_name}不存在" unless result && File.exist?(new_file_name)
+        return root_path.join(new_file_name)
+      end
+      need_download_files.each do |file|
+        self.gitlab_download_file_by_name(project_path, file,"#{file}.zip", project_name)
+      end
+      return project_path
+    end
+
+    # 从 Github下载 zip 包
+    # 根据branch 下载 zip 包
+    def github_download_branch_zip(path, temp_name)
+      file_name = "#{temp_name}.zip"
+      branch = self.branch ||= "master"
+      if self.git.include?(".git")
+        base_url = self.git[0...self.git.length - 4]
+      else
+        base_url = self.git
+      end
+      origin_url = base_url + "/archive/#{branch}.zip"
+      project_name = base_url.split("/").last if base_url
+      download_url = "https://gh.api.99988866.xyz/#{origin_url}"
+      LgPodPlugin.log_blue "开始下载 => #{download_url}"
+      LUtils.download_github_zip_file(download_url, file_name)
+      unless File.exist?(file_name)
+        LgPodPlugin.log_red("下载zip包失败, 尝试git clone #{self.git}")
+        return self.git_clone_by_branch(path, temp_name)
+      end
+      # 解压文件
+      result = LUtils.unzip_file(path.join(file_name).to_path, "./")
+      new_file_name = "#{project_name}-#{branch}"
+      unless result && File.exist?(new_file_name)
+        LgPodPlugin.log_red("正在尝试git clone #{self.git}")
+        return self.git_clone_by_branch(path, temp_name)
+      end
+      path.join(new_file_name)
+    end
+
+    # 通过tag下载zip包
+    def github_download_tag_zip(path, temp_name)
+      file_name = "#{temp_name}.zip"
+      if self.git.include?(".git")
+        base_url = self.git[0...self.git.length - 4]
+      else
+        base_url = self.git
+      end
+      project_name = base_url.split("/").last if base_url
+      origin_url = base_url + "/archive/refs/tags/#{self.tag}.zip"
+      download_url = "https://gh.api.99988866.xyz/#{origin_url}"
+      # 下载文件
+      LgPodPlugin.log_blue "开始下载 => #{download_url}"
+      LUtils.download_github_zip_file(download_url, file_name)
+      unless File.exist?(file_name)
+        LgPodPlugin.log_red("正在尝试git clone #{self.git}")
+        return self.git_clone_by_tag(path, temp_name)
+      end
+      # 解压文件
+      result = LUtils.unzip_file(path.join(file_name).to_path, "./")
+      if self.tag.include?("v") && self.tag[0...1] == "v"
+        this_tag = self.tag[1...self.tag.length]
+      else
+        this_tag = self.tag
+      end
+      new_file_name = "#{project_name}-#{this_tag}"
+      unless result && File.exist?(new_file_name)
+        LgPodPlugin.log_red("正在尝试git clone #{self.git}")
+        return self.git_clone_by_tag(path, temp_name)
+      end
+      path.join(new_file_name)
+    end
+
+    # 通过 commit 下载zip包
+    def github_download_commit_zip(path, temp_name)
+      file_name = "#{temp_name}.zip"
+      if self.git.include?(".git")
+        base_url = self.git[0...self.git.length - 4]
+      else
+        base_url = self.git
+      end
+      project_name = base_url.split("/").last if base_url
+      origin_url = base_url + "/archive/#{self.commit}.zip"
+      download_url = "https://gh.api.99988866.xyz/#{origin_url}"
+      # 下载文件
+      LgPodPlugin.log_blue "开始下载 => #{download_url}"
+      LUtils.download_github_zip_file(download_url, file_name)
+      unless File.exist?(file_name)
+        LgPodPlugin.log_red("正在尝试git clone #{self.git}")
+        return self.git_clone_by_commit(path, temp_name)
+      end
+      # 解压文件
+      result = LUtils.unzip_file(path.join(file_name).to_path, "./")
+      new_file_name = "#{project_name}-#{self.commit}"
+      unless result && File.exist?(new_file_name)
+        LgPodPlugin.log_red("正在尝试git clone #{self.git}")
+        return self.git_clone_by_commit(path, temp_name)
+      end
+      path.join(new_file_name)
+    end
+
+  end
+
+end

data/lib/lg_pod_plugin/gitlab_download.rb

@@ -0,0 +1,181 @@
+require 'pp'
+require 'git'
+require_relative 'l_config'
+require_relative 'l_util'
+require_relative 'request'
+require_relative 'l_cache'
+require_relative 'net-ping'
+require_relative 'database'
+require_relative 'gitlab_archive'
+
+module LgPodPlugin
+
+  class LGitUtil
+
+    REQUIRED_ATTRS ||= %i[git tag path name commit branch].freeze
+    attr_accessor(*REQUIRED_ATTRS)
+
+    def initialize(name, options = {})
+      self.name = name
+      self.git = options[:git]
+      self.tag = options[:tag]
+      self.path = options[:path]
+      self.branch = options[:branch]
+      self.commit = options[:commit]
+    end
+
+    def git_clone_by_branch(path, temp_name)
+      if self.git && self.branch
+        LgPodPlugin.log_blue "git clone --template= --single-branch --depth 1 -b #{self.branch} #{self.git}"
+        system("git clone --template= --single-branch --depth 1 -b #{self.branch} #{self.git} #{temp_name}")
+      else
+        LgPodPlugin.log_blue "git clone --template= --single-branch --depth 1 #{self.git}"
+        system("git clone --template= --single-branch --depth 1 #{self.git} #{temp_name}")
+      end
+      path.join(temp_name)
+    end
+
+    def git_clone_by_tag(path, temp_name)
+      LgPodPlugin.log_blue "git clone --template= --single-branch --depth 1 -b #{self.tag} #{self.git}"
+      system("git clone --template= --single-branch --depth 1 -b #{self.tag} #{self.git} #{temp_name}")
+      path.join(temp_name)
+    end
+
+    # git clone commit
+    def git_clone_by_commit(path, temp_name)
+      Git.init(temp_name)
+      FileUtils.chdir(temp_name)
+      LgPodPlugin.log_blue "git clone #{self.git}"
+      system("git remote add origin #{self.git}")
+      system("git fetch origin #{self.commit}")
+      system("git reset --hard FETCH_HEAD")
+      path.join(temp_name)
+    end
+
+    # clone 代码仓库
+    def git_clone_repository(path)
+      FileUtils.chdir(path)
+      temp_name = "lg_temp_pod"
+      git_archive = GitLabArchive.new(self.name, self.git, self.branch, self.tag, self.commit)
+      if self.git && self.tag
+        begin
+          if LUtils.is_use_gitlab_archive_file(self.git)
+            return git_archive.gitlab_download_tag_zip(path, temp_name)
+          elsif self.git.include?("https://github.com")
+            return git_archive.github_download_tag_zip path, temp_name
+          else
+            return self.git_clone_by_tag(path, temp_name)
+          end
+        rescue
+          return self.git_clone_by_tag(path, temp_name)
+        end
+      elsif self.git && self.branch
+        begin
+          if LUtils.is_use_gitlab_archive_file(self.git)
+            return git_archive.gitlab_download_branch_zip(path, temp_name)
+          elsif self.git.include?("https://github.com")
+            return git_archive.github_download_branch_zip path, temp_name
+          else
+            return self.git_clone_by_branch(path, temp_name)
+          end
+        rescue
+          return self.git_clone_by_branch(path, temp_name)
+        end
+      elsif self.git && self.commit
+        if LUtils.is_use_gitlab_archive_file(self.git)
+          return git_archive.gitlab_download_commit_zip(path, temp_name)
+        elsif self.git.include?("https://github.com")
+          return git_archive.github_download_commit_zip path, temp_name
+        else
+          return self.git_clone_by_commit(path, temp_name)
+        end
+      elsif self.git
+        if LUtils.is_use_gitlab_archive_file(self.git)
+          return git_archive.gitlab_download_branch_zip(path, temp_name)
+        elsif self.git.include?("https://github.com")
+          return git_archive.github_download_branch_zip path, temp_name
+        else
+          return self.git_clone_by_branch(path, temp_name)
+        end
+      end
+
+    end
+
+    # git 预下载
+    def pre_download_git_repository
+      temp_path = LFileManager.download_director.join("temp")
+      if temp_path.exist?
+        FileUtils.rm_rf(temp_path)
+      end
+      lg_pod_path = LRequest.shared.cache.cache_root
+      unless lg_pod_path.exist?
+        lg_pod_path.mkdir(0700)
+      end
+      get_temp_folder = git_clone_repository(lg_pod_path)
+      #下载 git 仓库失败
+      unless get_temp_folder && get_temp_folder.exist?
+        return nil
+      end
+      if LRequest.shared.single_git
+        LgPodPlugin::LCache.cache_pod(self.name, get_temp_folder, { :git => self.git })
+      end
+      LgPodPlugin::LCache.cache_pod(self.name, get_temp_folder, LRequest.shared.get_cache_key_params)
+      FileUtils.chdir(LFileManager.download_director)
+      FileUtils.rm_rf(lg_pod_path)
+    end
+
+    # 获取最新的一条 commit 信息
+    def self.git_ls_remote_refs(name,git, branch, tag, commit)
+      ip = LRequest.shared.net_ping.ip
+      network_ok = LRequest.shared.net_ping.network_ok
+      return [nil, nil] unless (ip && network_ok)
+      if branch
+        LgPodPlugin.log_blue "git ls-remote --refs #{git} #{branch}"
+        result = %x(timeout 5 git ls-remote --refs #{git} #{branch})
+        unless result && result != ""
+          id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+          pod_info = LSqliteDb.shared.query_pod_refs(id)
+          new_commit = pod_info.commit if pod_info
+          return [branch, new_commit]
+        end
+        new_commit = LUtils.commit_from_ls_remote(result, branch)
+        if new_commit
+          LSqliteDb.shared.insert_pod_refs(name, git, branch, tag, new_commit)
+        end
+        return [branch, new_commit]
+      elsif tag
+        LgPodPlugin.log_blue "git ls-remote --tags #{git}"
+        result = %x(timeout 5 git ls-remote --tags #{git})
+        unless result && result != ""
+          id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+          pod_info = LSqliteDb.shared.query_pod_refs(id)
+          new_commit = pod_info.commit if pod_info
+          return [nil, new_commit]
+        end
+        new_commit = LUtils.commit_from_ls_remote(result, tag)
+        if new_commit
+          LSqliteDb.shared.insert_pod_refs(name, git, branch, tag, new_commit)
+        end
+        return [nil, new_commit]
+      elsif commit
+        return nil, commit
+      else
+        LgPodPlugin.log_blue "git ls-remote --refs #{git}"
+        result = %x(timeout 5 git ls-remote -- #{git})
+        unless result && result != ""
+          id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+          pod_info = LSqliteDb.shared.query_pod_refs(id)
+          new_commit = pod_info.commit if pod_info
+          return [nil, new_commit]
+        end
+        new_commit = LUtils.commit_from_ls_remote(result, "HEAD")
+        if new_commit
+          LSqliteDb.shared.insert_pod_refs(name, git, branch, tag, new_commit)
+        end
+        return nil, new_commit
+      end
+    end
+
+  end
+
+end

data/lib/lg_pod_plugin/install.rb

@@ -4,14 +4,14 @@ require 'cgi'
 require 'cocoapods'
 require_relative 'request'
 require_relative 'database'
-require_relative 'git_util'
-require_relative 'downloader.rb'
+require_relative 'downloader'
 require 'cocoapods-core/podfile'
+require_relative 'gitlab_download'
 require 'cocoapods-core/podfile/target_definition'
+
 module LgPodPlugin
 
   class Installer
-
     REQUIRED_ATTRS ||= %i[name version options target real_name workspace].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
@@ -29,16 +29,20 @@ module LgPodPlugin
       self.target = profile.send(:current_target_definition)
       unless requirements && requirements.is_a?(Hash)
         LRequest.shared.libs.delete(name)
+        LRequest.shared.libs.delete(self.real_name)
         LgPodPlugin.log_red "pod `#{name}`, 缺少必要的 [git|commit|tag|branch] 参数"
         return
       end
-      hash_map = requirements
-      hash_map.delete(:path)
-      git = hash_map[:git]
+      git = requirements[:git]
+      tag = requirements[:tag]
+      commit = requirements[:commit]
+      branch = requirements[:branch]
+      hash_map = Hash.new
+      hash_map[:git] = git if git
+      hash_map[:tag] = tag if tag
+      hash_map[:commit] = commit if commit
+      hash_map[:branch] = branch if branch
       if git
-        tag = hash_map[:tag]
-        branch = hash_map[:branch]
-        commit = hash_map[:commit]
         if tag
           hash_map.delete(:branch)
           hash_map.delete(:commit)
@@ -56,15 +60,22 @@ module LgPodPlugin
       end
       self.options = hash_map
       LRequest.shared.setup_pod_info(self.name, self.workspace, hash_map)
+      LRequest.shared.downloader.real_name = self.real_name
       self.install_remote_pod(name, hash_map)
     end
 
     public
     def install_remote_pod(name, options = {})
-      if options[:git]
-        LRequest.shared.downloader.pre_download_pod
+      git = options[:git]
+      if git
+        if LRequest.shared.net_ping && LRequest.shared.net_ping.ip && LRequest.shared.net_ping.network_ok
+          LRequest.shared.downloader.pre_download_pod
+        else
+          LgPodPlugin.log_red "请求#{git} 超时, 下载失败!"
+        end
       else
         LRequest.shared.libs.delete(name)
+        LRequest.shared.libs.delete(self.real_name)
         LgPodPlugin.log_red "pod `#{name}`, 缺少必要的 [git|commit|tag|branch] 参数"
       end
     end
@@ -77,11 +88,10 @@ module LgPodPlugin
       if update
         if libs.empty?
           LgPodPlugin.log_red "no external pod update, you can use `pod update` to update --all pods"
-          # LgPodPlugin.log_green "bundle exec arch -x86_64 pod update #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""} "
-          # system("bundle exec arch -x86_64 pod update #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""} ")
+          system("bundle exec arch -x86_64 pod update #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""} ")
         else
           pod_names = libs.join(" ")
-          LgPodPlugin.log_green  libs.join("\n")
+          LgPodPlugin.log_green libs.join("\n")
           LgPodPlugin.log_green "bundle exec arch -x86_64 pod update #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""} "
           system("bundle exec arch -x86_64 pod update #{pod_names} #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""} ")
         end
@@ -100,21 +110,28 @@ module LgPodPlugin
         LgPodPlugin.log_red "no such file `Podfile`"
         return
       end
+      LRequest.shared.is_update = (command == "update")
       podfile = Pod::Podfile.from_file(podfile_path)
-      # LgPodPlugin.log_red "podfile => #{podfile} podfile_path => #{podfile_path}"
       target = podfile.send(:current_target_definition)
-      children = target.children
+      release_pods = []
       install_hash_map = {}
+      children = target.children
       children.each do |s|
         internal_hash = s.send(:internal_hash)
+        next unless internal_hash.is_a?(Hash)
         dependencies = internal_hash["dependencies"]
-        next unless dependencies
+        next unless dependencies.is_a?(Array)
         dependencies.each { |e|
           next unless e.is_a?(Hash)
           next if (key = e.keys.first) == nil
           next if (val = e[key].last) == nil
-          next unless val.is_a?(Hash)
-          install_hash_map[key] = val
+          if val.is_a?(Hash)
+            next unless val[:path] == nil
+            next unless val[:podspec] == nil
+            install_hash_map[key] = val
+          else
+            release_pods.append(key)
+          end
         }
       end
       LRequest.shared.libs = install_hash_map
@@ -126,7 +143,7 @@ module LgPodPlugin
       LgPodPlugin.log_red "开始安装pod"
       #切换工作目录到当前工程下, 开始执行pod install
       FileUtils.chdir(podfile_path.dirname)
-      libs = LRequest.shared.libs.keys ||= []
+      libs = LRequest.shared.libs.keys.empty? ? release_pods : LRequest.shared.libs.keys
       # 执行pod install/ update 方法入口
       update_pod = (command == "update")
       run_pod_install(update_pod, libs, options)

data/lib/lg_pod_plugin/l_cache.rb

@@ -16,8 +16,8 @@ module LgPodPlugin
     end
 
     #判断缓存是否存在且有效命中缓存
-    def find_pod_cache(name)
-      hash_map = LRequest.shared.get_cache_key_params
+    def find_pod_cache(name, options)
+      hash_map = Hash.new.merge!(options)
       request = LCache.download_request(name, hash_map)
       destination = LCache.path_for_pod(request, {})
       cache_pod_spec = LCache.path_for_spec(request, {})
@@ -134,7 +134,9 @@ module LgPodPlugin
     def self.write_spec(spec, path)
       path.dirname.mkpath
       Pod::Downloader::Cache.write_lock(path) do
-        path.open('w') { |f| f.write spec.to_pretty_json }
+        path.open('w') { |f|
+          f.write spec.to_pretty_json
+        }
       end
     end