cocoapods-soul-component-plugin 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e41b1c9c7d00553e6fa8e71154757bd51e3825f9fd4e66ba8949c3ec714b8fe
-  data.tar.gz: d99d0437af8d21add060f52be73898a3c9c83da5afe08d0d5d51a131edb187c8
+  metadata.gz: 2d5496a166787a45ac688840d23bb262b635ff4950e5268aa2061c6c9ce4a1b1
+  data.tar.gz: db97545925bf707fe592f89a47370e6d41c7808d5d93de78ef2fe4297b56cb09
 SHA512:
-  metadata.gz: 6122fdab51c62198eb4005aa2cd6d80eaf509124eb2c23f4ec7235e4eff6a1ca5726f4c4e37e3b70eb3d6462659a4315a5c8ff06fe21631a91108a8027deb575
-  data.tar.gz: 75f3a8880417c98c2d16d2ec4e1b893289756193ae25ae84cbcd3f131f8adb1fe4922f1955a750b097cd86059889d5fb35291bbc468794828a8f8d80888ee010
+  metadata.gz: 6c3b8c066c53e8a61692dc62147ce546eeab14ec4761909e0f8d58bb905335b75032b6db4975d2e5d33dee0049a1fe6690b55b0f12eff74e0c2269ede0755d46
+  data.tar.gz: 46c87b938b7cd76bbb7f9b9d8c97453b35a0e2724d5e1cdcbc2c44bcebfc03748a3d5095be1149992ade235400563664dfa217b633416212fd0f7e566fe8868c

data/lib/cocoapods-soul-component-plugin/command/soul-component-plugin.rb

@@ -3,8 +3,19 @@ require 'fileutils'
 require 'json'
 require 'xcodeproj'
 require 'cocoapods-downloader'
+require 'cocoapods/user_interface'
+require_relative '../gem_version'
 
 module Pod
+  module Downloader
+    class Git < Base
+      def download_deep
+        clone(false,false )
+        checkout_commit if options[:commit]
+      end
+    end
+  end
+
   class Command
     class Devops < Command
       self.summary = <<-SUMMARY
@@ -29,7 +40,7 @@ module CocoapodsSoulComponentPlugin
   class Soul_Component
     attr_accessor :name, :local, :submodule, :version, :git, :branch, :path, :commit
 
-    def initialize(name, local, submodule, version, git, branch, path)
+    def initialize(name, local, submodule, version, git, branch, path, commit)
       @name = name
       @local = local
       @submodule = submodule
@@ -50,11 +61,11 @@ module CocoapodsSoulComponentPlugin
   end
 
   def self.podfile_path
-    root_path + '/Podfile'
+    "#{root_path}/Podfile"
   end
 
   def self.component_file_path
-    root_path + '/devops/component.json'
+    "#{root_path}/devops/component.json"
   end
 
   Pod::HooksManager.register('cocoapods-soul-component-plugin', :pre_install) do |_context|
@@ -74,7 +85,7 @@ module CocoapodsSoulComponentPlugin
     group = project.main_group
     group.set_source_tree('SOURCE_ROOT')
     # 向group中添加 文件引用
-    file_ref = group.new_reference(Pod::Config.instance.sandbox.root + '../devops/component.json')
+    file_ref = group.new_reference(self.component_file_path)
     # podfile_local排序
     podfile_local_group = group.children.last
     group.children.pop
@@ -83,13 +94,13 @@ module CocoapodsSoulComponentPlugin
   end
 
   def self.pre_run
-    puts '当前版本:' + CocoapodsSoulComponentPlugin::VERSION
+    Pod::UI.puts "当前版本:#{CocoapodsSoulComponentPlugin::VERSION}".green
     json = File.read(self.component_file_path)
     obj = JSON.parse(json)
     dependencies = obj['dependencies']
 
     dependencies.each do |each|
-      $components.push(Soul_Component.new(each[0], each[1]['local'], each[1]['submodule'], each[1]['version'], each[1]['git'], each[1]['branch'], each[1]['path']))
+      $components.push(Soul_Component.new(each[0], each[1]['local'], each[1]['submodule'], each[1]['version'], each[1]['git'], each[1]['branch'], each[1]['path'],each[1]['commit']))
     end
 
     $components.each do |each|
@@ -97,23 +108,28 @@ module CocoapodsSoulComponentPlugin
         if each.submodule == false
           if each.local == true
             local_path = each.name
-            if each.branch != nil
-              local_path += '-'
-              local_path += each.branch.to_s.tr('/','-')
-            end
+
             if each.commit != nil
               local_path += '-'
               local_path += each.commit.to_s
+            elsif each.branch != nil
+              local_path += '-'
+              local_path += each.branch.to_s
+            elsif each.version != nil
+              local_path += '-'
+              local_path += each.version.to_s
             end
-            target_path = root_path + '/LocalPods/' + local_path
+            target_path = "#{root_path}/LocalPods/#{local_path}1"
             each.path = target_path
 
             if File.exist?(target_path) == false
-              options = { git: each.git, commit: each.commit, branch: each.branch }
+              options = { git: each.git, commit: each.commit, tag: each.version, branch:each.branch }
               options = Pod::Downloader.preprocess_options(options)
               downloader = Pod::Downloader.for_target(target_path, options)
-              downloader.download
-              downloader.checkout_options #=> { :git => 'example.com', :commit => 'd7f410490dabf7a6bde665ba22da102c3acf1bd9' }
+              Pod::UI.puts "本地依赖 #{each.name} 不存在，即将进行下载 。参数：#{options}".green
+              downloader.download_deep
+            else
+              Pod::UI.puts "本地依赖 #{each.name} 已存在，不进行变更，如需更新请删除重新 install。位置：#{target_path}".yellow
             end
           end
         else

data/lib/cocoapods-soul-component-plugin/gem_version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CocoapodsSoulComponentPlugin
-  VERSION = "0.0.4"
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-soul-component-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - fang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler