lg_pod_plugin 1.0.3 → 1.0.6

data/lib/lg_pod_plugin/git_util.rb

@@ -1,94 +1,221 @@
 require 'pp'
 require 'git'
-require_relative 'cache'
+require_relative 'l_util'
+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
+    # 根据branch 下载 zip 包
+    def git_download_branch_zip(path, temp_name)
+      token = ""
+      file_name = "#{temp_name}.zip"
+      base_url = self.git[0...self.git.length - 4]
+      project_name = base_url.split("/").last
+      unless project_name
+        return self.git_clone_by_branch(path, temp_name)
+      end
+      download_url = base_url + "/-/archive/" + self.branch + "/#{project_name}-#{self.branch}.zip"
+      LgPodPlugin.log_blue "开始下载 => #{download_url}"
+      system("curl --header PRIVATE-TOKEN:#{token} -o #{file_name} --connect-timeout 15 #{download_url}")
+      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}-#{self.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
 
-    def git_checkout(branch)
-        system("git checkout -b #{branch}")
+    # 通过tag下载zip包
+    def git_download_tag_zip(path, temp_name)
+      token = ""
+      base_url = self.git[0...self.git.length - 4]
+      project_name = base_url.split("/").last
+      unless project_name
+        return self.git_clone_by_tag(path, temp_name)
+      end
+      file_name = "#{temp_name}.zip"
+      download_url = base_url + "/-/archive/" + self.tag + "/#{project_name}-#{self.tag}.zip"
+      # 下载文件
+      LgPodPlugin.log_blue "开始下载 => #{download_url}"
+      system("curl -s --header PRIVATE-TOKEN:#{token} -o #{file_name} #{download_url}")
+      unless File.exist?(file_name)
+        LgPodPlugin.log_red("下载zip包失败, 尝试git clone #{self.git}")
+        return self.git_clone_by_tag(path, temp_name)
+      end
+      # 解压文件
+      result = LUtils.unzip_file(path.join(file_name).to_path, "./")
+      new_file_name = "#{project_name}-#{self.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
-    
-    def git_switch(branch)
-        system("git switch #{branch}")
+    # 通过 commit 下载zip包
+    def git_download_commit_zip(path, temp_name)
+      token = ""
+      base_url = self.git[0...self.git.length - 4]
+      project_name = base_url.split("/").last
+      unless project_name
+        return self.git_clone_by_commit(path, temp_name)
+      end
+      file_name = "#{temp_name}.zip"
+      download_url = base_url + "/-/archive/" + self.commit + "/#{project_name}-#{self.commit}.zip"
+      # 下载文件
+      LgPodPlugin.log_blue "开始下载 => #{download_url}"
+      system("curl -s --header PRIVATE-TOKEN:#{token} -o #{file_name} #{download_url}")
+      unless File.exist?(file_name)
+        LgPodPlugin.log_red("下载zip包失败, 尝试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
+
+    def git_clone_by_branch(path, temp_name)
+      LgPodPlugin.log_blue "git clone --depth=1 --branch #{self.branch} #{self.git}"
+      system("git clone --depth=1 -b #{self.branch} #{self.git} #{temp_name}")
+      path.join(temp_name)
+    end
+
+    def git_clone_by_tag(path, temp_name)
+      LgPodPlugin.log_blue "git clone --tag #{self.tag} #{self.git}"
+      system("git clone --depth=1 -b #{self.tag} #{self.git} #{temp_name}")
+      path.join(temp_name)
+    end
+
+    def git_clone_by_commit(path, temp_name)
+      LgPodPlugin.log_blue "git clone #{self.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")
+      path.join(temp_name)
     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
+    # clone 代码仓库
+    def git_clone_repository(path)
+      FileUtils.chdir(path)
+      temp_name = "lg_temp_pod"
+      if self.git && self.tag
+        if self.git.include?("xxx/capp/iOS")
+          return git_download_tag_zip(path, temp_name)
+        else
+          return self.git_clone_by_tag(path, temp_name)
+        end
+      elsif self.git && self.branch
+        if self.git.include?("xxx/capp/iOS")
+          return self.git_download_branch_zip(path, temp_name)
+        else
+          return self.git_clone_by_branch(path, temp_name)
+        end
+      elsif self.git && self.commit
+        if self.git.include?("xxx/capp/iOS")
+          return self.git_download_commit_zip(path, temp_name)
+        else
+          return self.git_clone_by_commit(path, temp_name)
+        end
       end
+    end
 
