lg_pod_plugin 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fa41fbaf71702b19bf2ef604d2283f68d472e5c47428890398463556a985f7
-  data.tar.gz: 9c45761ced23924ce2e70557245d70eb883b4f7158c63acfeb3f0547af2e1fdc
+  metadata.gz: e16255ce6cf29df74aa508c022dc083727d4fd78f65d95a0b68b57b10e075767
+  data.tar.gz: f1ac6d11e1cae7f98ee7332aca930d2389b9c07799270755dd8fd1b03a9e1cbb
 SHA512:
-  metadata.gz: 549679243cd9e06a3d4626c06c79733bd779817e018bc5c46eb75f1731f7c5806f98bc02956ffd2e696b34e8ca1fb29f3fffb33feb231b9cb07180c3189ad586
-  data.tar.gz: 00d3b2bf9cf9d22c87141e63872b2dd466658d14972b1e8b4a4ae2a5f23d3fbb96195971cddc8063bc38cc97b4d7468422c9ccbe330e70aac6af80ce1126dcc0
+  metadata.gz: 2f5dafc9da762041041bd32f38dfe4cc5d1ef399ff5caaf443574f048fc8a14b915b76ae1ec22916ad458a0f53433877ec8301079e725da097e8736c886cee71
+  data.tar.gz: bfc2c0c5835737c9c2cecc3002f61baffcc96ef75057dea47bc7aea9131c1e8df6ca58c54b307e25f8d3b9c5a318b583583586c010952001343f824eb6701813

data/lib/lg_pod_plugin/database.rb

@@ -1,16 +1,16 @@
 require "sqlite3"
 require 'singleton'
-require_relative 'cache'
+require_relative 'l_cache'
 
 module LgPodPlugin
 
-  class SqliteDb
+  class LSqliteDb
     include Singleton
     REQUIRED_ATTRS ||= %i[db table_name].freeze
     attr_accessor(*REQUIRED_ATTRS)
     # 初始化 db
     def initialize
-      root_path = FileManager.download_director.join("database")
+      root_path = LFileManager.download_director.join("database")
       db_file_path = root_path.join("my.db")
       if !root_path.exist? || !db_file_path.exist?
         FileUtils.mkdir(root_path)
@@ -68,7 +68,7 @@ module LgPodPlugin
     end
 
     def select_table(name, branch)
-      pod_info = CachePodInfo.new
+      pod_info = LCachePodInfo.new
       self.db.execute( "select * from #{self.table_name} where name = '#{name}' and branch = '#{branch}'; ") do |row|
         pod_info.name = row[1]
         pod_info.branch = row[2]
@@ -83,7 +83,7 @@ module LgPodPlugin
     def select_tables(name, branch)
       array = []
       self.db.execute( "select * from #{self.table_name} where name = '#{name}' and branch != '#{branch}' order by update_time;") do |row|
-        pod_info = CachePodInfo.new
+        pod_info = LCachePodInfo.new
         pod_info.name = row[1]
         pod_info.branch = row[2]
         pod_info.sha = row[3]

data/lib/lg_pod_plugin/download.rb

@@ -1,137 +1,95 @@
 require 'git'
-require_relative 'cache'
+require_relative 'l_cache'
 require_relative 'database'
 require_relative 'file_path'
 
 module LgPodPlugin
 
-  class Downloader
+  class LDownloader
 
-    REQUIRED_ATTRS ||= %i[git name commit branch tag options git_util db cache is_cache].freeze
+    REQUIRED_ATTRS ||= %i[git name commit branch tag options].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
-    def initialize
-      self.cache = Cache.new
-      self.db = SqliteDb.instance
-      super
-    end
-
-    def download_init(name, options = {})
-      hash_map = options
+    def initialize(name, options = {})
       self.name = name
-      self.git = hash_map[:git]
-      self.tag = hash_map[:tag]
-      self.branch = hash_map[:branch]
-      self.commit = hash_map[:commit]
-      self.is_cache = hash_map[:depth]
-      # 通过ls-remote获取 head 指向 branch
-      if !self.branch && self.git
-        ls = Git.ls_remote(self.git, :head => true)
-        head_ref = ls["head"][:sha]
-        ls["branches"].each do |key, value|
-          sha = value[:sha]
-          next if sha != head_ref
-          self.branch = key
-          hash_map[:branch] = key
-          break
-        end
-      end
-      self.options = hash_map
+      self.options = options
+      self.git = options[:git]
+      self.tag = options[:tag]
+      self.branch = options[:branch]
+      self.commit = options[:commit]
     end
+    
+    # def check_cache_valid(name, branch)
+    #   self.db.should_clean_pod_info(name, branch)
+    # end
 
