cocoapods-soul-component-plugin 0.0.15 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1cc567fadc6951270b4ecdc745c8181315c90ec3197b3c02dd4ccf25f074aa0
-  data.tar.gz: c37be6a87ad84c013f378bd7f6cd6490ad1264ec26ea2ad41107241bd5f9d9ad
+  metadata.gz: 5ba46c4215e212048b12ef4d21144b6d99a174719dc6703c1d557e44acbd2a77
+  data.tar.gz: b1c3d3ba342a7606ee9bab2098ca18ae83dd533e3a6fd3adfdfed5862f233c04
 SHA512:
-  metadata.gz: cfe876fafd86ea8194e52d21d158d70d6cd311b5741001b04acfbed6fef1516b47ea0145659b7c438d45c63c61ac35745e365218be1638828992950ca66ea024
-  data.tar.gz: 7ac6535353d77dc166ec4704ea4ff60dd8ab9e8a5fb5b02cc1bed59bcb52d7fd415ec3e5fcc812d4080cd0368af34ba4d6d321a8aaac507954b07e6098bb70ee
+  metadata.gz: c8ad3d122e467a235ed4803980226dcee75296a6628e8a19c688cb6055fe1bdbe67742ad698a3309e6c5c09efc43afbe43a5ca34533e677f3ce34dc65e2482f2
+  data.tar.gz: 6ced21117842e75056be117de6a1e94720021fa0038e36a1f73f74232d14119bf37a9095b3f2e4ef5b819178f09d252c95449a09db6d99ed5b35298658a70473

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

@@ -44,7 +44,7 @@ end
 module CocoapodsSoulComponentPlugin
   @@components = []
   @@use_source = false
-  @@input_dependency = ''
+  @@import_dependency = ''
 
   def self.use_source=(t_use_source)
     @@use_source = t_use_source
@@ -54,12 +54,12 @@ module CocoapodsSoulComponentPlugin
     @@use_source
   end
 
-  def self.input_dependency=(t_input_dependency)
-    @@input_dependency = t_input_dependency
+  def self.import_dependency=(t_import_dependency)
+    @@import_dependency = t_import_dependency
   end
 
-  def self.input_dependency
-    @@input_dependency
+  def self.import_dependency
+    @@import_dependency
   end
 
   def self.components
@@ -144,32 +144,43 @@ module CocoapodsSoulComponentPlugin
     json = File.read(component_file_path)
     obj = JSON.parse(json)
 
-    dependencies_user = nil
+    dependency_user = nil
+    dependency_import = 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']
+      dependency_user = obj_user['dependencies']
     end
 
-    if self.input_dependency.length > 0
-      obj = JSON.parse(self.input_dependency)
-      Pod::UI.puts "使用外部依赖配置覆盖。参数：#{obj['dependencies'].to_hash}".green
+    if @@import_dependency.length.positive?
+      import_json = JSON.parse(self.import_dependency)
+      dependency_import = import_json['dependencies']
     end
 
     dependencies = obj['dependencies']
     dependencies.each do |each|
       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']
+      if dependency_user && dependency_user[component.name]
+        component.local = dependency_user[component.name]['local'] if dependency_user[component.name]['local']
+        component.submodule = dependency_user[component.name]['submodule'] if dependency_user[component.name]['submodule']
+        component.version = dependency_user[component.name]['version']
+        component.git = dependency_user[component.name]['git'] if dependency_user[component.name]['git']
+        component.branch = dependency_user[component.name]['branch']
+        component.path = dependency_user[component.name]['path']
+        component.commit = dependency_user[component.name]['commit']
         Pod::UI.puts "使用用户配置覆盖。参数：#{component.to_hash}".green
       end
+      if dependency_import && dependency_import[component.name]
+        component.local = dependency_import[component.name]['local'] if dependency_import[component.name]['local']
+        component.submodule = dependency_import[component.name]['submodule'] if dependency_import[component.name]['submodule']
+        component.version = dependency_import[component.name]['version']
+        component.git = dependency_import[component.name]['git'] if dependency_import[component.name]['git']
+        component.branch = dependency_import[component.name]['branch']
+        component.path = dependency_import[component.name]['path']
+        component.commit = dependency_import[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
@@ -211,7 +222,7 @@ module CocoapodsSoulComponentPlugin
               local_path += each.commit.to_s
             elsif !each.branch.nil?
               local_path += '-'
-              local_path += each.branch.to_s
+              local_path += each.branch.to_s.gsub('/','-')
             elsif !each.version.nil?
               local_path += '-'
               local_path += each.version.to_s
@@ -221,7 +232,8 @@ module CocoapodsSoulComponentPlugin
 
             if File.exist?(target_path) == false
               options = { git: each.git, commit: each.commit, tag: each.version, branch: each.branch }
-              options = Pod::Downloader.preprocess_options(options)
+              # 这行代码会自动清空branch并且设置commit
+              # options = Pod::Downloader.preprocess_options(options)
               downloader = Pod::Downloader.for_target(target_path, options)
               Pod::UI.puts "本地依赖 #{each.name} 不存在，即将进行下载 。参数：#{options}".green
               downloader.download_deep
@@ -250,9 +262,9 @@ module Pod
 
 
       def initialize(argv)
-        CocoapodsSoulComponentPlugin.use_source = argv.flag?('source')
-        CocoapodsSoulComponentPlugin.input_dependency = argv.option('import-dependency')
         super
+        CocoapodsSoulComponentPlugin.import_dependency = argv.option('local-dependency',CocoapodsSoulComponentPlugin.import_dependency)
+        CocoapodsSoulComponentPlugin.use_source = argv.flag?('source', CocoapodsSoulComponentPlugin.use_source)
       end
 
       alias old_run run
@@ -263,6 +275,10 @@ module Pod
         old_run
         CocoapodsSoulComponentPlugin.post_run if CocoapodsSoulComponentPlugin.use_components
       end
+
+      def validate!
+        super
+      end
     end
   end
 
@@ -275,7 +291,9 @@ module Pod
         return
       end
 
-      # if name == "SLog"
+      # 当使用本地Flutter并且json中有SOFEngine项时会报奇怪的错误
+      # if name == 'SOFEngine'
+      #   puts 1
       #   puts name, requirements
       # end
 
@@ -288,8 +306,11 @@ module Pod
                          [each.version]
                        end
       end
-
+      # if name == 'SOFEngine'
+      #   puts 2
+      #   puts name, requirements
+      # end
       old_initialize(name, *requirements)
     end
   end
-end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-soul-component-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.18
 platform: ruby
 authors:
 - fang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-soul-component-plugin.