lg_pod_plugin 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b53208ed4fa32c2ca693aaa0b1d960ba2699e0a1b5e89c521123f489c35dc9b
-  data.tar.gz: da8650d3f68524a9b25667094edc57386509ef86c7ca90c1dacd350365efe8ea
+  metadata.gz: 872508947b930ee5b91b49de9ccba4fe2bd74aedc1dfcb829ccb470d140c1165
+  data.tar.gz: 1882ba4f26ae21d1d2f821911339adb0e8fc3d39fa6c12537cf7800c7d57d4eb
 SHA512:
-  metadata.gz: 42d727f09c1e37babdde7cc562af7c5301e11813b37768d138b57bb76f3fe28e40ad1e1fc3d81db341fa5c901275e2c894778814a285768240fbbff872368b84
-  data.tar.gz: 3ce6ae923d9c7c8af2a5a514d137935efeb111607b1bc52c49e4bd7c130c48153857816efd67c07b8b77e80110e5710c25da861316d70339993377fc866f3027
+  metadata.gz: d43f347f17d5fce098ff285abbf4b843f982c6d6e108dbe72a5c6e1da809859558092830a241b97955c0adecdaafc601eb9ec971a316e39cf906797a547be184
+  data.tar.gz: d0de1ffeb0bf00948b7ab8953c2d04792b401ef681095b65029f4b7af966592c1a5e1dc2c8987c0f20097ae54b6d42316b4564e55e3b6d1811419363c15917ae

data/README.md

@@ -1,3 +1,4 @@
+安装和使用教程: https://juejin.cn/post/7142388587852464135
 # LgPodPlugin
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/lg_pod_plugin`. To experiment with that code, run `bin/console` for an interactive prompt.

data/bin/lg

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

data/lib/command/cache.rb

@@ -0,0 +1,18 @@
+# require 'claide'
+#
+# module LgPodPlugin
+#   class Cache < Command
+#     self.abstract_command = true
+#     self.summary = 'Inter-process communication'
+#     def initialize(argv)
+#
+#     end
+#     def output_pipe
+#       pp "hello world"
+#     end
+#
+#     def run
+#       pp "run"
+#     end
+#   end
+# end

data/lib/command/command.rb

@@ -0,0 +1,35 @@
+# require 'claide'
+#
+# module LgPodPlugin
+#   class Command < CLAide::Command
+#     require_relative './cache'
+#
+#     self.abstract_command = true
+#     self.command = 'pod'
+#     self.version = VERSION
+#     self.description = 'this is my command lint tool!'
+#     self.plugin_prefixes = %w(claide cocoapods)
+#
+#     def self.options
+#       [
+#         ['--allow-root', 'Allows CocoaPods to run as root'],
+#         ['--silent', 'Show nothing'],
+#       ].concat(super)
+#     end
+#
+#     def self.run(argv)
+#       super(argv)
+#     end
+#
+#     def initialize(argv)
+#       super
+#       # config.silent = argv.flag?('silent', config.silent)
+#       # config.allow_root = argv.flag?('allow-root', config.allow_root)
+#       # config.verbose = self.verbose? unless verbose.nil?
+#       unless self.ansi_output?
+#         Colored2.disable!
+#         String.send(:define_method, :colorize) { |string, _| string }
+#       end
+#     end
+#   end
+# end

data/lib/lg_pod_plugin/cache.rb

@@ -28,24 +28,15 @@ class Cache
   #判断缓存是否存在且有效命中缓存
   def find_pod_cache(name ,git, branch, is_update)
     last_commit = nil
-
     if is_update
-      puts "git ls-remote #{git} #{branch}"
-      sha = %x(git ls-remote #{git} #{branch}).split(" ").first
-      if sha
-        last_commit = sha
-      else
-        ls = Git.ls_remote(git, :refs => true )
-        find_branch = ls["branches"][branch]
-        if find_branch
-          last_commit = find_branch[:sha]
-        end
-      end
+      last_commit = GitUtil.git_ls_remote_refs(git, branch)
     else
       local_pod_path = self.get_download_path(name, git, branch)
       if Dir.exist?(local_pod_path)
         local_git = Git.open(Pathname("#{local_pod_path}"))
         last_commit = local_git.log(1).to_s
+      else
+        last_commit = GitUtil.git_ls_remote_refs(git, branch)
       end
     end
     unless last_commit

data/lib/lg_pod_plugin/download.rb

@@ -50,14 +50,14 @@ module  LgPodPlugin
       self.git_util = git
       is_update = self.is_update_pod
       self.git_util.git_init(self.name, self.options)
-      # if name == "LAddressComponents" || name == "LLogger" || name == "LUnityFramework" || name == "LUser"
+      # 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 "Pre-downloading: `#{name}` \n"
+      puts "Using `#{name}` (#{branch})\n"
 
       # 发现本地有缓存, 不需要更新缓存
       need_download, new_commit = self.cache.find_pod_cache(name, git_url, branch, is_update)