-    def is_update_pod
-      cgi = CGI.new
-      command_keys = cgi.keys
-      unless command_keys.count > 0
-        return false
-      end
-      first_key = command_keys[0].to_s ||= ""
-      if first_key.include?("install")
-        false
-      elsif first_key.include?("update")
-        true
+    # 预下载处理
+    def pre_download_pod
+      if self.branch
+        LgPodPlugin.log_green "Using `#{name}` (#{branch})"
       else
-        false
+        LgPodPlugin.log_green "Using `#{name}`"
       end
-    end
-
-    def check_cache_valid(name, branch)
-      self.db.should_clean_pod_info(name, branch)
-    end
-
-    # 预下载处理
-    def pre_download_pod(git)
-      self.git_util = git
-      is_update = self.is_update_pod
-      self.git_util.git_init(self.name, self.options)
-      git_url = options[:git]
-      # commit = options[:commit]
-      branch = options[:branch]
-      LgPodPlugin.log_green "Using `#{name}` (#{branch})"
       # 发现本地有缓存, 不需要更新缓存
-      need_download, new_commit = self.cache.find_pod_cache(name, git_url, branch, is_update)
-      unless need_download
+      need_download = LRequest.shared.cache.find_pod_cache(self.name, self.git, self.branch, self.tag, self.commit, LRequest.shared.is_update)
+      if !need_download
         LgPodPlugin.log_green "find the cache of `#{name}`, you can use it now."
         return
+      else
+        LgPodPlugin.log_green "find the new commit of `#{name}`, Git downloading now."
       end
-
-      # 检查是否要清空缓存
-      if is_update
-        check_cache_valid(name, branch)
-      end
-
       # 本地 git 下载 pod 目录
-      pre_down_load_path = self.cache.get_download_path(name, git_url, branch)
-      real_pod_path = self.git_util.pre_download_git_remote(pre_down_load_path, branch)
+      LRequest.shared.git_util.pre_download_git_repository
+
       # 本地clone代码失败跳出去
-      unless real_pod_path.exist?
-        return
-      end
-      # 切换到本地git仓库目录下
-      FileUtils.chdir(real_pod_path)
-      unless real_pod_path.glob("*.git")
-        return
-      end
-      # 使用branch克隆代码
-      git = Git.open(Pathname("./"))
-      current_branch = git.current_branch
-      if current_branch == branch # 要 clone 的分支正好等于当前分支
-        current_commit = git.log(1).to_s
-        if new_commit != current_commit && is_update
-          #删除旧的pod 缓存
-          self.cache.clean_old_cache(name, git_url, current_commit)
-          LgPodPlugin.log_green "git pull #{name} origin/#{current_branch}"
-          self.git_util.should_pull(git, current_branch, new_commit)
-          current_commit = new_commit
-        end
-        hash_map = { :git => git_url }
-        if current_commit
-          hash_map[:commit] = current_commit
-        end
-        SqliteDb.instance.insert_table(name, branch, current_commit, nil, real_pod_path)
-        LgPodPlugin::Cache.cache_pod(name, real_pod_path, is_update, hash_map)
-      else
-        branch_exist = git.branches.local.find { |e| e.to_s == branch }
-        if branch_exist
-          LgPodPlugin.log_green "git switch #{name} #{git_url} -b #{branch}"
-          self.git_util.git_switch(branch)
-        else
-          LgPodPlugin.log_green "git checkout  #{name} #{git_url} -b #{branch}"
-          self.git_util.git_checkout(branch)
-        end
-        current_commit = git.log(1).to_s
-        if current_commit != new_commit
-          LgPodPlugin.log_green "git pull  #{name} #{git_url} -b #{branch}"
-          self.git_util.should_pull(git, current_branch, new_commit)
-          current_commit = new_commit
-        end
-        hash_map = { :git => git_url }
-        if current_commit
-          hash_map[:commit] = current_commit
-        end
-        SqliteDb.instance.insert_table(name, branch, current_commit, nil, real_pod_path)
-        LgPodPlugin::Cache.cache_pod(name, real_pod_path, is_update, hash_map)
-      end
+      # unless real_pod_path.exist?
+      #   return
+      # end
+      # # 切换到本地git仓库目录下
+      # FileUtils.chdir(real_pod_path)
+      # unless real_pod_path.glob("*.git")
+      #   return
+      # end
+      # # 使用branch克隆代码
+      # git = Git.open(Pathname("./"))
+      # current_branch = git.current_branch
+      # if current_branch == branch # 要 clone 的分支正好等于当前分支
+      #   current_commit = git.log(1).to_s
+      #   if new_commit != current_commit && is_update
+      #     #删除旧的pod 缓存
+      #     self.cache.clean_old_cache(name, git_url, current_commit)
+      #     LgPodPlugin.log_green "git pull #{name} origin/#{current_branch}"
+      #     self.git_util.should_pull(git, current_branch, new_commit)
+      #     current_commit = new_commit
+      #   end
+      #   hash_map = { :git => git_url }
+      #   if current_commit
+      #     hash_map[:commit] = current_commit
+      #   end
+      #   LSqliteDb.instance.insert_table(name, branch, current_commit, nil, real_pod_path)
+      #   LgPodPlugin::LCache.cache_pod(name, real_pod_path, is_update, hash_map)
+      # else
+      #   branch_exist = git.branches.local.find { |e| e.to_s == branch }
+      #   if branch_exist
+      #     LgPodPlugin.log_green "git switch #{name} #{git_url} -b #{branch}"
+      #     self.git_util.git_switch(branch)
+      #   else
+      #     LgPodPlugin.log_green "git checkout  #{name} #{git_url} -b #{branch}"
+      #     self.git_util.git_checkout(branch)
+      #   end
+      #   current_commit = git.log(1).to_s
+      #   if current_commit != new_commit
+      #     LgPodPlugin.log_green "git pull  #{name} #{git_url} -b #{branch}"
+      #     self.git_util.should_pull(git, current_branch, new_commit)
+      #     current_commit = new_commit
+      #   end
+      #   hash_map = { :git => git_url }
+      #   if current_commit
+      #     hash_map[:commit] = current_commit
+      #   end
+      #   LSqliteDb.instance.insert_table(name, branch, current_commit, nil, real_pod_path)
+      #   LgPodPlugin::LCache.cache_pod(name, real_pod_path, is_update, hash_map)
+      # end
 
     end
 

