lg_pod_plugin 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b66b843efb74dad6c4bead07bedda8df047db87f23e69d00b1a6bb326ba7d7
-  data.tar.gz: 553ffdd0eeed2e9f7fd28d858c110a52cfa9a50f00e0cdee64d85fd68c966ede
+  metadata.gz: fd233eb34e3646ecb5b2951bc2064b2b62a9894ce9bef5493fdab8042051993a
+  data.tar.gz: '0977cc3bd3baa86f483337fc554382d144c32cf05ae6f9b52b40379918d379ef'
 SHA512:
-  metadata.gz: a0ecf3adb2ac46859ca9b58e02306f279c3fd85084b08cb88e40da4d10aa4fdf2739aaf03c37ce7f64828682835352a3b00786aa4d6bc3cea2561b73052616b3
-  data.tar.gz: 1061f2907c3b2e3b345902277d2f45ca94fcd4a2aba7637f1674f43112441516f3882c40e1b4b67c35d661315fde8f30218492677d43e79f07286926a6b7e478
+  metadata.gz: 3db736be690ea602631f5fbacc02a4cdd2d4dcce8647ea2f51bd9b019586fbbfe8e7611aab10b35881152905062017f60d07dc51e02e569af172a9cab1f9aac3
+  data.tar.gz: 968bb82236aa20eeddb4d27126a6e47521910b75aacea84d4adc2030e5677b5314e59b74b5c6018f19b8bca320b0f648610279cebc9b58c56861b015b2717284

data/lib/lg_pod_plugin/gitlab_archive.rb

@@ -77,7 +77,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,7 +196,7 @@ 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
@@ -213,12 +213,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包

data/lib/lg_pod_plugin/gitlab_download.rb

@@ -23,21 +23,41 @@ module LgPodPlugin
       self.branch = options[:branch]
       self.commit = options[:commit]
     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
 
     def git_clone_by_branch(path, temp_name)
+      download_temp_path = path.join(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}")
+        git_download_command(temp_name, self.git, self.branch, nil)
       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}")
+        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
-      path.join(temp_name)
+      download_temp_path
     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}")
+      git_download_command(temp_name, self.git, nil, self.tag)
       path.join(temp_name)
     end
 
@@ -130,8 +150,12 @@ 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)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
@@ -145,7 +169,11 @@ module LgPodPlugin
         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)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
@@ -160,8 +188,12 @@ module LgPodPlugin
       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)
           pod_info = LSqliteDb.shared.query_pod_refs(id)
@@ -172,7 +204,7 @@ module LgPodPlugin
         if new_commit
           LSqliteDb.shared.insert_pod_refs(name, git, branch, tag, new_commit)
         end
-        return nil, new_commit
+        return [nil, new_commit]
       end
     end
 

data/lib/lg_pod_plugin/install.rb

@@ -113,6 +113,7 @@ module LgPodPlugin
       LRequest.shared.is_update = (command == "update")
       podfile = Pod::Podfile.from_file(podfile_path)
       target = podfile.send(:current_target_definition)
+      local_pods = []
       release_pods = []
       install_hash_map = {}
       children = target.children
@@ -126,8 +127,10 @@ module LgPodPlugin
           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
+            path = val[:path]
+            local_pods.append(key) if path
+            next unless path == nil
             install_hash_map[key] = val
           else
             release_pods.append(key)
@@ -143,7 +146,7 @@ module LgPodPlugin
       LgPodPlugin.log_red "开始安装pod"
       #切换工作目录到当前工程下, 开始执行pod install
       FileUtils.chdir(podfile_path.dirname)
-      libs = LRequest.shared.libs.keys.empty? ? release_pods : LRequest.shared.libs.keys
+      libs = LRequest.shared.libs.keys.empty? ? (release_pods + local_pods) : (LRequest.shared.libs.keys + local_pods)
       # 执行pod install/ update 方法入口
       update_pod = (command == "update")
       run_pod_install(update_pod, libs, options)

data/lib/lg_pod_plugin/l_util.rb

@@ -75,6 +75,7 @@ module LgPodPlugin
       else
         match = %r{([a-z0-9]*)\trefs\/(heads|tags)\/#{Regexp.quote(encoded_branch_name)}}.match(output)
       end
+      # LgPodPlugin.log_green match[0] unless match.nil?
       match[1] unless match.nil?
     end
 

data/lib/lg_pod_plugin/request.rb

@@ -102,13 +102,21 @@ module LgPodPlugin
       elsif git && 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
           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)
+          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
@@ -118,12 +126,17 @@ module LgPodPlugin
         hash_map[:commit] = commit if commit
         return hash_map
       else
-        _, new_commit = LGitUtil.git_ls_remote_refs(self.name ,git, branch, tag, commit)
-        if (new_commit != lock_commit)
+        _, new_commit = LGitUtil.git_ls_remote_refs(self.name ,git, nil, 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[:commit] = new_commit if new_commit
           hash_map["is_delete"] = true
         end
       end

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 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.2
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git