lg_pod_plugin 1.0.4 → 1.0.6

data/lib/lg_pod_plugin/git_util.rb

@@ -1,5 +1,6 @@
 require 'pp'
 require 'git'
+require_relative 'l_util'
 require_relative 'request'
 require_relative 'l_cache'
 
@@ -19,24 +20,130 @@ module LgPodPlugin
       self.commit = options[:commit]
     end
 
+    # 根据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
+
+    # 通过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
+    # 通过 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
+
+    # clone 代码仓库
     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}")
+        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
-        LgPodPlugin.log_blue "git clone --depth=1 --branch #{self.branch} #{self.git}"
-        system("git clone --depth=1 -b #{self.branch} #{self.git} #{temp_name}")
+        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
-        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)
+        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
 
     # def git_checkout(branch)
@@ -55,7 +162,7 @@ module LgPodPlugin
       else
         hash_map[:commit] = commit
       end
-      return hash_map
+      hash_map
     end
 
     def pre_download_git_repository
@@ -76,36 +183,7 @@ module LgPodPlugin
       FileUtils.chdir(LFileManager.download_director)
       FileUtils.rm_rf(lg_pod_path)
     end
-
-    # 本地pod库git操作
-    def git_local_pod_check(path)
-      FileUtils.chdir(path)
-      git = Git.open(Pathname("./"))
-      current_branch = git.current_branch
-      last_stash_message = "#{current_branch}_pod_install_cache"
-      if self.branch == current_branch || !self.branch
-        # 是否恢复储藏内容到暂存区
-        self.should_pull(git ,current_branch)
-      else
-        # 存储上一个 branch 未暂存的内容
-        # 判断 git status 是否有要暂存的内容
-        have_changes = git.status.changed.map { |change|
-          change.to_s
-        }
-        # 如果有要暂存的内容, 就 git stash save
-        unless have_changes.empty?
-          # "当前#{current_branch}分支有未暂存的内容"
-          git.branch.stashes.save(last_stash_message)
-        end
-        # 这里 checkout到目标分支, 本地有git switch -b xxx, 本地没有 git checkout -b xxx
-        git.checkout(git.branch(branch))
-        current_branch = git.current_branch
-        self.should_pull(git ,current_branch)
-        # 是否恢复储藏内容到暂存区
-        self.should_pop_stash(git, current_branch)
-      end
-    end
-
+    
     # 获取最新的一条 commit 信息
     def self.git_ls_remote_refs(git, branch, tag, commit)
       if branch
@@ -125,27 +203,53 @@ module LgPodPlugin
         new_commit = map[key][:sha]
         return [nil, new_commit]
       else
-        new_commit = nil
-        new_branch = nil 
-        find_commit = commit ||= ls["head"][:sha]
+        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]
-          break
         end
         return [new_branch , new_commit]
       end
     end
-
+    
+    # 本地pod库git操作
+    def git_local_pod_check(path)
+      FileUtils.chdir(path)
+      git = Git.open(Pathname("./"))
+      current_branch = git.current_branch
+      last_stash_message = "#{current_branch}_pod_install_cache"
+      if self.branch == current_branch || !self.branch
+        # 是否恢复储藏内容到暂存区
+        self.should_pull(git ,current_branch)
+      else
+        # 存储上一个 branch 未暂存的内容
+        # 判断 git status 是否有要暂存的内容
+        have_changes = git.status.changed.map { |change|
+          change.to_s
+        }
+        # 如果有要暂存的内容, 就 git stash save
+        unless have_changes.empty?
+          # "当前#{current_branch}分支有未暂存的内容"
+          git.branch.stashes.save(last_stash_message)
+        end
+        # 这里 checkout到目标分支, 本地有git switch -b xxx, 本地没有 git checkout -b xxx
+        git.checkout(git.branch(branch))
+        current_branch = git.current_branch
+        self.should_pull(git ,current_branch)
+        # 是否恢复储藏内容到暂存区
+        self.should_pop_stash(git, current_branch)
+      end
+    end
     # 是否pull 代码
     def should_pull(git, branch, new_commit = nil)
-      new_barnch = branch ||= self.branch
+      new_branch = branch ||= self.branch
       git_url = git.remote.url ||= self.git
       if new_commit == nil
-        new_branch, new_commit = LGitUtil.git_ls_remote_refs(git_url, new_barnch,nil, nil)
+        _, 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,12 +1,11 @@
 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 'downloader.rb'
 
 module LgPodPlugin
 
@@ -70,16 +69,16 @@ module LgPodPlugin
       end
 
       # 根据pod name安装, pod 'AFNetworking'
-      if !requirements
+      unless requirements
         self.target.store_pod(self.real_name)
         return
       end