data/lib/lg_pod_plugin/file_path.rb

@@ -1,7 +1,7 @@
 
 module LgPodPlugin
 
-  class FileManager
+  class LFileManager
 
     def self.cache_director
       Pathname(File.join(Dir.home, "Library/Caches"))
@@ -9,7 +9,7 @@ module LgPodPlugin
 
     # 本地下载路径 ~Library/Caches/LgPodPlugin
     def self.download_director
-      cache_path =  self.cache_director.join("LgPodPlugin")
+      cache_path = self.cache_director.join("LgPodPlugin")
       unless cache_path.exist?
         # pp "文件路径不存在"
         cache_path.mkdir(0700)
@@ -17,8 +17,12 @@ module LgPodPlugin
       cache_path
     end
 
-    def self.download_pod_path(name)
-      download_director.join(name)
+    # pod缓存工作目录, 根据项目所在路径计算所得 确保唯一
+    def self.cache_workspace(root)
+      timestamp = "_#{Time.now.to_i}_"
+      key = root.to_path + timestamp + "#{(rand() * 10000000).to_i}"
+      director = Digest::MD5.hexdigest(key)
+      return self.download_director.join(director)
     end
 
   end

data/lib/lg_pod_plugin/git_util.rb

@@ -1,92 +1,80 @@
 require 'pp'
 require 'git'
-require_relative 'cache'
+require_relative 'request'
+require_relative 'l_cache'
 
 module LgPodPlugin
 
-  class GitUtil
-    # attr_accessor :git
-    # attr_accessor :tag
-    # attr_accessor :path
-    # attr_accessor :name
-    # attr_accessor :commit
-    # attr_accessor :branch
-    # attr_accessor :temp_git_path
-    REQUIRED_ATTRS ||= %i[git tag path name commit branch temp_git_path is_cache].freeze
-    attr_accessor(*REQUIRED_ATTRS)
+  class LGitUtil
 
-    def initialize
-      super
-    end
+    REQUIRED_ATTRS ||= %i[git tag path name commit branch].freeze
+    attr_accessor(*REQUIRED_ATTRS)
 
-    def git_init(name, options = {})
+    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]
-      self.is_cache = options[:depth]
     end
 
-    def git_clone(path)
-      if self.branch
-        temp_git_path = path.join("l-temp-pod")
-        LgPodPlugin.log_yellow "git clone --template= --single-branch --depth 1 --branch #{self.branch} #{self.git}"
-        system("git clone --template= --single-branch --depth 1 --branch #{self.branch} #{self.git} #{temp_git_path}")
-        temp_git_path
-      else
-         nil
+    def git_clone_repository(path)
+      FileUtils.chdir(path)
+      temp_name = "lg_temp_pod"
+      if self.git && self.tag
+        LgPodPlugin.log_blue "git clone --tag #{self.tag} #{self.git}"
+        system("git clone --depth=1 -b #{self.tag} #{self.git} #{temp_name}")
+      elsif self.git && self.branch
+        LgPodPlugin.log_blue "git clone --depth=1 --branch #{self.branch} #{self.git}"
+        system("git clone --depth=1 -b #{self.branch} #{self.git} #{temp_name}")
+      elsif self.git && self.commit
+        LgPodPlugin.log_blue "git clone #{self.git}"
+        git = Git.init(temp_name)
+        FileUtils.chdir(temp_name)
+        system("git remote add origin #{self.git}")
+        system("git fetch origin #{self.commit}")
+        system("git reset --hard FETCH_HEAD")
       end