-      FileUtils.chdir(root_path)
-      temp_path = root_path.join("temp")
+    # def git_checkout(branch)
+    #     system("git checkout -b #{branch}")
+    # end
+    #
+    # def git_switch(branch)
+    #     system("git switch #{branch}")
+    # end
+
+    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
+      hash_map
+    end
+
+    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
+      lg_pod_path = LRequest.shared.cache.cache_root
+      unless lg_pod_path.exist?
+        lg_pod_path.mkdir(0700)
       end
-      temp_path.mkdir(0700)
-      FileUtils.chdir(temp_path)
-      #clone仓库
-      get_temp_folder = git_clone(temp_path)
+      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)
+      LgPodPlugin::LCache.cache_pod(self.name, get_temp_folder, self.request_params)
+      FileUtils.chdir(LFileManager.download_director)
+      FileUtils.rm_rf(lg_pod_path)
+    end
+    
+    # 获取最新的一条 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
-        FileUtils.mv(get_temp_folder, lg_pod_path)
-        temp_path.rmdir
-        lg_pod_path
+        key = keys[idx]
+        new_commit = map[key][:sha]
+        return [nil, new_commit]
       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
+        new_commit = new_branch = nil
+        find_commit = 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]
+        end
+        return [new_branch , new_commit]
       end
-
     end
-
+    
     # 本地pod库git操作
     def git_local_pod_check(path)
       FileUtils.chdir(path)
@@ -117,31 +244,12 @@ module LgPodPlugin
         self.should_pop_stash(git, current_branch)
       end
     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
-      else
-        ls = Git.ls_remote(git, :refs => true )
-        find_branch = ls["branches"][branch]
-        if find_branch
-          last_commit = find_branch[:sha]
-          return last_commit
-        end
-        return nil
-      end
-    end
-
     # 是否pull 代码
     def should_pull(git, branch, new_commit = nil)
-      git_url = git.remote.url
+      new_branch = 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_commit = LGitUtil.git_ls_remote_refs(git_url, new_branch,nil, nil)
       end
       local_commit = git.log(1).to_s  #本地最后一条 commit hash 值
       if local_commit != new_commit

data/lib/lg_pod_plugin/install.rb

@@ -1,18 +1,17 @@
 require 'pp'
 require 'git'
 require 'cgi'
-require 'sqlite3'
 require 'cocoapods'
+require_relative 'request'
 require_relative 'database'
-require_relative 'download'
 require_relative 'git_util'
-require_relative 'pod_spec'
+require_relative 'downloader.rb'
 
 module LgPodPlugin
 
   class Installer
 
-    REQUIRED_ATTRS ||= %i[name version options profile target real_name downloader git_util].freeze
+    REQUIRED_ATTRS ||= %i[name version options target real_name workspace].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
     def initialize(profile, name, *requirements)
@@ -22,12 +21,11 @@ module LgPodPlugin
         self.name = name
       end
       self.real_name = name
-      self.profile = profile
-      self.git_util = GitUtil.new
-      self.downloader = Downloader.new
+      self.workspace = profile.send(:defined_in_file).dirname
       self.target = profile.send(:current_target_definition)
 
       unless requirements && !requirements.empty?
+        LRequest.shared.setup_pod_info(self.name, self.workspace, nil)
         self.lg_pod(self.real_name, requirements)
         return
       end
@@ -38,38 +36,52 @@ module LgPodPlugin
       elsif "#{first.class}" == "Hash"
         self.options = first
       end
-
-      hash_map = requirements[0].last
-      if "#{hash_map.class}" == "Hash"
-        self.options = hash_map
+      hash_map = nil
+      last = requirements[0].last
+      if "#{last.class}" == "Hash"
+        hash_map = last
+      end
+      git = hash_map[:git]
+      if hash_map && git
+        tag = hash_map[:tag]
+        branch = hash_map[:branch]
+        commit = hash_map[:commit]
+        if tag
+          hash_map.delete(:branch)
+          hash_map.delete(:commit)
+        elsif commit
+          hash_map.delete(:tag)
+          hash_map.delete(:branch)
+        elsif branch
+          hash_map.delete(:tag)
+          hash_map.delete(:commit)
+        end
       end
-
+      self.options = hash_map
+      LRequest.shared.setup_pod_info(self.name, self.workspace, hash_map)
       self.lg_pod(name, requirements)
-
     end
 
     public
-    # @param [Object] name
-    # @param [Hash] options
-    # @return [Object] nil
     def lg_pod(name, *requirements)
       unless name
         raise StandardError, 'A dependency requires a name.'
       end
 
