lg_pod_plugin 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872508947b930ee5b91b49de9ccba4fe2bd74aedc1dfcb829ccb470d140c1165
-  data.tar.gz: 1882ba4f26ae21d1d2f821911339adb0e8fc3d39fa6c12537cf7800c7d57d4eb
+  metadata.gz: c7a39307dd5e4f73faefa55775b51e880f9f0fda326cc618c62b957ddcba669e
+  data.tar.gz: 46777e3af13f74c44086743bb48352373539806a22aafc758eb104dde3f4864c
 SHA512:
-  metadata.gz: d43f347f17d5fce098ff285abbf4b843f982c6d6e108dbe72a5c6e1da809859558092830a241b97955c0adecdaafc601eb9ec971a316e39cf906797a547be184
-  data.tar.gz: d0de1ffeb0bf00948b7ab8953c2d04792b401ef681095b65029f4b7af966592c1a5e1dc2c8987c0f20097ae54b6d42316b4564e55e3b6d1811419363c15917ae
+  metadata.gz: a945450a624206b131df0b963fbd8616b4df179112b54f41625ed90a46b5480823d74b80c0dc75c227f56de3d74fe225cb44243396d11ff7d864399adcbd89a0
+  data.tar.gz: c72bbba5713477f4f094387b650298768e94ec3de1a831daead4d2eb588654cb58190d3cbd474e983bc7b02c2b3ce144c032f27722ea75802020a513488490a8

data/lib/lg_pod_plugin/cache.rb

@@ -149,7 +149,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/download.rb

@@ -3,7 +3,7 @@ require_relative 'cache.rb'
 require_relative 'database.rb'
 require_relative 'file_path.rb'
 
-module  LgPodPlugin
+module LgPodPlugin
 
   class Downloader
     attr_accessor :git_util
@@ -57,12 +57,11 @@ module  LgPodPlugin
       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,7 +90,7 @@ 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
@@ -104,15 +103,15 @@ module  LgPodPlugin
       else
         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

data/lib/lg_pod_plugin/git_util.rb

@@ -27,9 +27,8 @@ module LgPodPlugin
     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_blue "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
@@ -76,8 +75,8 @@ module LgPodPlugin
     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 +106,19 @@ module LgPodPlugin
     # 获取最新的一条 commit 信息
     def self.git_ls_remote_refs(git, branch)
       last_commit = nil
-      puts "git ls-remote #{git} #{branch}"
+      LgPodPlugin.log_green "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

@@ -9,59 +9,105 @@ require_relative 'git_util'
 require_relative 'pod_spec.rb'
 
 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
-    def initialize(defined_in_file = nil, profile, &block)
-      @defined_in_file = defined_in_file
+
+    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.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.pod(name, requirements)
+
     end
 
+    private
+
     # @param [Object] name
     # @param [Hash] options
     # @return [Object] nil
-    def pod(name, options = {})
+    def 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
+        self.target.store_pod(self.real_name, self.version, self.options)
+        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]
+      depth = hash_map[:depth] ||= true
+      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
+        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)
         hash_map.delete(:depth)
-        self.target.store_pod(name, hash_map)
+        self.target.store_pod(self.real_name, hash_map)
         return
       end
 
@@ -70,17 +116,19 @@ module LgPodPlugin
         hash_map.delete(:tag)
         hash_map.delete(:commit)
         hash_map.delete(:depth)
-        self.downloader.download_init(name, options)
+        self.downloader.download_init(self.name, options)
         self.downloader.pre_download_pod(self.git_util)
-        self.target.store_pod(name, hash_map)
+        self.target.store_pod(self.real_name, hash_map)
       end
 
     end
 
+    private
+
     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
@@ -95,27 +143,30 @@ module LgPodPlugin
     end
 
     private
+
     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.2"
 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,59 @@ 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
+
+  def self.log_blue(msg)
+    Pod::CoreUI.puts msg.blue
+  end
+
+  def self.log_green(msg)
+    Pod::CoreUI.puts msg.green
+  end
+
+  def self.log(msg)
+    Pod::CoreUI.puts msg
   end
 
-  # 通过spec文件安装
-  def self.install_form_spec(profile, spec_path = nil)
-    return Installer.new(profile).install_form_specs(spec_path)
+  # 对 Profile 方法进行拓展
+  def pod(name, *requirements)
+    Installer.new(self, name, requirements)
   end
 
-  # autoload :Command, '../lib/command/command'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - dongzb01
@@ -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)