+      return path.join(temp_name)
     end
 
-    def git_checkout(branch)
-        system("git checkout -b #{branch}")
-    end
-    
-    def git_switch(branch)
-        system("git switch #{branch}")
-    end
+    # def git_checkout(branch)
+    #     system("git checkout -b #{branch}")
+    # end
+    #
+    # def git_switch(branch)
+    #     system("git switch #{branch}")
+    # end
 
-    #noinspection RubyNilAnalysis
-    def pre_download_git_remote(path, branch)
-      lg_pod_path = Pathname(path)
-      root_path = FileManager.download_director
-      pod_info_db = SqliteDb.instance.select_table(self.name, branch)
-      if lg_pod_path.exist? && pod_info_db.branch
-        return lg_pod_path
+    def request_params
+      hash_map = {:git => git}
+      if git && tag
+        hash_map[:tag] = tag
+        hash_map[:commit] = self.commit
+      else
+        hash_map[:commit] = commit
       end
+      return hash_map
+    end
 
-      FileUtils.chdir(root_path)
-      temp_path = root_path.join("temp")
+    def pre_download_git_repository
+      temp_path = LFileManager.download_director.join("temp")
       if temp_path.exist?
-        FileUtils.rm_r(temp_path)
+        FileUtils.rm_rf(temp_path)
       end
-      temp_path.mkdir(0700)
-      FileUtils.chdir(temp_path)
-      #clone仓库
-      get_temp_folder = git_clone(temp_path)
+      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.exist?
         return nil
       end
-
-      if self.is_cache
-        pod_root_director = FileManager.download_pod_path(name)
-        unless pod_root_director.exist?
-          FileUtils.mkdir(pod_root_director)
-        end
-        FileUtils.mv(get_temp_folder, lg_pod_path)
-        temp_path.rmdir
-        lg_pod_path
-      else
-        commit = GitUtil.git_ls_remote_refs(self.git, self.branch)
-        LgPodPlugin::Cache.cache_pod(self.name, get_temp_folder, true, {:git => self.git, :commit => commit})
-        system("cd ..")
-        system("rm -rf #{get_temp_folder.to_path}")
-        return lg_pod_path
-      end
-
+      LgPodPlugin::LCache.cache_pod(self.name, get_temp_folder, self.request_params)
+      FileUtils.chdir(LFileManager.download_director)
+      FileUtils.rm_rf(lg_pod_path)
     end
 
     # 本地pod库git操作
@@ -119,29 +107,45 @@ module LgPodPlugin
     end
 
     # 获取最新的一条 commit 信息
-    def self.git_ls_remote_refs(git, branch)
-      last_commit = nil
-      LgPodPlugin.log_yellow "git ls-remote #{git} #{branch}"
-      sha = %x(git ls-remote #{git} #{branch}).split(" ").first
-      if sha
-        last_commit = sha
-        return last_commit
+    def self.git_ls_remote_refs(git, branch, tag, commit)
+      if branch
+        LgPodPlugin.log_yellow "git ls-remote #{git} #{branch}"
+        new_commit = %x(git ls-remote #{git} #{branch}).split(" ").first
+        return [branch, new_commit]
+      end
+      ls = Git.ls_remote(git, :head => true )
+      if tag
+        map = ls["tags"]
+        keys = map.keys
+        idx = keys.index("#{tag}")
+        unless idx
+          return [nil, nil]
+        end
+        key = keys[idx]
+        new_commit = map[key][:sha]
+        return [nil, new_commit]
       else
-        ls = Git.ls_remote(git, :refs => true )
-        find_branch = ls["branches"][branch]
-        if find_branch
-          last_commit = find_branch[:sha]
-          return last_commit
+        new_commit = nil
+        new_branch = nil 
+        find_commit = commit ||= ls["head"][:sha]
+        ls["branches"].each do |key, value|
+          sha = value[:sha]
+          next if sha != find_commit
+          new_branch = key
+          new_commit = find_commit
+          return [new_branch, new_commit]
+          break
         end
-        return nil
+        return [new_branch , new_commit]
       end
     end
 
     # 是否pull 代码
     def should_pull(git, branch, new_commit = nil)
-      git_url = git.remote.url
+      new_barnch = branch ||= self.branch
+      git_url = git.remote.url ||= self.git
       if new_commit == nil
-        new_commit = GitUtil.git_ls_remote_refs(git_url, branch)
+        new_branch, new_commit = LGitUtil.git_ls_remote_refs(git_url, new_barnch,nil, nil)
       end
       local_commit = git.log(1).to_s  #本地最后一条 commit hash 值
       if local_commit != new_commit