-      if !requirements
+      # 根据pod name安装, pod 'AFNetworking'
+      unless requirements
         self.target.store_pod(self.real_name)
         return
       end
-
+      # 根据name, version 安装, pod 'AFNetworking', "1.0.1"
       if self.version && !self.options
         self.target.store_pod(self.real_name, self.version)
         return
       end
-
+      # 根据name, version 安装, pod 'AFNetworking', "1.0.1", :configurations => ["Debug"]
       if self.version && self.options
         hash_map = self.options
-        hash_map.delete(:depth)
+        # hash_map.delete(:cache)
         self.target.store_pod(self.real_name, self.version, hash_map)
         return
       end
@@ -80,85 +92,54 @@ module LgPodPlugin
         return
       end
 
-      real_path = nil
-      tag = hash_map[:tag]
-      url = hash_map[:git]
       path = hash_map[:path]
-      commit = hash_map[:commit]
-      branch = hash_map[:branch]
-      is_cache = options[:depth]
       if path
-        profile_path = self.profile.send(:defined_in_file).dirname
-        real_path = Pathname.new(path).expand_path(profile_path)
-      end
-      # 找到本地组件库 执行 git pull
-      if real_path && File.directory?(real_path)
-        hash_map[:path] = real_path
-        hash_map.delete(:depth)
-        self.install_local_pod(self.name, hash_map)
-        return
-      end
-
-      # 根据tag, commit下载文件
-      hash_map.delete(:path)
-      if (tag && url) || (commit && url)
-        hash_map.delete(:depth)
-        hash_map.delete(:branch)
-        self.target.store_pod(self.real_name, hash_map)
-        return
-      end
-
-      # 根据 branch 下载代码
-      if url
-        hash_map.delete(:tag)
-        hash_map.delete(:commit)
-        self.downloader.download_init(self.name, hash_map)
-        self.downloader.pre_download_pod(self.git_util)
-        hash_map.delete(:depth)
-        self.target.store_pod(self.real_name, hash_map)
+        self.install_local_pod(name, path, options)
+      else
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
       end
 
-
     end
 
     public
-    def install_form_specs(spec_path = nil)
-      spec_path ||= './Specs'
-      path = File.expand_path(spec_path, Dir.pwd)
-      file_objects = Dir.glob(File.expand_path("*.rb", path)).map do |file_path|
-        #读取 xxx.rb文件
-        Spec.form_file(file_path)
-      end
-      # 便利出每一个pod对安装信息
-      file_objects.each do |file|
-        if file.install
-          options = file.pod_requirements
-          self.lg_pod(file.name, options)
-        end
+    def install_remote_pod(name, options = {})
+      git = options[:git]
+      if git
+        LRequest.shared.downloader.pre_download_pod
+        self.target.store_pod(self.real_name, options)
+      else
+        LgPodPlugin.log_red "pod `#{name}` 的参数 path, git , tag , commit不正确"
       end
-
     end
 
     public
-    def install_local_pod(name, options = {})
+    #安装本地pod
+    def install_local_pod(name, relative_path, options = {})
       hash_map = options
-      local_path = options[:path]
-      branch = options[:branch]
-      unless Dir.glob(File.expand_path(".git", local_path)).count > 0
-        LgPodPlugin.log_red("pod `#{name}` at path => #{local_path} 找不到.git目录")
+      absolute_path = Pathname.new(relative_path).expand_path(self.workspace)
+
+      unless absolute_path.exist?
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
         return
       end
-      unless Dir.glob(File.expand_path("#{name}.podspec", local_path)).count > 0
-        LgPodPlugin.log_red("pod `#{name}` at path => #{local_path} 找不到#{name}.podspec文件")
+
+      if Dir.glob(File.expand_path(".git", absolute_path)).empty?
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
         return
       end
 
-      self.git_util.git_init(name, :branch => branch, :path => local_path)
-      self.git_util.git_local_pod_check(local_path)
-      hash_map[:path] = local_path.to_path
+      if Dir.glob(File.expand_path("#{name}.podspec", absolute_path)).empty?
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
+        return
+      end
+      # LRequest.shared.git_util.git_local_pod_check(absolute_path)
       hash_map.delete(:tag)
       hash_map.delete(:git)
-      hash_map.delete(:depth)
+      # hash_map.delete(:cache)
       hash_map.delete(:commit)
       hash_map.delete(:branch)
       # 安装本地私有组件库