-      # 根据name, verison 安装, pod 'AFNetworking', "1.0.1"
+      # 根据name, version 安装, pod 'AFNetworking', "1.0.1"
       if self.version && !self.options
         self.target.store_pod(self.real_name, self.version)
         return
       end
-      # 根据name, verison 安装, pod 'AFNetworking', "1.0.1", :configurations => ["Debug"]
+      # 根据name, version 安装, pod 'AFNetworking', "1.0.1", :configurations => ["Debug"]
       if self.version && self.options
         hash_map = self.options
         # hash_map.delete(:cache)
@@ -96,41 +95,48 @@ module LgPodPlugin
       path = hash_map[:path]
       if path
         self.install_local_pod(name, path, options)
-        return
+      else
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
       end
-      hash_map.delete(:path)
-      git = hash_map[:git]
-      # 根据git_url 下载远程仓库
+
+    end
+
+    public
+    def install_remote_pod(name, options = {})
+      git = options[:git]
       if git
         LRequest.shared.downloader.pre_download_pod
-        # hash_map.delete(:cache)
-        self.target.store_pod(self.real_name, hash_map)
+        self.target.store_pod(self.real_name, options)
       else
-        #hash_map.delete(:cache)
-        self.target.store_pod(self.real_name, hash_map)
+        LgPodPlugin.log_red "pod `#{name}` 的参数 path, git , tag , commit不正确"
       end
-
     end
 
     public
     #安装本地pod
     def install_local_pod(name, relative_path, options = {})
       hash_map = options
-      branch = options[:branch]
       absolute_path = Pathname.new(relative_path).expand_path(self.workspace)
+
       unless absolute_path.exist?
-        LgPodPlugin.log_red("pod `#{name}` at path => #{relative_path} 找不到")
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
         return
       end
-      unless Dir.glob(File.expand_path(".git", absolute_path)).count > 0
-        LgPodPlugin.log_red("pod `#{name}` at path => #{absolute_path} 找不到.git目录")
+
+      if Dir.glob(File.expand_path(".git", absolute_path)).empty?
+        hash_map.delete(:path)
+        self.install_remote_pod(name, hash_map)
         return
       end
-      unless Dir.glob(File.expand_path("#{name}.podspec", absolute_path)).count > 0
-        LgPodPlugin.log_red("pod `#{name}` at path => #{absolute_path} 找不到#{name}.podspec文件")
+
+      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)
+      # LRequest.shared.git_util.git_local_pod_check(absolute_path)
       hash_map.delete(:tag)
       hash_map.delete(:git)
       # hash_map.delete(:cache)

data/lib/lg_pod_plugin/l_cache.rb

@@ -26,7 +26,7 @@ module LgPodPlugin
     end
     
     #根据git branch commit 返回请求参数用来获取缓存 path
-    def get_request_params(name, git, branch, tag, commit)
+    def get_request_params(git, branch, tag, commit)
       options = { :git => git }
       if git && tag
         options[:tag] = tag
@@ -41,30 +41,29 @@ module LgPodPlugin
       elsif git && commit
         options[:commit] = commit
       end
-      return options
+      options
     end
     #判断缓存是否存在且有效命中缓存
     def find_pod_cache(name, git, branch, tag, commit, is_update)
-      hash_map = nil 
       if is_update
-        hash_map = self.get_request_params(name, git, branch, tag, commit)
+        hash_map = self.get_request_params(git, branch, tag, commit)
       else 
         if LRequest.shared.lock_params
           lock_tag = LRequest.shared.lock_params[:tag]
           lock_branch = LRequest.shared.lock_params[:branch]
           lock_commit = LRequest.shared.lock_params[:commit]
-          hash_map = self.get_request_params(name, git, lock_branch, lock_tag, lock_commit)
+          hash_map = self.get_request_params(git, lock_branch, lock_tag, lock_commit)
         else
-          hash_map = self.get_request_params(name, git, branch, tag, commit)
+          hash_map = self.get_request_params(git, branch, tag, commit)
         end
       end
       request = LCache.download_request(name, hash_map)
       destination = LCache.path_for_pod(request, {})
       cache_pod_spec = LCache.path_for_spec(request, {})
       if File.exist?(destination) && File.exist?(cache_pod_spec)
-        return false
+         false
       else
-        return true
+        true
       end
     end
 
@@ -104,9 +103,9 @@ module LgPodPlugin
         return [request, local_specs]
       else
         local_specs = {}
-        podspecs = Pod::Sandbox::PodspecFinder.new(target).podspecs
-        podspecs[request.name] = request.spec if request.spec
-        podspecs.each do |name, spec|
+        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
@@ -186,12 +185,12 @@ module LgPodPlugin
       result.location = nil
       pods_pecs.each do |s_name, s_spec|
         destination = path_for_pod(request, {})
