cocoapods-soul-component-plugin 0.0.7 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 538e901040b541fa4e0ea1cbf57988925e52d826a5d58ad4ca2ed48b0974f557
-  data.tar.gz: ee18ce9056fc63b06c87a667256f11adab50ab28430a8f616f77892ec75773e5
+  metadata.gz: 4fe112b7a0c2576a90976d2ad3893dff3ebf8043b1426f61273282ae1d0344b8
+  data.tar.gz: 78f2bc8841a4005661a077c460dc4714a548a37cc00f1e57f438dc46cf227a61
 SHA512:
-  metadata.gz: 126f0255c192ff5c9f3ae04855fa50745afe7b85a7d228335789dafb42c6031b30eae548610e4b143aeb1559981fe613d18edd7b003de696e7e2d52063c3eb2c
-  data.tar.gz: f7d5606e61d8a3525faa18bb02afe312ccfa80dc81b7b0fa12732331d204b717c39e9642d668aa83243a500966a0afd2c5497b694dc17b90e732d5d8501f4f23
+  metadata.gz: fc7abff4f40879636d4e611dd7a61992cdd7a3acbb51d14d29659934eff48c1b8ecb073efe29fc5c567ab8724941b7e2b66b131ab5b7900a9b4a6658df575f73
+  data.tar.gz: b25d96af0cb3455fbb40c6f0ad3f2c4f934f0ea23bc60d9449748b492b3211ab64c36960405bbc38f31b577b6c20bc138bba392ba75177bd95c3db1d61549ef2

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

@@ -1,11 +1,29 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 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
+
+      def self.check_if_has_auth_clone(url)
+        cmd = "git ls-remote #{url} --exit-code"
+        stdout, stderr, status = Open3.capture3(cmd)
+        status.success?
+      end
+    end
+  end
+
   class Command
     class Devops < Command
       self.summary = <<-SUMMARY
@@ -14,7 +32,6 @@ module Pod
       self.description = <<-DESC
         Install components through devops/components.json
       DESC
-      self.arguments = []
 
       def run
         # do nothing
@@ -25,12 +42,25 @@ module Pod
 end
 
 module CocoapodsSoulComponentPlugin
-  $components = []
+  @@components = []
+  @@use_source = false
+
+  def self.use_source=(t_use_source)
+    @@use_source = t_use_source
+  end
+
+  def self.use_source
+    @@use_source
+  end
+
+  def self.components
+    @@components
+  end
 
   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
@@ -40,6 +70,12 @@ module CocoapodsSoulComponentPlugin
       @path = path
       @commit = commit
     end
+
+    def to_hash
+      instance_variables.map do |var|
+        [var[1..-1].to_sym, instance_variable_get(var)]
+      end.to_h
+    end
   end
 
   def self.use_components
@@ -75,7 +111,7 @@ module CocoapodsSoulComponentPlugin
     group = project.main_group
     group.set_source_tree('SOURCE_ROOT')
     # 向group中添加 文件引用
-    file_ref = group.new_reference(self.component_file_path)
+    file_ref = group.new_reference(component_file_path)
     # podfile_local排序
     podfile_local_group = group.children.last
     group.children.pop
@@ -84,43 +120,54 @@ module CocoapodsSoulComponentPlugin
   end
 
   def self.pre_run
-    puts "当前版本:#{CocoapodsSoulComponentPlugin::VERSION}"
-    json = File.read(self.component_file_path)
+    json = File.read(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']))
+      component = 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'])
+      if @@use_source
+        component.local = true
+        if Pod::Downloader::Git.check_if_has_auth_clone(component.git) == false
+          component.local = false
+          Pod::UI.puts "本地依赖 #{component.name} 切换失败，使用 binary 。参数：#{component.to_hash}".red
+        end
+      end
+      @@components.push(component)
     end
 
-    $components.each do |each|
-      if each.path == nil
+    @@components.each do |each|
+      if each.path.nil?
         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
+
+            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}"
             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
-          if each.local == true
-            each.path = "SOPods/#{each.name}"
-          end
+        elsif each.local == true
+          each.path = "SOPods/#{each.name}"
         end
       end
     end
@@ -131,8 +178,21 @@ end
 module Pod
   class Command
     class Install < Command
+      def self.options
+        [
+          ['--source', 'Use source']
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        CocoapodsSoulComponentPlugin.use_source = argv.flag?('source')
+        super
+      end
+
       alias old_run run
+
       def run
+        Pod::UI.puts "当前版本:#{CocoapodsSoulComponentPlugin::VERSION}".green
         CocoapodsSoulComponentPlugin.pre_run if CocoapodsSoulComponentPlugin.use_components
         old_run
         CocoapodsSoulComponentPlugin.post_run if CocoapodsSoulComponentPlugin.use_components
@@ -144,7 +204,7 @@ module Pod
     alias old_initialize initialize
 
     def initialize(name = nil, *requirements)
-      if requirements == nil
+      if requirements.nil?
         old_initialize(name)
         return
       end
@@ -153,14 +213,14 @@ module Pod
       #   puts name, requirements
       # end
 
-      $components.each do |each|
-        if each.name == name
-          if each.local == true
-            requirements = [{ :name => each.name, :path => each.path }]
-          else
-            requirements = [each.version]
-          end
-        end
+      CocoapodsSoulComponentPlugin.components.each do |each|
+        next unless each.name == name
+
+        requirements = if each.local == true
+                         [{ name: each.name, path: each.path }]
+                       else
+                         [each.version]
+                       end
       end
 
       old_initialize(name, *requirements)

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

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module CocoapodsSoulComponentPlugin
-  VERSION = '0.0.7'
+  VERSION = '0.0.11'
 end

metadata

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