lg_pod_plugin 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a39307dd5e4f73faefa55775b51e880f9f0fda326cc618c62b957ddcba669e
-  data.tar.gz: 46777e3af13f74c44086743bb48352373539806a22aafc758eb104dde3f4864c
+  metadata.gz: 61fa41fbaf71702b19bf2ef604d2283f68d472e5c47428890398463556a985f7
+  data.tar.gz: 9c45761ced23924ce2e70557245d70eb883b4f7158c63acfeb3f0547af2e1fdc
 SHA512:
-  metadata.gz: a945450a624206b131df0b963fbd8616b4df179112b54f41625ed90a46b5480823d74b80c0dc75c227f56de3d74fe225cb44243396d11ff7d864399adcbd89a0
-  data.tar.gz: c72bbba5713477f4f094387b650298768e94ec3de1a831daead4d2eb588654cb58190d3cbd474e983bc7b02c2b3ce144c032f27722ea75802020a513488490a8
+  metadata.gz: 549679243cd9e06a3d4626c06c79733bd779817e018bc5c46eb75f1731f7c5806f98bc02956ffd2e696b34e8ca1fb29f3fffb33feb231b9cb07180c3189ad586
+  data.tar.gz: 00d3b2bf9cf9d22c87141e63872b2dd466658d14972b1e8b4a4ae2a5f23d3fbb96195971cddc8063bc38cc97b4d7468422c9ccbe330e70aac6af80ce1126dcc0

data/lib/lg_pod_plugin/cache.rb

@@ -1,18 +1,20 @@
 require 'git'
-require 'cocoapods/downloader.rb'
-require 'cocoapods/downloader/cache.rb'
-require 'cocoapods/downloader/response.rb'
-require 'cocoapods/downloader/request.rb'
+require 'cocoapods/downloader'
+require 'cocoapods/downloader/cache'
+require 'cocoapods/downloader/response'
+require 'cocoapods/downloader/request'
 
 module LgPodPlugin
 
   class CachePodInfo
-    attr_accessor :sha
-    attr_accessor :tag
-    attr_accessor :name
-    attr_accessor :path
-    attr_accessor :branch
-    attr_accessor :timestamp
+    # attr_accessor :sha
+    # attr_accessor :tag
+    # attr_accessor :name
+    # attr_accessor :path
+    # attr_accessor :branch
+    # attr_accessor :timestamp
+    REQUIRED_ATTRS ||= %i[sha tag name path branch timestamp].freeze
+    attr_accessor(*REQUIRED_ATTRS)
     def initialize
       super
     end
@@ -46,9 +48,9 @@ class Cache
     destination = Cache.path_for_pod(request, {})
     cache_pod_spec = Cache.path_for_spec(request, {})
     if File.exist?(destination) && File.exist?(cache_pod_spec)
-       [false , last_commit]
+      [false , last_commit]
     else
-       [true , last_commit]
+      [true , last_commit]
     end
   end
 
@@ -127,7 +129,7 @@ class Cache
   def self.copy_and_clean(source, destination, spec)
     specs_by_platform = group_sub_specs_by_platform(spec)
     destination.parent.mkpath
-    Pod::Downloader::Cache.write_lock(destination) do
+    self.write_lock(destination) do
       FileUtils.rm_rf(destination)
       FileUtils.cp_r(source, destination)
       Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
@@ -135,12 +137,46 @@ class Cache
     end
   end
 
+  def self.write_lock(location, &block)
+    self.lock(location, File::LOCK_EX, &block)
+  end
+
+  def self.lock(location, lock_type)
+    raise ArgumentError, 'no block given' unless block_given?
+    lockfile = "#{location}.lock"
+    f = nil
+    loop do
+      f.close if f
+      f = File.open(lockfile, File::CREAT, 0o644)
+      f.flock(lock_type)
+      break if self.valid_lock?(f, lockfile)
+    end
+    begin
+      yield location
+    ensure
+      if lock_type == File::LOCK_SH
+        f.flock(File::LOCK_EX)
+        File.delete(lockfile) if self.valid_lock?(f, lockfile)
+      else
+        File.delete(lockfile)
+      end
+      f.close
+    end
+  end
+
+  def self.valid_lock?(file, filename)
+    file.stat.ino == File.stat(filename).ino
+  rescue Errno::ENOENT
+    false
+  end
+
   def self.write_spec(spec, path)
     path.dirname.mkpath
     Pod::Downloader::Cache.write_lock(path) do
       path.open('w') { |f| f.write spec.to_pretty_json }
     end
   end
+
   # 拷贝 pod 缓存文件到 sandbox
   def self.cache_pod(name, target, is_update, options = {})
     request = Cache.download_request(name, options)

data/lib/lg_pod_plugin/database.rb

@@ -53,7 +53,7 @@ module LgPodPlugin
         self.delete_table(current_pod.name, current_pod.branch)
       end
       array = self.select_tables(name, branch)
-      if array.count <= 1
+      if array.count <= 2
         return
       end
 

data/lib/lg_pod_plugin/download.rb

@@ -1,28 +1,42 @@
 require 'git'
-require_relative 'cache.rb'
-require_relative 'database.rb'
-require_relative 'file_path.rb'
+require_relative 'cache'
+require_relative 'database'
+require_relative 'file_path'
 
 module LgPodPlugin
 
   class Downloader
-    attr_accessor :git_util
-    attr_accessor :db
-    attr_accessor :cache
-    REQUIRED_ATTRS ||= %i[git name commit branch tag options].freeze
+
+    REQUIRED_ATTRS ||= %i[git name commit branch tag options git_util db cache is_cache].freeze
     attr_accessor(*REQUIRED_ATTRS)
+
     def initialize
       self.cache = Cache.new
       self.db = SqliteDb.instance
       super
     end
+
     def download_init(name, options = {})
+      hash_map = options
       self.name = name
-      self.options = options
-      self.git = options[:git]
-      self.tag = options[:tag]
-      self.branch = options[:branch]
-      self.commit = options[:commit]
+      self.git = hash_map[:git]
+      self.tag = hash_map[:tag]
+      self.branch = hash_map[:branch]
+      self.commit = hash_map[:commit]
+      self.is_cache = hash_map[:depth]
+      # 通过ls-remote获取 head 指向 branch
+      if !self.branch && self.git
+        ls = Git.ls_remote(self.git, :head => true)
+        head_ref = ls["head"][:sha]
+        ls["branches"].each do |key, value|
+          sha = value[:sha]
+          next if sha != head_ref
+          self.branch = key
+          hash_map[:branch] = key
+          break
+        end
+      end
+      self.options = hash_map
     end
 
     def is_update_pod
@@ -50,10 +64,6 @@ module LgPodPlugin
       self.git_util = git
       is_update = self.is_update_pod
       self.git_util.git_init(self.name, self.options)
-      # if name == "LBase" || name == "LLogger" || name == "LUnityFramework" || name == "LUser"
-      #   pp name
-      # end
-      # tag = options[:tag]
       git_url = options[:git]
       # commit = options[:commit]
       branch = options[:branch]
@@ -94,14 +104,14 @@ module LgPodPlugin
           self.git_util.should_pull(git, current_branch, new_commit)
           current_commit = new_commit
         end
-        hash_map = {:git => git_url}
+        hash_map = { :git => git_url }
         if current_commit
           hash_map[:commit] = current_commit
         end
         SqliteDb.instance.insert_table(name, branch, current_commit, nil, real_pod_path)
-        LgPodPlugin::Cache.cache_pod(name,real_pod_path,is_update,hash_map)
+        LgPodPlugin::Cache.cache_pod(name, real_pod_path, is_update, hash_map)
       else
-        branch_exist = git.branches.local.find {|e| e.to_s == branch}
+        branch_exist = git.branches.local.find { |e| e.to_s == branch }
         if branch_exist
           LgPodPlugin.log_green "git switch #{name} #{git_url} -b #{branch}"
           self.git_util.git_switch(branch)
@@ -115,15 +125,14 @@ module LgPodPlugin
           self.git_util.should_pull(git, current_branch, new_commit)
           current_commit = new_commit
         end
-        hash_map = {:git => git_url}
+        hash_map = { :git => git_url }
         if current_commit
           hash_map[:commit] = current_commit
         end
         SqliteDb.instance.insert_table(name, branch, current_commit, nil, real_pod_path)
-        LgPodPlugin::Cache.cache_pod(name,real_pod_path,is_update,hash_map)
+        LgPodPlugin::Cache.cache_pod(name, real_pod_path, is_update, hash_map)
       end
 
-
     end
 
   end

data/lib/lg_pod_plugin/git_util.rb

@@ -1,16 +1,20 @@
 require 'pp'
 require 'git'
+require_relative '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
+    # 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)
+
     def initialize
       super
     end
@@ -22,12 +26,13 @@ module LgPodPlugin
       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_blue "git clone --template= --single-branch --depth 1 --branch #{self.branch} #{self.git}"
+        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
@@ -53,7 +58,7 @@ module LgPodPlugin
       end
 
       FileUtils.chdir(root_path)
-      temp_path = root_path.join("tmp")
+      temp_path = root_path.join("temp")
       if temp_path.exist?
         FileUtils.rm_r(temp_path)
       end
@@ -65,13 +70,23 @@ module LgPodPlugin
       unless get_temp_folder.exist?
         return nil
       end
-      pod_root_director = FileManager.download_pod_path(name)
-      unless pod_root_director.exist?
-        FileUtils.mkdir(pod_root_director)
+
+      if self.is_cache
+        pod_root_director = FileManager.download_pod_path(name)
+        unless pod_root_director.exist?
+          FileUtils.mkdir(pod_root_director)
+        end
+        FileUtils.mv(get_temp_folder, lg_pod_path)
+        temp_path.rmdir
+        lg_pod_path
+      else
+        commit = GitUtil.git_ls_remote_refs(self.git, self.branch)
+        LgPodPlugin::Cache.cache_pod(self.name, get_temp_folder, true, {:git => self.git, :commit => commit})
+        system("cd ..")
+        system("rm -rf #{get_temp_folder.to_path}")
+        return lg_pod_path
       end
-      FileUtils.mv(get_temp_folder, lg_pod_path)
-      temp_path.rmdir
-      lg_pod_path
+
     end
 
     # 本地pod库git操作
@@ -106,7 +121,7 @@ module LgPodPlugin
     # 获取最新的一条 commit 信息
     def self.git_ls_remote_refs(git, branch)
       last_commit = nil
-      LgPodPlugin.log_green "git ls-remote #{git} #{branch}"
+      LgPodPlugin.log_yellow "git ls-remote #{git} #{branch}"
       sha = %x(git ls-remote #{git} #{branch}).split(" ").first
       if sha
         last_commit = sha

data/lib/lg_pod_plugin/install.rb

@@ -6,19 +6,14 @@ require 'cocoapods'
 require_relative 'database'
 require_relative 'download'
 require_relative 'git_util'
-require_relative 'pod_spec.rb'
+require_relative 'pod_spec'
 
 module LgPodPlugin
 
   class Installer
-    attr_accessor :name
-    attr_accessor :version
-    attr_accessor :options
-    attr_accessor :profile
-    attr_accessor :target
-    attr_accessor :real_name
-    attr_accessor :downloader
-    attr_accessor :git_util
+
+    REQUIRED_ATTRS ||= %i[name version options profile target real_name downloader git_util].freeze
+    attr_accessor(*REQUIRED_ATTRS)
 
     def initialize(profile, name, *requirements)
       if name.include?("/")
@@ -33,7 +28,7 @@ module LgPodPlugin
       self.target = profile.send(:current_target_definition)
 
       unless requirements && !requirements.empty?
-        self.pod(self.real_name, requirements)
+        self.lg_pod(self.real_name, requirements)
         return
       end
 
@@ -49,16 +44,15 @@ module LgPodPlugin
         self.options = hash_map
       end
 
-      self.pod(name, requirements)
+      self.lg_pod(name, requirements)
 
     end
 
-    private
-
+    public
     # @param [Object] name
     # @param [Hash] options
     # @return [Object] nil
-    def pod(name, *requirements)
+    def lg_pod(name, *requirements)
       unless name
         raise StandardError, 'A dependency requires a name.'
       end
@@ -74,7 +68,9 @@ module LgPodPlugin
       end
 
       if self.version && self.options
-        self.target.store_pod(self.real_name, self.version, self.options)
+        hash_map = self.options
+        hash_map.delete(:depth)
+        self.target.store_pod(self.real_name, self.version, hash_map)
         return
       end
 
@@ -90,7 +86,7 @@ module LgPodPlugin
       path = hash_map[:path]
       commit = hash_map[:commit]
       branch = hash_map[:branch]
-      depth = hash_map[:depth] ||= true
+      is_cache = options[:depth]
       if path
         profile_path = self.profile.send(:defined_in_file).dirname
         real_path = Pathname.new(path).expand_path(profile_path)
@@ -98,33 +94,34 @@ module LgPodPlugin
       # 找到本地组件库 执行 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 || commit
-        hash_map.delete(:branch)
+      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 && branch && depth
+      if url
         hash_map.delete(:tag)
         hash_map.delete(:commit)
-        hash_map.delete(:depth)
-        self.downloader.download_init(self.name, options)
+        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)
       end
 
-    end
 
-    private
+    end
 
+    public
     def install_form_specs(spec_path = nil)
       spec_path ||= './Specs'
       path = File.expand_path(spec_path, Dir.pwd)
@@ -136,14 +133,13 @@ module LgPodPlugin
       file_objects.each do |file|
         if file.install
           options = file.pod_requirements
-          self.pod(file.name, options)
+          self.lg_pod(file.name, options)
         end
       end
 
     end
 
-    private
-
+    public
     def install_local_pod(name, options = {})
       hash_map = options
       local_path = options[:path]

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/lg_pod_plugin.rb

@@ -56,14 +56,20 @@ module LgPodPlugin
     Pod::CoreUI.puts msg.green
   end
 
+  def self.log_yellow(msg)
+    Pod::CoreUI.puts msg.yellow
+  end
+
   def self.log(msg)
     Pod::CoreUI.puts msg
   end
 
+  public
   # 对 Profile 方法进行拓展
   def pod(name, *requirements)
     Installer.new(self, name, requirements)
   end
 
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide