lg_pod_plugin 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b66b843efb74dad6c4bead07bedda8df047db87f23e69d00b1a6bb326ba7d7
-  data.tar.gz: 553ffdd0eeed2e9f7fd28d858c110a52cfa9a50f00e0cdee64d85fd68c966ede
+  metadata.gz: 3edf15fe0a8e9cfcc59a9224cd55aa947dc4c347f3a2dedbbdab3bb07b4b1f65
+  data.tar.gz: '09cbcc226c7176f819d23b950adfaaab4d4cefa918403edac8b2cd8eec9e0cef'
 SHA512:
-  metadata.gz: a0ecf3adb2ac46859ca9b58e02306f279c3fd85084b08cb88e40da4d10aa4fdf2739aaf03c37ce7f64828682835352a3b00786aa4d6bc3cea2561b73052616b3
-  data.tar.gz: 1061f2907c3b2e3b345902277d2f45ca94fcd4a2aba7637f1674f43112441516f3882c40e1b4b67c35d661315fde8f30218492677d43e79f07286926a6b7e478
+  metadata.gz: e422b84be0ca83287c305152a8543a195ca27fa742937d81113f30a0e697d97865b114ca71222e5280eb62c196985e2da333a71f07e2b718bf71515b497ff2e5
+  data.tar.gz: 686b7cb744ed6857dee9317bb74eaa3841fd34e75f388be3912ca2ea1dd7ac2eeccbce9fdec1ac563e28ffd34b59f478a68f9cf9d0aa48d2d1517c776e588fc8

data/lib/command/install.rb

@@ -45,7 +45,7 @@ module LgPodPlugin
       end
 
       def run
-        LgPodPlugin.install({ :verbose => self.log, :repo_update => self.repo_update })
+        LgPodPlugin::Main.run("install",{ :verbose => self.log, :repo_update => self.repo_update })
       end
     end
   end

data/lib/command/update.rb

@@ -32,7 +32,7 @@ module LgPodPlugin
       end
 
       def run
-        LgPodPlugin.update({ :verbose => self.log, :repo_update => self.repo_update })
+        LgPodPlugin::Main.run("update",{ :verbose => self.log, :repo_update => self.repo_update })
       end
     end
   end

data/lib/lg_pod_plugin/database.rb

@@ -39,17 +39,9 @@ module LgPodPlugin
       self.commit = commit
     end
 
-    def self.get_pod_id(name, git, branch, tag)
-      if git && branch
-        key = name + git + branch
-        return Digest::MD5.hexdigest(key)
-      elsif git && tag
-        key = name + git + tag
-        return Digest::MD5.hexdigest(key)
-      else
-        key = name + git
-        return Digest::MD5.hexdigest(key)
-      end
+    def self.get_pod_id(name, git)
+      key = name + git
+      return Digest::MD5.hexdigest(key)
     end
 
   end
@@ -202,7 +194,7 @@ module LgPodPlugin
     end
 
     def insert_pod_refs(name, git, branch, tag , commit)
