cocoapods-dev-env 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afe919528275cf8b10ba4dc9f641fb314d41973a20b3af3a04f4eb7d6b2490f
-  data.tar.gz: 89636fb4ea8ac5450f61b682a1e472bfaa2265d3488240c674135baa2bbcf78b
+  metadata.gz: 87f011b42c1df26a04c8ac866532a91eef0f0d7e1d854bf97e369714107c0844
+  data.tar.gz: 9befa3b3fe9f53aa5adbd201be02fa44d33ff48b56bada40c433e90235706f0d
 SHA512:
-  metadata.gz: 88e9376cedc8fbee56febc9339c05f032bd7dba76793fba50145aa7f612af8f60331b8c523018c922d71c0083e5167e2220b6bf92b3f3c84b2c664343d591519
-  data.tar.gz: d32ccb577e9f11f1d935f12009ba6c60db7f6c4aef447ffe730f310afb20ed82e63aa858fe6157d318bf9b8e3c96fad7655093fdf9207e583101a9a3bafaeda2
+  metadata.gz: ce2e9238b1dfb6dad9ce583adb3b9cd61bf7744e91e376dd51dfd7a516d2cbe1c8f95b2469a212c41d4b1f9cbb4be9f915f9ccb0d0b2055f52ff140fa23fe069
+  data.tar.gz: 7d30f8dd72ef7bc78625f144e5fdd517c10f55ffec6c6985ae00fe9023673d3c6132f8cca17908f350c2bf15e55845769c684c606d729a2932ed2f5073c69f03

data/lib/cocoapods/dev/env/version.rb

@@ -1,7 +1,7 @@
 module Cocoapods
   module Dev
     module Env
-      VERSION = "2.0.1"
+      VERSION = "2.0.2"
     end
   end
 end

data/lib/cocoapods_plugin.rb

@@ -32,6 +32,7 @@ module Pod
 class Podfile
     class TargetDefinition
         attr_reader :binary_repo_url
+        attr_reader :binary_source
 
         def searchAndOpenLocalExample(path)
             _currentDir = Dir.pwd
@@ -175,6 +176,7 @@ class Podfile
                 UI.puts "💔 切换版本号的版本现在为空，无法设置版本号".yellow
                 return
             end
+            newVersion = get_pure_version(newVersion)
             specName = name + ".podspec"
             FileProcesserManager.new(specName, 
                 [
@@ -206,7 +208,7 @@ class Podfile
                 
                 deal_dev_env_with_options(dev_env, options, pod_name, name, requirements)
                 if dev_env != 'dev' 
-                    useBinary(dev_env, pod_name, use_binary, options, requirements)
+                    binary_processer(dev_env, pod_name, use_binary, options, requirements)
                 end
 
                 
@@ -374,7 +376,7 @@ class Podfile
                     checkAndRemoveSubmodule(path)
                 end
                 if requirements.length < 2
-                    requirements.insert(0, "#{tag}")
+                    requirements.insert(0, "#{get_pure_version(tag)}")
                 end
                 UI.message "enabled #{"release".green}-mode for #{pod_name.green}"
             else
@@ -382,27 +384,50 @@ class Podfile
             end
         end
         
-        def useBinary(dev_env, pod_name, use_binary, options, requirements)
+        def binary_processer(dev_env, pod_name, use_binary, options, requirements)
             if use_binary && use_binary == true
-                options.delete(:git)
-                options.delete(:tag)
-                options.delete(:path)
-                options[:source] = binary_repo_url
+                if options[:tag] != nil
+                    begin
+                        version = get_pure_version(options[:tag])
+                        spec = binary_source.specification_path(pod_name, Version.new(version))
+                        if spec 
+                            if requirements.length < 2
+                                options.delete(:git)
+                                options.delete(:path)
+                                options.delete(:tag)
+                                options[:source] = binary_repo_url
+                                requirements.insert(0, "#{version}")
+                            else
+                                UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 对应的版本,但是已经标记版本号#{requirements}, 不知道用哪个".red
+                            end
+                        else
+                            UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
+                        end
+                    rescue => exception
+                        UI.puts "pod '#{pod_name}' :tag => #{options[:tag]} version: #{version} 没有找到: tag 对应的版本".red
+                    else
+                        
+                    end
+                else
+                    options.delete(:git)
+                    options.delete(:path)
+                    options.delete(:tag)
+                    options[:source] = binary_repo_url
+                end
+                
             else
                 if options[:source] == nil
                     begin
                         sources = find_pod_repos(pod_name).sources.select{|item| item.url.downcase != binary_repo_url.downcase } if options.empty?
                         if sources != nil
                             if sources.length >= 2
-                                p "#{pod_name} 有多个source #{sources}"
+                                UI.puts "#{pod_name.green} 有多个source #{sources}".yellow
                                 source_url = sources.detect{|item| item.url.downcase != Pod::TrunkSource::TRUNK_REPO_URL.downcase && item.url.downcase != "https://github.com/CocoaPods/Specs.git".downcase}.url
                             else
                                 source_url = sources.first.url
                             end
                         end
                         options[:source] = source_url if source_url != nil
-                        UI.puts "#{pod_name} :source=> #{options[:source]} by cocoapods-dev-env".yellow if options[:source] != nil
-                        
                     rescue => exception
                         UI.puts "#{pod_name} exception:#{exception}".red
                     else
@@ -410,6 +435,9 @@ class Podfile
                     end
                 end
             end
+            UI.puts "#{pod_name.green} :source=> #{options[:source].green} by cocoapods-dev-env" if options[:source] != nil
+            UI.message "#{pod_name.yellow} options #{options}  by cocoapods-dev-env" if options[:source] != nil
+            UI.message "#{pod_name.yellow} requirements #{requirements}  by cocoapods-dev-env" if options[:source] != nil
         end
 
         def binary_repo_url
@@ -419,6 +447,17 @@ class Podfile
             return @binary_repo_url
         end
 
+        def binary_source 
+            if @binary_source == nil
+                @binary_source = Pod::Config.instance.sources_manager.all.detect{|item| item.url.downcase == binary_repo_url.downcase}
+            end
+            return @binary_source
+        end
+
+        def get_pure_version(version) 
+            return version.split.last.scan(/\d+/).join('.') 
+        end
+
         def find_pod_repos(pod_name) #等同pod search
             sets = Pod::Config.instance.sources_manager.search_by_name(pod_name)
             if sets.count == 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dev-env
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - 吴锡苗
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luna-binary-uploader