cocoapods-soul-component-plugin 0.0.2 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa620c7c3ab4615ab343b36920c4d100a31cf593b3e2099bb550e288751aa843
-  data.tar.gz: 9dadc43531e8c1c78891d1e0f1c0de44c9a86bf80c59e74df8b547eb364d6f3c
+  metadata.gz: 2973ba2951120c6f1fcc995d160ba9021ba167826dc8c3e3cc9636bb4f2aa993
+  data.tar.gz: 78ec8ef8b8d1905530ac31c7fe498f1ecfe1948979c420d7dfb5b6ac559b96fc
 SHA512:
-  metadata.gz: 026a210fd891acbd0bdc07ac147639c0685e59cb9efcf6d5a5eec0ea4c031a1bf6934c307a8611e2f5da0d35ee2310255af6f221a9f2778ca0d95f0950f43a5d
-  data.tar.gz: cbd9b68c220ce4b23157b452abdb4db6ee50bc3491e9d8ff8f8bcab97c28c978a272159b07e429cb8f3572c1e8cc4ee2418286573ba797db56469c4f72e3ad51
+  metadata.gz: 0e884aec7137fb65168db58fee703f8d8b34edb35945e12d982d1ec405201ea67f7f857ea3d40bd8283684437c039e7b95eda6ab192ae5498c89b8f88420239a
+  data.tar.gz: e2174829dc3590418da0daab2c2f04979da30ca2afb51f17a423cbd47221bfaeedbb13450944678ced82d414a7e02c6a07054c767b3af242d926fbaaeb0c4e61

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|
@@ -68,15 +79,13 @@ module CocoapodsSoulComponentPlugin
   end
 
   def self.post_run
-    return if use_components == false
-
     Pod::UI.puts '添加component.json文件引用'
     project = Xcodeproj::Project.open(Pod::Config.instance.sandbox.project_path)
     # 获取主group
     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
@@ -85,30 +94,42 @@ module CocoapodsSoulComponentPlugin
   end
 
   def self.pre_run
-    time = Time.now.to_i
-
+    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|
       if each.path == nil
         if each.submodule == false
           if each.local == true
-            local_path = each.name + each.branch.to_s + each.commit.to_s
-            target_path = root_path + '/LocalPods/' + local_path
+            local_path = each.name
+
+            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}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' }
+              downloader.download_deep
+              Pod::UI.puts "本地 #{each.name} 不存在，进行 clone 。参数：#{options}".green
+            else
+              Pod::UI.puts "本地 #{each.name} 已存在，不进行变更，如需更新请删除。位置：#{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.2"
+  VERSION = '0.0.8'
 end

metadata

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