lg_pod_plugin 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872508947b930ee5b91b49de9ccba4fe2bd74aedc1dfcb829ccb470d140c1165
-  data.tar.gz: 1882ba4f26ae21d1d2f821911339adb0e8fc3d39fa6c12537cf7800c7d57d4eb
+  metadata.gz: 61fa41fbaf71702b19bf2ef604d2283f68d472e5c47428890398463556a985f7
+  data.tar.gz: 9c45761ced23924ce2e70557245d70eb883b4f7158c63acfeb3f0547af2e1fdc
 SHA512:
-  metadata.gz: d43f347f17d5fce098ff285abbf4b843f982c6d6e108dbe72a5c6e1da809859558092830a241b97955c0adecdaafc601eb9ec971a316e39cf906797a547be184
-  data.tar.gz: d0de1ffeb0bf00948b7ab8953c2d04792b401ef681095b65029f4b7af966592c1a5e1dc2c8987c0f20097ae54b6d42316b4564e55e3b6d1811419363c15917ae
+  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)
@@ -149,7 +185,7 @@ class Cache
     pods_pecs.each do |s_name, s_spec|
       destination = path_for_pod(request, {})
       if !File.exist?(destination) || is_update
-        puts "Copying #{name} from `#{target}` to `#{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, {})

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
+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,19 +64,14 @@ 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]
-      puts "Using `#{name}` (#{branch})\n"
-
+      LgPodPlugin.log_green "Using `#{name}` (#{branch})"
       # 发现本地有缓存, 不需要更新缓存
       need_download, new_commit = self.cache.find_pod_cache(name, git_url, branch, is_update)
       unless need_download
-        puts "find the cache of `#{name}`, you can use it now."
+        LgPodPlugin.log_green "find the cache of `#{name}`, you can use it now."
         return
       end
 
@@ -91,40 +100,39 @@ module  LgPodPlugin
         if new_commit != current_commit && is_update
           #删除旧的pod 缓存
           self.cache.clean_old_cache(name, git_url, current_commit)
-          puts "git pull #{name} origin/#{current_branch}\n"
+          LgPodPlugin.log_green "git pull #{name} origin/#{current_branch}"
           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
-          puts "git switch #{name} #{git_url} -b #{branch}\n"
+          LgPodPlugin.log_green "git switch #{name} #{git_url} -b #{branch}"
           self.git_util.git_switch(branch)
         else
-          puts "git checkout  #{name} #{git_url} -b #{branch}\n"
+          LgPodPlugin.log_green "git checkout  #{name} #{git_url} -b #{branch}"
           self.git_util.git_checkout(branch)
         end
         current_commit = git.log(1).to_s
         if current_commit != new_commit
-          puts "git pull  #{name} #{git_url} -b #{branch}\n"
+          LgPodPlugin.log_green "git pull  #{name} #{git_url} -b #{branch}"
           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,14 +26,14 @@ 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")
-        puts "git clone --template= --single-branch --depth 1 --branch #{self.branch} #{self.git}\n"
+        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}")
-        puts "\n"
         temp_git_path
       else
          nil
@@ -54,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
@@ -66,18 +70,28 @@ 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操作
-    def git_local_pod_check
-      FileUtils.chdir(self.path)
+    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"
@@ -107,16 +121,19 @@ module LgPodPlugin
     # 获取最新的一条 commit 信息
     def self.git_ls_remote_refs(git, branch)
       last_commit = nil
-      puts "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
+        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
 

data/lib/lg_pod_plugin/install.rb

@@ -6,81 +6,126 @@ 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 :profile
-    attr_accessor :target
-    attr_accessor :downloader
-    attr_accessor :git_util
-    def initialize(defined_in_file = nil, profile, &block)
-      @defined_in_file = defined_in_file
+
+    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?("/")
+        self.name = name.split("/").first
+      else
+        self.name = name
+      end
+      self.real_name = name
       self.profile = profile
       self.git_util = GitUtil.new
       self.downloader = Downloader.new
       self.target = profile.send(:current_target_definition)
-      if block
-        instance_eval(&block)
+
+      unless requirements && !requirements.empty?
+        self.lg_pod(self.real_name, requirements)
+        return
+      end
+
+      first = requirements[0].first
+      if "#{first.class}" == "String"
+        self.version = first
+      elsif "#{first.class}" == "Hash"
+        self.options = first
       end
+
+      hash_map = requirements[0].last
+      if "#{hash_map.class}" == "Hash"
+        self.options = hash_map
+      end
+
+      self.lg_pod(name, requirements)
+
     end
 
+    public
     # @param [Object] name
     # @param [Hash] options
     # @return [Object] nil
-    def pod(name, options = {})
+    def lg_pod(name, *requirements)
       unless name
         raise StandardError, 'A dependency requires a name.'
       end
-      if options[0].is_a?(String)
-        version = options[0].to_s
-        self.target.store_pod(name, version)
+
+      if !requirements
+        self.target.store_pod(self.real_name)
+        return
+      end
+
+      if self.version && !self.options
+        self.target.store_pod(self.real_name, self.version)
+        return
+      end
+
+      if 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
+
+      hash_map = self.options
+      unless hash_map.is_a?(Hash)
+        self.target.store_pod(self.real_name)
         return
       end
 
-      path = options[:path]
-      tag = options[:tag]
-      commit = options[:commit]
-      url = options[:git]
-      branch = options[:branch]
-      depth = options[:depth] ||= true
       real_path = nil
-      if  path
+      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)
-        self.install_local_pod(name, options)
+        hash_map[:path] = real_path
+        hash_map.delete(:depth)
+        self.install_local_pod(self.name, hash_map)
         return
       end
 
       # 根据tag, commit下载文件
-      hash_map = options
       hash_map.delete(:path)
-      if tag || commit
-        hash_map.delete(:branch)
+      if (tag && url) || (commit && url)
         hash_map.delete(:depth)
-        self.target.store_pod(name, hash_map)
+        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(name, options)
+        self.downloader.download_init(self.name, hash_map)
         self.downloader.pre_download_pod(self.git_util)
-        self.target.store_pod(name, hash_map)
+        hash_map.delete(:depth)
+        self.target.store_pod(self.real_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|
+      file_objects = Dir.glob(File.expand_path("*.rb", path)).map do |file_path|
         #读取 xxx.rb文件
         Spec.form_file(file_path)
       end
@@ -88,34 +133,36 @@ 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
-      path = options[:path]
+      local_path = options[:path]
       branch = options[:branch]
-      unless Dir.exist?(path)
-        puts "no such file or directory at path => `#{path}`"
+      unless Dir.glob(File.expand_path(".git", local_path)).count > 0
+        LgPodPlugin.log_red("pod `#{name}` at path => #{local_path} 找不到.git目录")
         return
       end
-      local_path = Pathname(path)
-      unless local_path.glob("*.git").empty?
-        puts "path => `#{local_path}` 找不到.git目录"
+      unless Dir.glob(File.expand_path("#{name}.podspec", local_path)).count > 0
+        LgPodPlugin.log_red("pod `#{name}` at path => #{local_path} 找不到#{name}.podspec文件")
+        return
       end
+
       self.git_util.git_init(name, :branch => branch, :path => local_path)
-      self.git_util.git_local_pod_check
+      self.git_util.git_local_pod_check(local_path)
+      hash_map[:path] = local_path.to_path
       hash_map.delete(:tag)
       hash_map.delete(:git)
       hash_map.delete(:depth)
       hash_map.delete(:commit)
       hash_map.delete(:branch)
       # 安装本地私有组件库
-      self.target.store_pod(name, hash_map)
+      self.target.store_pod(self.real_name, hash_map)
     end
 
   end

data/lib/lg_pod_plugin/version.rb

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

data/lib/lg_pod_plugin.rb

@@ -1,6 +1,7 @@
 require 'git'
 require 'sqlite3'
 require "lg_pod_plugin/version"
+require 'cocoapods/user_interface'
 require_relative 'lg_pod_plugin/database'
 require_relative 'lg_pod_plugin/download'
 require_relative 'lg_pod_plugin/git_util'
@@ -10,17 +11,65 @@ require 'cocoapods-core/podfile/target_definition'
 
 module LgPodPlugin
 
+  class String
+    # colorization
+    def colorize(color_code)
+      "\e[#{color_code}m#{self}\e[0m"
+    end
+
+    def red
+      colorize(31)
+    end
+
+    def green
+      colorize(32)
+    end
+
+    def yellow
+      colorize(33)
+    end
+
+    def blue
+      colorize(34)
+    end
+
+    def pink
+      colorize(35)
+    end
+
+    def light_blue
+      colorize(36)
+    end
+  end
+
   class Error < StandardError; end
-  # 在已经存在target下边安装pod
-  def self.install(defined_in_file = nil, profile, &block)
-     Installer.new(defined_in_file, profile, &block)
+
+  def self.log_red(msg)
+    Pod::CoreUI.puts msg.red
   end
 
-  # 通过spec文件安装
-  def self.install_form_spec(profile, spec_path = nil)
-    return Installer.new(profile).install_form_specs(spec_path)
+  def self.log_blue(msg)
+    Pod::CoreUI.puts msg.blue
   end
 
-  # autoload :Command, '../lib/command/command'
+  def self.log_green(msg)
+    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.1
+  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
@@ -111,14 +111,12 @@ dependencies:
 description: 拦截pod_install 方法, 并设置 pod 方法参数列表
 email:
 - 1060545231@qq.com
-executables:
-- lg
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/lg
 - lib/command/cache.rb
 - lib/command/command.rb
 - lib/lg_pod_plugin.rb

data/bin/lg

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-puts "这是我的第一个ruby项目"
-puts ENV["NAME"]
-puts ARGV
-
-# require  'command/command'
-#
-# LgPodPlugin::Command.run(ARGV)