cocoapods-soul-component-plugin 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ca100ec2abac1731f0880fbc3eab77c3bcae0ebf0a85573f8d165dfdd928b4
-  data.tar.gz: 3e63e527cf6bd1b66bdf4c86cbe2b62dd81b6c9ce5e21e3e8c5a892511885309
+  metadata.gz: '086cfd8e90765ff78ef8b39dc1d1d0fd0e8df174410e0fac71360946eb62acda'
+  data.tar.gz: 6657b4e8d4ef34e00843a6ba56e32c71239e844f2f9f07c7d10caacb1aafcd54
 SHA512:
-  metadata.gz: 9df3393644ecf49435921ba68cd96128c888cb83065c479f1473bb1d5d6cabc2e6793dcefe75fed6c7394544975730e4db8bd62082f05978a27b50173644a3a0
-  data.tar.gz: 58455b25be1648957bf8561cba12477c5b41878c856ea71e0531613f4c261afb7681dcac45f37b613d5c91c187d1a39157b36389ad91d9df1ebe74861f55b33c
+  metadata.gz: 52780e0b5c959db595b9d3e1d8914cd2383243f1184ff1d6b9528dffed5b353ad0775c57e6c294da5c819d5a50bd4f02cba681ac929dae73b441adafa6fd22e5
+  data.tar.gz: 5b5ecb2dc862f56aee5ead37711e8901c985ba8d934caf3ef56e7566669ed5e2a6c41e25a0689375cd032d6fb18841f3d96f0742a29c84dfeb1080d515167292

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cocoapods'
 require 'fileutils'
 require 'json'
@@ -10,9 +12,15 @@ module Pod
   module Downloader
     class Git < Base
       def download_deep
-        clone(false,false )
+        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
 
@@ -24,7 +32,6 @@ module Pod
       self.description = <<-DESC
         Install components through devops/components.json
       DESC
-      self.arguments = []
 
       def run
         # do nothing
@@ -35,7 +42,20 @@ 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
@@ -50,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
@@ -68,6 +94,10 @@ module CocoapodsSoulComponentPlugin
     "#{root_path}/devops/component.json"
   end
 
+  def self.component_user_file_path
+    "#{root_path}/devops/component_user.json"
+  end
+
   Pod::HooksManager.register('cocoapods-soul-component-plugin', :pre_install) do |_context|
     Pod::UI.puts '插件 pre_install'
   end
@@ -80,12 +110,19 @@ module CocoapodsSoulComponentPlugin
 
   def self.post_run
     Pod::UI.puts '添加component.json文件引用'
+    if File.exist?(component_user_file_path)
+      add_refrence(component_user_file_path)
+    end
+    add_refrence(component_file_path)
+  end
+
+  def self.add_refrence(file_path)
     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(self.component_file_path)
+    file_ref = group.new_reference(file_path)
     # podfile_local排序
     podfile_local_group = group.children.last
     group.children.pop
@@ -93,29 +130,75 @@ module CocoapodsSoulComponentPlugin
     project.save
   end
 
-  def self.pre_run
-    Pod::UI.puts "当前版本:#{CocoapodsSoulComponentPlugin::VERSION}".green
-    json = File.read(self.component_file_path)
+  def self.generateComponents
+    components = []
+    json = File.read(component_file_path)
     obj = JSON.parse(json)
-    dependencies = obj['dependencies']
 
+    dependencies_user = nil
+    if File.exist?(component_user_file_path)
+      json_user = File.read(component_user_file_path)
+      obj_user = JSON.parse(json_user)
+      dependencies_user = obj_user['dependencies']
+    end
+
+    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'],each[1]['commit']))
+      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 dependencies_user && dependencies_user[component.name]
+        component.local = dependencies_user[component.name]['local'] if dependencies_user[component.name]['local']
+        component.submodule = dependencies_user[component.name]['submodule'] if dependencies_user[component.name]['submodule']
+        component.version = dependencies_user[component.name]['version']
+        component.git = dependencies_user[component.name]['git'] if dependencies_user[component.name]['git']
+        component.branch = dependencies_user[component.name]['branch']
+        component.path = dependencies_user[component.name]['path']
+        component.commit = dependencies_user[component.name]['commit']
+        Pod::UI.puts "使用用户配置覆盖。参数：#{component.to_hash}".green
+      end
+      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
+  end
 
-    $components.each do |each|
-      if each.path == nil
+  def self.checkValidComponents
+    isValid = true
+    @@components.each do |each|
+      if each.name.nil? || each.git.nil? || each.local.nil? || each.submodule.nil?
+        Pod::UI.puts "缺少必要参数,name/git/local/submodule为必要参数：#{each.to_hash}".red
+        isValid = false
+      end
+    end
+    isValid
+  end
+
+  def self.pre_run
+    @@components = generateComponents
+    if checkValidComponents == false
+      Pod::UI.puts '参数异常，退出'.red
+      exit(1)
+    end
+
+    @@components.each do |each|
+      if each.path.nil?
         if each.submodule == false
           if each.local == true
             local_path = each.name
 
-            if each.commit != nil
+            if !each.commit.nil?
               local_path += '-'
               local_path += each.commit.to_s
-            elsif each.branch != nil
+            elsif !each.branch.nil?
               local_path += '-'
               local_path += each.branch.to_s
-            elsif each.version != nil
+            elsif !each.version.nil?
               local_path += '-'
               local_path += each.version.to_s
             end
@@ -123,7 +206,7 @@ module CocoapodsSoulComponentPlugin
             each.path = target_path
 
             if File.exist?(target_path) == false
-              options = { git: each.git, commit: each.commit, tag: each.version, 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)
               Pod::UI.puts "本地依赖 #{each.name} 不存在，即将进行下载 。参数：#{options}".green
@@ -132,10 +215,8 @@ module CocoapodsSoulComponentPlugin
               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
@@ -146,8 +227,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
@@ -159,7 +253,7 @@ module Pod
     alias old_initialize initialize
 
     def initialize(name = nil, *requirements)
-      if requirements == nil
+      if requirements.nil?
         old_initialize(name)
         return
       end
@@ -168,14 +262,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.10'
+  VERSION = '0.0.14'
 end

metadata

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