data/lib/lg_pod_plugin/git_util.rb

@@ -81,7 +81,7 @@ module LgPodPlugin
       git = Git.open(Pathname("./"))
       current_branch = git.current_branch
       last_stash_message = "#{current_branch}_pod_install_cache"
-      if self.branch == current_branch
+      if self.branch == current_branch || !self.branch
         # 是否恢复储藏内容到暂存区
         self.should_pull(git ,current_branch)
       else
@@ -104,12 +104,27 @@ module LgPodPlugin
       end
     end
 
+    # 获取最新的一条 commit 信息
+    def self.git_ls_remote_refs(git, branch)
+      last_commit = nil
+      puts "git ls-remote #{git} #{branch}"
+      sha = %x(git ls-remote #{git} #{branch}).split(" ").first
+      if sha
+        last_commit = sha
+      else
+        ls = Git.ls_remote(git, :refs => true )
+        find_branch = ls["branches"][branch]
+        if find_branch
+          last_commit = find_branch[:sha]
+        end
+      end
+    end
+
     # 是否pull 代码
     def should_pull(git, branch, new_commit = nil)
       git_url = git.remote.url
       if new_commit == nil
-        puts "git ls-remote #{git_url} #{branch}"
-        new_commit = %x(git ls-remote #{git_url} #{branch}).split(" ").first
+        new_commit = GitUtil.git_ls_remote_refs(git_url, branch)
       end
       local_commit = git.log(1).to_s  #本地最后一条 commit hash 值
       if local_commit != new_commit

data/lib/lg_pod_plugin/install.rb

@@ -10,13 +10,16 @@ require_relative 'pod_spec.rb'
 
 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
-      @target = profile.send(:current_target_definition)
+      self.profile = profile
       self.git_util = GitUtil.new
       self.downloader = Downloader.new
+      self.target = profile.send(:current_target_definition)
       if block
         instance_eval(&block)
       end
@@ -31,7 +34,7 @@ module LgPodPlugin
       end
       if options[0].is_a?(String)
         version = options[0].to_s
-        @target.store_pod(name, version)
+        self.target.store_pod(name, version)
         return
       end
 
@@ -41,9 +44,13 @@ module LgPodPlugin
       url = options[:git]
       branch = options[:branch]
       depth = options[:depth] ||= true
-
+      real_path = nil
+      if  path
+        profile_path = self.profile.send(:defined_in_file).dirname
+        real_path = Pathname.new(path).expand_path(profile_path)
+      end
       # 找到本地组件库 执行 git pull
-      if path && File.directory?(path)
+      if real_path && File.directory?(real_path)
         self.install_local_pod(name, options)
         return
       end
@@ -54,7 +61,7 @@ module LgPodPlugin
       if tag || commit
         hash_map.delete(:branch)
         hash_map.delete(:depth)
-        @target.store_pod(name, hash_map)
+        self.target.store_pod(name, hash_map)
         return
       end
 
@@ -65,7 +72,7 @@ module LgPodPlugin
         hash_map.delete(:depth)
         self.downloader.download_init(name, options)
         self.downloader.pre_download_pod(self.git_util)
-        @target.store_pod(name, hash_map)
+        self.target.store_pod(name, hash_map)
       end
 
     end
@@ -108,7 +115,7 @@ module LgPodPlugin
       hash_map.delete(:commit)
       hash_map.delete(:branch)
       # 安装本地私有组件库
-      @target.store_pod(name, hash_map)
+      self.target.store_pod(name, hash_map)
     end
 
   end

data/lib/lg_pod_plugin/version.rb

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

data/lib/lg_pod_plugin.rb

@@ -6,18 +6,21 @@ require_relative 'lg_pod_plugin/download'
 require_relative 'lg_pod_plugin/git_util'
 require_relative 'lg_pod_plugin/pod_spec'
 require_relative 'lg_pod_plugin/install'
+require 'cocoapods-core/podfile/target_definition'
 
 module LgPodPlugin
 
   class Error < StandardError; end
-
+  # 在已经存在target下边安装pod
   def self.install(defined_in_file = nil, profile, &block)
      Installer.new(defined_in_file, profile, &block)
   end
 
+  # 通过spec文件安装
   def self.install_form_spec(profile, spec_path = nil)
     return Installer.new(profile).install_form_specs(spec_path)
   end
 
+  # autoload :Command, '../lib/command/command'
 end
 

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-10 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: claide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
@@ -56,67 +70,57 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: cocoapods
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.3
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.11.3
 description: 拦截pod_install 方法, 并设置 pod 方法参数列表
 email:
 - 1060545231@qq.com
-executables: []
+executables:
+- lg
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/lg
+- lib/command/cache.rb
+- lib/command/command.rb
 - lib/lg_pod_plugin.rb
 - lib/lg_pod_plugin/cache.rb
 - lib/lg_pod_plugin/database.rb
@@ -145,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: 封装了自定义podfile 中pod 方法