-      id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+      id = LPodLatestRefs.get_pod_id(name, git)
       pod = LPodLatestRefs.new(id, name, git, branch, tag, commit)
       if self.query_pod_refs(id) != nil
         self.db.execute_batch(

data/lib/lg_pod_plugin/gitlab_api.rb

@@ -38,7 +38,7 @@ module LgPodPlugin
         user_id = LUserAuthInfo.get_user_id(host)
         user_model = LUserAuthInfo.new(user_id, username, password, host, access_token, refresh_token, (created_at + expires_in))
         LSqliteDb.shared.insert_user_info(user_model)
-        GitLabAPI.get_user_projects(access_token, host, 1)
+        # GitLabAPI.get_user_projects(access_token, host, 1)
         LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
       rescue => exception
         LgPodPlugin.log_red "获取 `access_token` 失败, error => #{exception.to_s}"
@@ -46,39 +46,35 @@ module LgPodPlugin
     end
 
     #获取用户所有项目
-    def self.get_user_projects(access_token, host, page)
-      begin
-        hash_map = Hash.new
-        hash_map["page"] = page
-        hash_map["per_page"] = 100
-        hash_map["access_token"] = access_token
-        uri = URI("#{host}/api/v4/projects")
-        uri.query = URI.encode_www_form(hash_map)
-        res = Net::HTTP.get_response(uri)
-        array = JSON.parse(res.body) if res.body
-        unless array.is_a?(Array)
-          return
-        end
-        # pp array
-        array.each do |json|
-          id = json["id"]
-          name = json["name"]
-          path = json["path"]
-          web_url = json["web_url"]
-          description = json["description"]
-          ssh_url_to_repo = json["ssh_url_to_repo"]
-          http_url_to_repo = json["http_url_to_repo"]
-          path_with_namespace = json["path_with_namespace"] ||= ""
-          name_with_namespace = (json["name_with_namespace"] ||= "").gsub(/[ ]/, '')
-          project = ProjectModel.new(id, name, description, path, ssh_url_to_repo, http_url_to_repo, web_url, name_with_namespace, path_with_namespace)
-          LSqliteDb.shared.insert_project(project)
-        end
-        if array.count >= 100
-          GitLabAPI.get_user_projects(access_token, host, page + 1)
-        end
-
-      end
-    end
+    # def self.get_user_projects(access_token, host, page)
+    #   begin
+    #     hash_map = Hash.new
+    #     hash_map["page"] = page
+    #     hash_map["per_page"] = 20
+    #     hash_map["access_token"] = access_token
+    #     uri = URI("#{host}/api/v4/projects")
+    #     uri.query = URI.encode_www_form(hash_map)
+    #     res = Net::HTTP.get_response(uri)
+    #     array = JSON.parse(res.body) if res.body
+    #     unless array.is_a?(Array)
+    #       return
+    #     end
+    #     # pp array
+    #     array.each do |json|
+    #       id = json["id"]
+    #       name = json["name"]
+    #       path = json["path"]
+    #       web_url = json["web_url"]
+    #       description = json["description"]
+    #       ssh_url_to_repo = json["ssh_url_to_repo"]
+    #       http_url_to_repo = json["http_url_to_repo"]
+    #       path_with_namespace = json["path_with_namespace"] ||= ""
+    #       name_with_namespace = (json["name_with_namespace"] ||= "").gsub(/[ ]/, '')
+    #       project = ProjectModel.new(id, name, description, path, ssh_url_to_repo, http_url_to_repo, web_url, name_with_namespace, path_with_namespace)
+    #       LSqliteDb.shared.insert_project(project)
+    #     end
+    #   end
+    # end
 
     # 刷新gitlab_token
     def self.refresh_gitlab_access_token(host, refresh_token)

data/lib/lg_pod_plugin/gitlab_archive.rb

@@ -43,7 +43,9 @@ module LgPodPlugin
       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, "./"))
+      result = LUtils.unzip_file(temp_name, "./")
+      FileUtils.rm_rf temp_name unless result
+      return nil unless result
       temp_zip_folder = nil
       path.each_child do |f|
         ftype = File::ftype(f)
@@ -77,7 +79,7 @@ module LgPodPlugin
         project_path.mkdir
         FileUtils.chdir(project_path)
       end
-      branch = self.branch ||= "master"
+      branch = self.branch ||= "HEAD"
       token = LRequest.shared.config.access_token
       base_url = LRequest.shared.config.project.web_url
       project_name = LRequest.shared.config.project.path
@@ -196,15 +198,19 @@ module LgPodPlugin
     # 根据branch 下载 zip 包
     def github_download_branch_zip(path, temp_name)
       file_name = "#{temp_name}.zip"
-      branch = self.branch ||= "master"
+      branch = self.branch ||= "HEAD"
       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}"
+      url_path = base_url.split("https://github.com/").last
+      if branch == "HEAD"
+        download_url = "https://gh.api.99988866.xyz/" + "#{base_url}" + "/archive/#{branch}.zip"
+      else
+        download_url = "https://codeload.github.com/#{url_path}/zip/refs/heads/#{branch}"
+      end
       LgPodPlugin.log_blue "开始下载 => #{download_url}"
       LUtils.download_github_zip_file(download_url, file_name)
       unless File.exist?(file_name)
@@ -213,12 +219,19 @@ module LgPodPlugin
       end
       # 解压文件
       result = LUtils.unzip_file(path.join(file_name).to_path, "./")
-      new_file_name = "#{project_name}-#{branch}"
-      unless result && File.exist?(new_file_name)
+      temp_zip_folder = nil
+      path.each_child do |f|
+        ftype = File::ftype(f)
+        next unless ftype == "directory"
+        next unless f.to_path.include?("#{branch}") || f.to_path.include?("#{project_name}")
+        temp_zip_folder = f
+        break
+      end
+      unless temp_zip_folder && File.exist?(temp_zip_folder)
         LgPodPlugin.log_red("正在尝试git clone #{self.git}")
         return self.git_clone_by_branch(path, temp_name)
       end
-      path.join(new_file_name)
+      temp_zip_folder
     end
 
     # 通过tag下载zip包
@@ -229,9 +242,9 @@ module LgPodPlugin
       else
         base_url = self.git
       end
+      uri = URI(base_url)
       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}"
+      download_url = "https://codeload.github.com#{uri.path}/zip/refs/tags/#{self.tag}"
       # 下载文件
       LgPodPlugin.log_blue "开始下载 => #{download_url}"
       LUtils.download_github_zip_file(download_url, file_name)
@@ -241,17 +254,20 @@ module LgPodPlugin
       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
+      temp_zip_folder = nil
+      path.each_child do |f|
+        ftype = File::ftype(f)
+        next unless ftype == "directory"
+        version = self.tag.split("v").last ||= self.tag
+        next unless f.to_path.include?("#{project_name}") || f.to_path.include?(version)
+        temp_zip_folder = f
+        break
       end
-      new_file_name = "#{project_name}-#{this_tag}"
-      unless result && File.exist?(new_file_name)
+      unless temp_zip_folder && File.exist?(temp_zip_folder)
         LgPodPlugin.log_red("正在尝试git clone #{self.git}")
         return self.git_clone_by_tag(path, temp_name)
       end
-      path.join(new_file_name)
+      temp_zip_folder
     end
 
     # 通过 commit 下载zip包
@@ -262,9 +278,9 @@ module LgPodPlugin
       else
         base_url = self.git
       end
+      uri = URI(base_url)
       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}"
+      download_url = "https://codeload.github.com#{uri.path}/zip/#{self.commit}"
       # 下载文件
       LgPodPlugin.log_blue "开始下载 => #{download_url}"
       LUtils.download_github_zip_file(download_url, file_name)
@@ -282,6 +298,55 @@ module LgPodPlugin
       path.join(new_file_name)
     end
 
+    def git_clone_by_branch(path, temp_name)
+      download_temp_path = path.join(temp_name)
+      if self.git && self.branch
+        git_download_command(temp_name, self.git, self.branch, nil)
+      else
+        git_download_command(temp_name, self.git, nil, nil)
+        if File.exist?(temp_name)
+          system("git -C #{download_temp_path.to_path} rev-parse HEAD")
+        end
+      end
+      download_temp_path
+    end
+
+    def git_clone_by_tag(path, temp_name)
+      git_download_command(temp_name, self.git, nil, self.tag)
+      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
+
+    # 封装 git clone命令
+    def git_download_command(temp_name, git, branch, tag)
+      cmds = ['git']
+      cmds << "clone"
+      cmds << "#{git}"
+      cmds << "#{temp_name} "
+      cmds << "--template="
+      cmds << "--single-branch --depth 1"
+      if branch
+        cmds << "--branch"
+        cmds << branch
+      elsif tag
+        cmds << "--branch"
+        cmds << tag
+      end
+      cmds_to_s = cmds.join(" ")
+      LgPodPlugin.log_blue cmds_to_s
+      system(cmds_to_s)
+    end
+
   end
 
 end

data/lib/lg_pod_plugin/gitlab_download.rb

@@ -24,34 +24,6 @@ module LgPodPlugin
       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)
@@ -64,10 +36,10 @@ module LgPodPlugin
           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)
+            return git_archive.git_clone_by_tag(path, temp_name)
           end
         rescue
-          return self.git_clone_by_tag(path, temp_name)
+          return git_archive.git_clone_by_tag(path, temp_name)
         end
       elsif self.git && self.branch
         begin
@@ -76,10 +48,10 @@ module LgPodPlugin
           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)
+            return git_archive.git_clone_by_branch(path, temp_name)
           end
         rescue
-          return self.git_clone_by_branch(path, temp_name)
+          return git_archive.git_clone_by_branch(path, temp_name)
         end
       elsif self.git && self.commit
         if LUtils.is_use_gitlab_archive_file(self.git)
@@ -87,7 +59,7 @@ module LgPodPlugin
         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)
+          return git_archive.git_clone_by_commit(path, temp_name)
         end
       elsif self.git
         if LUtils.is_use_gitlab_archive_file(self.git)
@@ -95,7 +67,7 @@ module LgPodPlugin
         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)
+          return git_archive.git_clone_by_branch(path, temp_name)
         end
       end
 
@@ -104,21 +76,13 @@ module LgPodPlugin
     # git 预下载
     def pre_download_git_repository
       temp_path = LFileManager.download_director.join("temp")
-      if temp_path.exist?
-        FileUtils.rm_rf(temp_path)
-      end
+      FileUtils.rm_rf(temp_path) if temp_path.exist?
       lg_pod_path = LRequest.shared.cache.cache_root
-      unless lg_pod_path.exist?
-        lg_pod_path.mkdir(0700)
-      end
+      lg_pod_path.mkdir(0700) unless lg_pod_path.exist?
       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
+      return nil unless (get_temp_folder && get_temp_folder.exist?)
+      LgPodPlugin::LCache.cache_pod(self.name, get_temp_folder, { :git => self.git }) if LRequest.shared.single_git
       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)
@@ -130,49 +94,63 @@ module LgPodPlugin
       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})
+        LgPodPlugin.log_blue "git ls-remote #{git} #{branch}"
+        begin
+          result = %x(timeout 5 git ls-remote #{git} #{branch})
+        rescue
+          result = %x(git ls-remote #{git} #{branch})
+        end
         unless result && result != ""
-          id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+          id = LPodLatestRefs.get_pod_id(name, git)
           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)
+        new_commit, new_branch = 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})
+        begin
+          result = %x(timeout 5 git ls-remote --tags #{git})
+        rescue
+          result = %x(git ls-remote --tags #{git})
+        end
         unless result && result != ""
-          id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+          id = LPodLatestRefs.get_pod_id(name, git)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
           new_commit = pod_info.commit if pod_info
-          return [nil, new_commit]
+          new_branch = pod_info.branch if pod_info
+          return [new_branch, new_commit]
         end
-        new_commit = LUtils.commit_from_ls_remote(result, tag)
+        new_commit, new_branch = 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]
+        return [new_branch, new_commit]
       elsif commit
         return nil, commit
       else
-        LgPodPlugin.log_blue "git ls-remote --refs #{git}"
-        result = %x(timeout 5 git ls-remote -- #{git})
+        LgPodPlugin.log_blue "git ls-remote #{git}"
+        begin
+          result = %x(timeout 5 git ls-remote -- #{git})
+        rescue
+          result = %x(git ls-remote -- #{git})
+        end
         unless result && result != ""
-          id = LPodLatestRefs.get_pod_id(name, git, branch, tag)
+          id = LPodLatestRefs.get_pod_id(name, git)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
           new_commit = pod_info.commit if pod_info
-          return [nil, new_commit]
+          new_branch = pod_info.branch if pod_info
+          return [new_branch, new_commit]
         end
-        new_commit = LUtils.commit_from_ls_remote(result, "HEAD")
+        new_commit, new_branch = LUtils.commit_from_ls_remote(result, "HEAD")
         if new_commit
-          LSqliteDb.shared.insert_pod_refs(name, git, branch, tag, new_commit)
+          LSqliteDb.shared.insert_pod_refs(name, git, new_branch, tag, new_commit)
         end
-        return nil, new_commit
+        return [new_branch, new_commit]
       end
     end
 

data/lib/lg_pod_plugin/install.rb

@@ -6,6 +6,7 @@ require_relative 'request'
 require_relative 'database'
 require_relative 'downloader'
 require 'cocoapods-core/podfile'
+require_relative 'release-pod'
 require_relative 'gitlab_download'
 require 'cocoapods-core/podfile/target_definition'
 
@@ -37,11 +38,7 @@ module LgPodPlugin
       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
+      hash_map = Hash.new.merge!(requirements)
       if git
         if tag
           hash_map.delete(:branch)
@@ -80,74 +77,5 @@ module LgPodPlugin
       end
     end
 
-    public
-    # 执行pod install/update命令
-    def self.run_pod_install(update, libs, options = {})
-      verbose = options[:verbose]
-      repo_update = options[:repo_update]
-      if update
-        if libs.empty?
-          LgPodPlugin.log_red "no external pod update, you can use `pod update` to update --all pods"
-          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 "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
-      else
-        LgPodPlugin.log_green "bundle exec arch -x86_64 pod install #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""}"
-        system("bundle exec arch -x86_64 pod install #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""}")
-      end
-    end
-
-    #执行lg install/update命令
-    def self.run(command, options = {})
-      work_space = Pathname(Dir.pwd)
-      LgPodPlugin.log_green "当前工作目录 #{work_space}"
-      podfile_path = work_space.join("Podfile")
-      unless podfile_path.exist?
-        LgPodPlugin.log_red "no such file `Podfile`"
-        return
-      end
-      LRequest.shared.is_update = (command == "update")
-      podfile = Pod::Podfile.from_file(podfile_path)
-      target = podfile.send(:current_target_definition)
-      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.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
-          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
-      LgPodPlugin.log_red "预下载Pod"
-      install_hash_map.each do |key, val|
-        Installer.new(podfile, key, val)
-      end
-
-      LgPodPlugin.log_red "开始安装pod"
-      #切换工作目录到当前工程下, 开始执行pod install
-      FileUtils.chdir(podfile_path.dirname)
-      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)
-    end
-
   end
 end

data/lib/lg_pod_plugin/l_cache.rb

@@ -21,7 +21,7 @@ module LgPodPlugin
       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)
+      if (File.exist?(destination) && File.exist?(cache_pod_spec))
         false
       else
         true
@@ -34,7 +34,9 @@ module LgPodPlugin
     end
 
     def self.download_request(name, params)
-      Pod::Downloader::Request.new(spec: nil, released: false, name: name, params: params)
+      spec = LRequest.shared.checkout_options[:spec] ||= nil
+      released_pod = LRequest.shared.checkout_options[:release_pod] ||= false
+      Pod::Downloader::Request.new(spec: spec, released: released_pod, name: name, params: params)
     end
 
     def self.path_for_pod(request, slug_opts = {})
@@ -142,27 +144,21 @@ module LgPodPlugin
 
     # 拷贝 pod 缓存文件到 sandbox
     def self.cache_pod(name, target, options = {})
-      hash_map = Hash.new.deep_merge(options).reject do |key, val|
+      checkout_options = Hash.new.deep_merge(options).reject do |key, val|
         !key || !val
       end
-      request = LCache.download_request(name, hash_map)
+      request = LCache.download_request(name, checkout_options)
       result, pods_pecs = get_local_spec(request, target)
-      result.location = nil
-      result.checkout_options = hash_map
       pods_pecs.each do |s_name, s_spec|
-        destination = path_for_pod(request, :name => name, :params => hash_map)
+        destination = path_for_pod(request, :name => name, :params => checkout_options)
         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, :name => name, :params => result.checkout_options)
+        cache_pod_spec = path_for_spec(request, :name => name, :params => checkout_options)
         unless File.exist?(cache_pod_spec)
           write_spec(s_spec, cache_pod_spec)
         end
-        if request.name == s_name
-          result.location = destination
-        end
-
       end
 
     end

data/lib/lg_pod_plugin/l_util.rb

@@ -71,11 +71,23 @@ module LgPodPlugin
       return nil if branch_name.nil?
       encoded_branch_name = branch_name.dup.force_encoding(Encoding::ASCII_8BIT)
       if branch_name == "HEAD"
-        match = %r{([a-z0-9]*)\t#{Regexp.quote(encoded_branch_name)}}.match(output)
+        match1 = %r{([a-z0-9]*)\t#{Regexp.quote(encoded_branch_name)}}.match(output)
+        sha = match1[1] unless match1.nil?
+        refs = output.split("\n")
+        return [sha, nil] unless refs.is_a?(Array)
+        refs.each do |element|
+          next if element.include?("HEAD") || element.include?("refs/tags")
+          next unless element.include?(sha)
+          find_branch = element.split("refs/heads/").last
+          return [sha, find_branch]
+        end
       else
         match = %r{([a-z0-9]*)\trefs\/(heads|tags)\/#{Regexp.quote(encoded_branch_name)}}.match(output)
+        sha = match[1] unless match.nil?
+        ref = match[0].split("refs/heads/").last unless match.nil?
+        return [sha, ref]
       end
-      match[1] unless match.nil?
+
     end
 
     #截取git-url 拿到项目绝对名称 比如 l-base-ios

data/lib/lg_pod_plugin/release-pod.rb

@@ -0,0 +1,90 @@
+require 'cocoapods'
+require 'cocoapods-core'
+require_relative 'l_util'
+require_relative 'l_cache'
+
+module LgPodPlugin
+
+  class ReleasePod
+
+    def self.resolve_dependencies(work_space, podfile, lockfile, installer, external_pods)
+      installer.resolve_dependencies
+      analysis_result = installer.send(:analysis_result)
+      return unless analysis_result
+      root_specs = analysis_result.specifications.map(&:root).uniq
+      root_specs = root_specs.reject! do |spec|
+        spec_name = spec.send(:attributes_hash)["name"]
+        external_pods[spec_name] || external_pods[spec_name.split("/").first]
+      end unless external_pods.empty?
+      return unless root_specs
+      root_specs.sort_by(&:name).each do |spec|
+        attributes_hash = spec.send(:attributes_hash)
+        next unless attributes_hash.is_a?(Hash)
+        pod_name = attributes_hash["name"]
+        checksum = spec.send(:checksum)
+        if lockfile && checksum
+          internal_data = lockfile.send(:internal_data)
+          lock_checksums = internal_data["SPEC CHECKSUMS"] ||= {}
+          lock_checksum = lock_checksums[pod_name]
+          next if lock_checksum == checksum
+        end
+        pod_version = attributes_hash["version"]
+        source = attributes_hash['source']
+        next unless source.is_a?(Hash)
+        git = source["git"]
+        tag = source["tag"]
+        next unless (git && tag) && (git.include?("https://github.com"))
+        requirements = { :git => git, :tag => tag, :release_pod => true, :spec => spec}
+        LRequest.shared.checkout_options = requirements
+        next unless LCache.new(work_space).find_pod_cache(pod_name, { :git => git, :tag => tag })
+        LgPodPlugin::Installer.new(podfile, pod_name, requirements)
+      end
+
+    end
+
+    def self.dependencies(installer)
+      installer.download_dependencies
+      installer.send(:validate_targets)
+      installation_options = installer.send(:installation_options)
+      skip_pods_project_generation = installation_options.send(:skip_pods_project_generation)
+      if skip_pods_project_generation
+        installer.show_skip_pods_project_generation_message
+      else
+        installer.integrate
+      end
+      installer.send(:write_lockfiles)
+      installer.send(:perform_post_install_actions)
+    end
+
+    def self.install_release_pod(work_space, podfile, repo_update, update, external_pods, local_pods)
+      #切换工作目录到当前工程下, 开始执行pod install
+      FileUtils.chdir(work_space)
+      # 安装 relase_pod
+      LgPodPlugin.log_green "Pre-downloading Release Pods"
+      Pod::Config.instance.verbose = true
+      pods_path = work_space.join('Pods')
+      lockfile_path = work_space.join("Podfile.lock")
+      lock_file = Pod::Lockfile.from_file(lockfile_path) if lockfile_path.exist?
+      sandobx = Pod::Sandbox.new(pods_path)
+      installer = Pod::Installer.new(sandobx, podfile, lock_file)
+      installer.repo_update = repo_update
+      if update
+        if external_pods.empty?
+          installer.update = true
+        else
+          pods =  LRequest.shared.libs.merge!(local_pods)
+          installer.update = { :pods => pods.keys}
+        end
+      else
+        installer.update = false
+      end
+      installer.deployment = false
+      installer.clean_install = false
+      installer.prepare
+      resolve_dependencies(work_space, podfile, lock_file, installer, external_pods)
+      dependencies(installer)
+    end
+
+  end
+
+end

data/lib/lg_pod_plugin/request.rb

@@ -1,7 +1,6 @@
-require 'yaml'
-require 'json'
 require 'net/http'
 require 'singleton'
+require 'cocoapods-core'
 require_relative 'l_config'
 require_relative 'l_cache'
 require_relative 'net-ping'
@@ -42,18 +41,32 @@ module LgPodPlugin
 
     public
     def get_lock_info
-      lock_file = self.workspace.join("Podfile.lock")
-      if lock_file.exist?
-        begin
-          json = YAML.load_file(lock_file.to_path)
-        rescue
-          json = {}
+      lock_file_path = self.workspace.join("Podfile.lock")
+      if lock_file_path.exist?
+        lock_file = Pod::Lockfile.from_file(lock_file_path)
+        internal_data = lock_file.send(:internal_data)
+        release_pods = Hash.new
+        pods = internal_data["PODS"] ||= {}
+        pods.each do |key, val|
+          if LUtils.is_string(key)
+            pod_name = key.split(" ").first if key.include?(" ")
+            tag = key[/(?<=\().*?(?=\))/]
+            release_pods[pod_name] = tag
+          elsif key.is_a?(Hash)
+            key_name = key.keys.first
+            next unless key_name
+            pod_name = key_name.split(" ").first if key_name.include?(" ")
+            tag = key_name[/(?<=\().*?(?=\))/]
+            release_pods[pod_name] = tag
+          else
+            next
+          end
         end
-        external_source = json["EXTERNAL SOURCES"] ||= {}
-        checkout_options = json["CHECKOUT OPTIONS"] ||= {}
-        { "external_source" => external_source, "checkout_options" => checkout_options }
+        external_source = internal_data["EXTERNAL SOURCES"] ||= {}
+        checkout_options = internal_data["CHECKOUT OPTIONS"] ||= {}
+        { "external_source" => external_source, "checkout_options" => checkout_options, "release_pods" => release_pods }
       else
-        { "external_source" => {}, "checkout_options" => {} }
+        { "external_source" => {}, "checkout_options" => {}, "release_pods" => {} }
       end
     end
 
@@ -80,9 +93,11 @@ module LgPodPlugin
     public
     def get_lock_params
       begin
+        _release_pods = self.lock_info["release_pods"] ||= {}
         _external_source = self.lock_info["external_source"][self.name] ||= {}
         _checkout_options = self.lock_info["checkout_options"][self.name] ||= {}
       rescue
+        _release_pods = {}
         _external_source = {}
         _checkout_options = {}
       end
@@ -92,46 +107,80 @@ module LgPodPlugin
       commit = self.checkout_options[:commit]
       branch = self.checkout_options[:branch]
 
-      lock_commit = _checkout_options[:commit] ||= ""
+      lock_git = _external_source[:git] ||= _checkout_options[:git]
+      lock_tag = _external_source[:tag] ||= _release_pods[self.name]
       lock_branch = _external_source[:branch] ||= ""
+      lock_commit = _checkout_options[:commit] ||= ""
+
       hash_map = Hash.new
       hash_map[:git] = git if git
       if git && tag
         hash_map[:tag] = tag
+        if tag != lock_tag
+          hash_map["is_delete"] = false
+        else
+          hash_map["is_delete"] = true
+        end
         return hash_map
       elsif git && branch
+        hash_map[:branch] = branch
         if branch == lock_branch && !self.is_update
-          hash_map[:branch] = branch if branch
-          hash_map[:commit] = lock_commit if lock_commit
+          if lock_commit && !lock_commit.empty?
+            hash_map[:commit] = lock_commit
+          end
+          hash_map["is_delete"] = true
           return hash_map
         else
-          hash_map[:branch] = branch if branch
-          _, new_commit = LGitUtil.git_ls_remote_refs(self.name ,git, branch, tag, commit)
-          if new_commit && (new_commit != lock_commit)
+          _, new_commit = LGitUtil.git_ls_remote_refs(self.name ,git, branch, nil, nil)
+          if new_commit && !new_commit.empty?
             hash_map[:commit] = new_commit
+          elsif lock_commit && !lock_commit.empty?
+            hash_map[:commit] = lock_commit
+          end
+          if !new_commit || !lock_commit || new_commit.empty? || lock_commit.empty?
+            hash_map["is_delete"] = false
+          elsif (new_commit != lock_commit)
             hash_map["is_delete"] = false
           else
             hash_map["is_delete"] = true
           end
         end
       elsif git && commit
-        hash_map[:commit] = commit if commit
+        if commit != lock_commit
+          hash_map["is_delete"] = false
+        else
+          hash_map["is_delete"] = true
+        end
+        hash_map[:commit] = commit
         return hash_map
       else
-        _, new_commit = LGitUtil.git_ls_remote_refs(self.name ,git, branch, tag, commit)
-        if (new_commit != lock_commit)
+        if lock_git && !self.is_update
+          id = LPodLatestRefs.get_pod_id(self.name, git)
+          pod_info = LSqliteDb.shared.query_pod_refs(id)
+          if pod_info && pod_info.commit
+            new_commit = pod_info.commit if pod_info
+            new_branch = pod_info.branch if pod_info
+            hash_map[:commit] = new_commit if new_commit
+            hash_map[:branch] = new_branch if new_branch
+            hash_map["is_delete"] = true
+            return hash_map
+          end
+        end
+        new_branch, new_commit = LGitUtil.git_ls_remote_refs(self.name, git, nil, nil, nil)
+        hash_map[:branch] = new_branch if new_branch
+        if new_commit && !new_commit.empty?
           hash_map[:commit] = new_commit
-          hash_map["is_delete"] = false
-        else
-          hash_map[:commit] = new_commit if new_commit
+        end
+        if !new_commit || new_commit.empty?
           hash_map["is_delete"] = true
+        else
+          hash_map["is_delete"] = false
         end
       end
       hash_map
     end
 
     public
-
     #获取下载参数
     def get_request_params
       if self.lock_info == nil

data/lib/lg_pod_plugin/runner.rb

@@ -0,0 +1,114 @@
+require 'cocoapods'
+require 'cocoapods-core'
+require_relative 'l_util'
+require_relative 'install'
+require_relative 'request'
+require_relative 'release-pod'
+# require_relative 'specification'
+
+module LgPodPlugin
+  class Main
+
+    public
+
+    def self.run(command, options = {})
+      is_update = (command == "update")
+      work_space = Pathname(Dir.pwd)
+      LgPodPlugin.log_green "当前工作目录 #{work_space}"
+      podfile_path = work_space.join("Podfile")
+      unless podfile_path.exist?
+        LgPodPlugin.log_red "no such file `Podfile`"
+        return
+      end
+      LRequest.shared.is_update = is_update
+      podfile = Pod::Podfile.from_file(podfile_path)
+      target = podfile.send(:current_target_definition)
+      local_pods = Hash.new
+      release_pods = Hash.new
+      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.is_a?(Array)
+        dependencies.each { |e|
+          next unless e.is_a?(Hash)
+          next if (key = e.keys.first) == nil
+          pod_name = key
+          val = e[key].last
+          pod_name = key.split("/").first if key.include?("/")
+          next unless val.is_a?(Hash)
+          next unless val[:podspec] == nil
+          if path = val[:path]
+            local_pods[pod_name] = val
+          else
+            install_hash_map[pod_name] = val
+          end
+        }
+      end
+      # 安装开发版本pod
+      self.install_external_pod(work_space, podfile, Hash.new.merge!(install_hash_map))
+      # 下载 release_pod
+      repo_update = options[:repo_update] ||= false
+      external_pods = install_hash_map.merge!(local_pods)
+      ReleasePod.install_release_pod(work_space, podfile,repo_update, is_update, Hash.new.merge!(external_pods), local_pods)
+      # LgPodPlugin.log_green "开始安装Pod"
+      # #切换工作目录到当前工程下, 开始执行pod install
+      # FileUtils.chdir(work_space)
+      # libs = Set[]
+      # libs += Array(local_pods)
+      # libs += LRequest.shared.libs.keys
+      # 执行pod install/ update 方法入口
+      # update_pod = (command == "update")
+      # run_pod_install(update_pod, libs, options)
+    end
+
+    def self.install_external_pod(work_space, podfile, install_hash_map)
+      #下载 External pods
+      LRequest.shared.libs = Hash.new.merge!(install_hash_map)
+      LgPodPlugin.log_green "Pre-downloading External Pods" unless install_hash_map.empty?
+      install_hash_map.each do |key, val|
+        git = val[:git]
+        tag = val[:tag]
+        commit = val[:commit]
+        if git && tag
+          LRequest.shared.checkout_options = { :git => git, :tag => tag, :spec => nil, :release_pod => false }
+          unless LCache.new(work_space).find_pod_cache(key, { :git => git, :tag => tag })
+            LRequest.shared.libs.delete(key)
+            next
+          end
+        elsif git && commit
+          LRequest.shared.checkout_options = { :git => git, :commit => commit, :spec => nil, :release_pod => false }
+          unless LCache.new(work_space).find_pod_cache(key, { :git => git, :commit => commit })
+            LRequest.shared.libs.delete(key)
+            next
+          end
+        end
+        LgPodPlugin::Installer.new(podfile, key, val)
+      end
+    end
+
+    public
+    # 执行pod install/update命令
+    def self.run_pod_install(update, libs, options = {})
+      verbose = options[:verbose]
+      repo_update = options[:repo_update]
+      if update
+        if libs.empty?
+          LgPodPlugin.log_red "no external pod update, you can use `pod update` to update --all pods"
+          system("bundle exec arch -x86_64 pod update #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""} ")
+        else
+          pod_names = Array(libs).join(" ")
+          LgPodPlugin.log_green Array(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
+      else
+        LgPodPlugin.log_green "bundle exec arch -x86_64 pod install #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""}"
+        system("bundle exec arch -x86_64 pod install #{repo_update ? "--repo-update" : "--no-repo-update"} #{verbose ? "--verbose" : ""}")
+      end
+    end
+
+  end
+end

data/lib/lg_pod_plugin/specification.rb

@@ -0,0 +1,52 @@
+require 'cocoapods'
+require 'cocoapods-core'
+require_relative 'l_util'
+require_relative 'l_cache'
+require_relative 'request'
+require_relative 'install'
+
+module  LgPodPlugin
+
+  class Specification
+    attr_accessor :spec
+    attr_accessor :podfile
+    attr_accessor :work_space
+    attr_accessor :attributes_hash
+    attr_accessor :dependencies
+    def initialize(work_space, podfile, name = nil, version = nil)
+      config = Pod::Config.instance
+      sources_manager = config.send(:sources_manager)
+      dependency = Pod::Dependency.new(name, version)
+      set = sources_manager.search(dependency)
+      self.podfile = podfile
+      self.work_space = work_space
+      self.spec = set.send(:specification)
+      self.attributes_hash = self.spec.send(:attributes_hash)
+      self.dependencies = self.attributes_hash["dependencies"]
+    end
+
+    def install
+      pod_name = self.attributes_hash["name"]
+      if pod_name.include?("/")
+        real_name = pod_name.split("/").first
+      else
+        real_name = pod_name
+      end
+      return if LRequest.shared.libs[real_name]
+      pod_version = self.attributes_hash["version"]
+      prepare_command = self.attributes_hash['prepare_command']
+      return if prepare_command
+      source = self.attributes_hash['source']
+      return unless source.is_a?(Hash)
+      git = source["git"] ||= ""
+      tag = source["tag"] ||= ""
+      return unless git.include?("https://github.com")
+      requirements = {:git => git, :tag => tag, :spec => spec, :release_pod => true }
+      LRequest.shared.checkout_options = requirements
+      return unless LCache.new(self.work_space).find_pod_cache(real_name, {:git => git, :tag => tag})
+      LRequest.shared.libs[real_name] = requirements
+      LgPodPlugin::Installer.new(self.podfile, real_name, requirements)
+    end
+
+  end
+end

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

data/lib/lg_pod_plugin.rb

@@ -3,6 +3,7 @@ require 'claide'
 require 'cocoapods-downloader'
 require "lg_pod_plugin/version"
 require_relative 'lg_pod_plugin/log'
+require_relative 'lg_pod_plugin/runner'
 require_relative 'lg_pod_plugin/install'
 require_relative 'lg_pod_plugin/request'
 require_relative 'lg_pod_plugin/database'
@@ -14,13 +15,4 @@ require 'cocoapods-core/podfile/target_definition'
 module LgPodPlugin
   autoload :Command, 'command/command'
   class Error < StandardError; end
-
-  def self.install(options = {})
-    LgPodPlugin::Installer.run("install", options)
-  end
-
-  def self.update(options = {})
-    LgPodPlugin::Installer.run("update", options)
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -158,7 +158,10 @@ files:
 - lib/lg_pod_plugin/log.rb
 - lib/lg_pod_plugin/net-ping.rb
 - lib/lg_pod_plugin/podspec.rb
+- lib/lg_pod_plugin/release-pod.rb
 - lib/lg_pod_plugin/request.rb
+- lib/lg_pod_plugin/runner.rb
+- lib/lg_pod_plugin/specification.rb
 - lib/lg_pod_plugin/string.rb
 - lib/lg_pod_plugin/version.rb
 homepage: https://gitee.com/fmdb_beantech_admin/lg_pod_plugin