-        if !File.exist?(destination)
+        unless File.exist?(destination)
           LgPodPlugin.log_green "Copying #{name} from `#{target}` to `#{destination}` "
           copy_and_clean(target, destination, s_spec)
         end
         cache_pod_spec = path_for_spec(request, {})
-        if !File.exist?(cache_pod_spec)
+        unless File.exist?(cache_pod_spec)
           write_spec(s_spec, cache_pod_spec)
         end
         if request.name == s_name
@@ -218,7 +217,7 @@ module LgPodPlugin
     end
 
     # 根据下载参数生产缓存目录
-    def slug(name, params, spec)
+    def slug(params, spec)
       path = ""
       checksum = spec&.checksum && '-' << spec.checksum[0, 5]
       opts = params.to_a.sort_by(&:first).map { |k, v| "#{k}=#{v}" }.join('-')

data/lib/lg_pod_plugin/l_util.rb

@@ -0,0 +1,39 @@
+require  'zip'
+module LgPodPlugin
+  class LUtils
+    def self.unzip_file (zip_file, dest_dir)
+      begin
+        Zip::File.open(zip_file) do |file|
+          file.each do |f|
+            file_path = File.join(dest_dir, f.name)
+            FileUtils.mkdir_p(File.dirname(file_path))
+            next if file_path.include?("Example")
+            # next if file_path.include?("LICENSE")
+            next if file_path.include?(".gitignore")
+            next if file_path.include?("node_modules")
+            next if file_path.include?("package.json")
+            next if file_path.include?(".swiftlint.yml")
+            next if file_path.include?("_Pods.xcodeproj")
+            next if file_path.include?("package-lock.json")
+            file.extract(f, file_path)
+          end
+        end
+        return true
+      rescue => err
+        puts err
+        return false
+      end
+
+    end
+
+    def self.aes_decrypt(key, data)
+      de_cipher = OpenSSL::Cipher::Cipher.new("AES-128-CBC")
+      de_cipher.decrypt
+      de_cipher.key = [key].pack('H*')
+      # de_cipher.iv = [iv].pack('H*');
+      puts de_cipher.update([data].pack('H*')) << de_cipher.final
+    end
+
+
+  end
+end

data/lib/lg_pod_plugin/request.rb

@@ -2,7 +2,7 @@ require 'singleton'
 require 'yaml'
 require_relative 'l_cache'
 require_relative 'git_util'
-require_relative 'download'
+require_relative 'downloader.rb'
 module LgPodPlugin
 
   class LRequest
@@ -30,10 +30,9 @@ module LgPodPlugin
       lock_file = self.workspace.join("Podfile.lock")
       if lock_file.exist?
         json = YAML.load_file(lock_file.to_path)
-        external_sources = json["EXTERNAL SOURCES"]
-        return external_sources
+        json["EXTERNAL SOURCES"]
       else
-        return nil
+        nil
       end
     end
 
@@ -63,7 +62,7 @@ module LgPodPlugin
       elsif commit == lock_commit
         return { :git => git, :commit => lock_commit }
       else
-        return nil
+        nil
       end
     end
 
@@ -88,11 +87,11 @@ module LgPodPlugin
           if lock_tag == tag && lock_commit
             hash_map[:commit] = lock_commit
           else
-            new_branch, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag,commit)
+            _, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag, commit)
             hash_map[:commit] = new_commit
           end
         else
-          new_branch, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag,commit)
+          _, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag,commit)
           hash_map[:commit] = new_commit
         end
       elsif git && commit
@@ -114,14 +113,14 @@ module LgPodPlugin
           if branch == lock_branch && lock_commit
             hash_map[:commit] = lock_commit
           else
-            new_branch, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag, commit)
+            _, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag, commit)
             hash_map[:commit] = new_commit
           end
         else
-          new_branch, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag, commit)
+          _, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag, commit)
           hash_map[:commit] = new_commit
         end
-      else
+      elsif !path
         new_branch, new_commit = LGitUtil.git_ls_remote_refs(git, branch, tag, commit)
         hash_map[:commit] = new_commit
         hash_map[:branch] = new_branch

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/lib/lg_pod_plugin.rb

@@ -1,14 +1,12 @@
 require 'git'
-require 'sqlite3'
 require 'cocoapods-downloader'
 require 'cocoapods-core/podfile/target_definition'
-
 require "lg_pod_plugin/version"
 require_relative 'lg_pod_plugin/log'
 require_relative 'lg_pod_plugin/install'
 require_relative 'lg_pod_plugin/request'
 require_relative 'lg_pod_plugin/database'
-require_relative 'lg_pod_plugin/download'
+require_relative 'lg_pod_plugin/downloader.rb'
 require_relative 'lg_pod_plugin/git_util'
 
 module LgPodPlugin