cocoapods-soul-component-plugin 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2973ba2951120c6f1fcc995d160ba9021ba167826dc8c3e3cc9636bb4f2aa993
-  data.tar.gz: 78ec8ef8b8d1905530ac31c7fe498f1ecfe1948979c420d7dfb5b6ac559b96fc
+  metadata.gz: 80e8752bcf3e29fe0c8375f18b08be5f0d03ff7c5eb9e4ee673baf53704ff1b0
+  data.tar.gz: 2e052340dc280c917ad61a14af622c2cedbc25b5802fc97290052a07dc6bcf99
 SHA512:
-  metadata.gz: 0e884aec7137fb65168db58fee703f8d8b34edb35945e12d982d1ec405201ea67f7f857ea3d40bd8283684437c039e7b95eda6ab192ae5498c89b8f88420239a
-  data.tar.gz: e2174829dc3590418da0daab2c2f04979da30ca2afb51f17a423cbd47221bfaeedbb13450944678ced82d414a7e02c6a07054c767b3af242d926fbaaeb0c4e61
+  metadata.gz: 54077c1784559216a6403be52c660516e40c4620348dfbdaecfa3265efc7430f12d0a821b5b5606efa8519c63ceb663798695cdf7a992594f128a061459edcdf
+  data.tar.gz: d00ace53cfd644d4a260cbfe6029d3948da91d06cc3b7f06d8c0367f51f66a5f4b94dda99e9e79a7c0d57dc18ba28470158b59a8fdbaadc18f8922e262841a1f

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
@@ -85,7 +115,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
@@ -93,49 +123,93 @@ 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']
+        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
+
+  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
 
-    $components.each do |each|
-      if each.path == nil
+  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
-            target_path = "#{root_path}/LocalPods/#{local_path}1"
+            target_path = "#{root_path}/LocalPods/#{local_path}"
             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
               downloader.download_deep
-              Pod::UI.puts "本地 #{each.name} 不存在，进行 clone 。参数：#{options}".green
             else
-              Pod::UI.puts "本地 #{each.name} 已存在，不进行变更，如需更新请删除。位置：#{target_path}".yellow
+              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 +220,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 +246,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 +255,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.8'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-soul-component-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.12
 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