cocoapods-byte-panglem-beta 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6c5e75a80d0a83377d24e7bac384550441ec91d02856abe945c7527e3c7233
-  data.tar.gz: 726fc89778286a3fba77cabe9fa8c3151a6f82acdc9abbb9072141c308fe5856
+  metadata.gz: 23449e54e253c3cafe117711e78d379d8c4b9a737b3c848fca62a20d4206f84e
+  data.tar.gz: b2e0c75ec1c77d6759903687040a4b650a2a04f509573e6c35a17d2f50121fac
 SHA512:
-  metadata.gz: 749b4cd58cb1ee252c28a758db798e1593f4fb734d79d7e2f36bf67fc73073866fee79a3d1f77e9d569973c80b567e049708c65f23f6c0fd6281656b1c529a92
-  data.tar.gz: e54778c794a191708f75c749e48d677ff53de82bb3dd85ffe1377f2f516cb03024cc4ea4dda463225613c9df65a9380dfcb74c1c333908b21db7dfc0c9f6fc28
+  metadata.gz: ef65d039055b866d2211fabfa56494860164599c9ae430364d1e9be1927b2bacf431df5cab809afb7b360565c6edce2d13482e847b10775f0d0b5d0221bd36bb
+  data.tar.gz: f877e822b9e93b039dd6d2255b59bbbf8254c9560dada1504f6ed35a0b65d627bca4fd021a5f1489df67ca19b3a1f1f77d2eafefbe55a6d8eed4ace746377171

data/lib/cocoapods-byte-panglem-beta/analyzer.rb

@@ -25,29 +25,32 @@ module PM
         end
         result = UpdateResut.from_hash(hash)
         ## 校验Pangle SDK是否符合预期
-        pm_spec =  specs.find do |spec|
-          result.sdk_name==Pod::Specification.root_name(spec.spec.name)
-        end
-        if pm_spec.nil?
-          raise  "[cocoapods-byte-panglem-beta][error] #{result.sdk_name} not found}"
-        end
-        if pm_spec.spec.version.version != result.sdk_original_version
-          raise  "[cocoapods-byte-panglem-beta][error] #{result.sdk_name} version has change(#{result.sdk_original_version}->#{pm_spec.spec.version.version}),After generating the Podfile.panglewe file, you may have made some changes in the podfile, causing the version of Pangle SDK to change. Please change 'use_pangm_sdk_update! :is_release => true
-          ',delete':is_release => true'  and re-execute 'pod install'"
-        end
+        # pm_spec =  specs.find do |spec|
+        #   result.sdk_name==Pod::Specification.root_name(spec.spec.name)
+        # end
+        # if pm_spec.nil?
+        #   raise  "[cocoapods-byte-panglem-beta][error] #{result.sdk_name} not found}"
+        # end
+        # if pm_spec.spec.version.version != result.sdk_original_version
+        #   raise  "[cocoapods-byte-panglem-beta][error] #{result.sdk_name} version has change(#{result.sdk_original_version}->#{pm_spec.spec.version.version}),After generating the Podfile.panglewe file, you may have made some changes in the podfile, causing the version of Pangle SDK to change. Please change 'use_pangm_sdk_update! :is_release => true
+        #   ',delete':is_release => true'  and re-execute 'pod install'"
+        # end
         if result.is_sdk_update
           title_options = { :verbose_prefix => '-> '.green }
           Pod::UserInterface.titled_section("[cocoapods-byte-panglem-beta][info] will change pangle sdk version , the current version will change from #{result.sdk_original_version} to #{result.sdk_target_version}", title_options)
+          ## 先删掉现有的所有beta依赖  和 原有的ads_global依赖
           specs.delete_if{|spec|
-            Pod::Specification.root_name(spec.spec.name) == result.sdk_name && spec.spec.version.version == result.sdk_original_version
+            Pod::Specification.root_name(spec.spec.name) == result.sdk_name or Pod::Specification.root_name(spec.spec.name) == PM::BuildConfig.pangle_sdk_release
           }
+          ## 再添加.pangle文件中记录的
           result.sdk_list.each{ |spec|
             specs << Pod::Resolver::ResolverSpecification.new(spec, false, spec.spec_source)
           }
 
           if result.is_rely_update
+
             specs.delete_if{|spec|
-              Pod::Specification.root_name(spec.spec.name) == result.rely_name && spec.spec.version.version == result.rely_original_version
+              Pod::Specification.root_name(spec.spec.name) == result.rely_name
             }
             result.rely_list.each{ |spec|
               specs << Pod::Resolver::ResolverSpecification.new(spec, false, spec.spec_source)
@@ -114,6 +117,7 @@ module PM
       result =  PM::SpecificationInfo.get_specfication response_data, sdk_spec
         ## 1. 判断sdk是否要更新, YES 则将旧的全部删除, 新的全部挂载
         ## 2. 判断rely 是否要更新, YES 则同上
+
       if result.is_sdk_update
         ## 这里截断,询问是否更新
         # cli = HighLine.new
@@ -130,6 +134,7 @@ module PM
           }
 
           if result.is_rely_update
+
             specs.delete_if{|spec|
               Pod::Specification.root_name(spec.spec.name) == result.rely_name && spec.spec.version.version == result.rely_original_version
             }
@@ -137,6 +142,11 @@ module PM
               specs << Pod::Resolver::ResolverSpecification.new(spec, false, spec.spec_source)
             }
           end
+          if result.is_rely_remove
+            specs.delete_if{|spec|
+              Pod::Specification.root_name(spec.spec.name) == result.rely_name && spec.spec.version.version == result.rely_original_version
+            }
+          end
           specs.sort_by!{|spec| spec.spec.name}
           is_update_finish  = true
           request_track result.sdk_original_version, result.sdk_target_version, result.sdk_target_version, response_data["code"], response_data["message"]

data/lib/cocoapods-byte-panglem-beta/gem_version.rb

@@ -2,7 +2,7 @@
 ##SPDX-License-Identifier: MIT
 
 module CocoapodsBytePanglem
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
   class Version
     def self.version
       VERSION

data/lib/cocoapods-byte-panglem-beta/net.rb

@@ -37,7 +37,7 @@ module PM
         end
 
         def Network.request_adapter(body, is_debug = false)
-            if is_debug
+            if false
                 url = URI.parse('http://localhost:8080/index.html')
                 http = Net::HTTP.new(url.host, url.port)
                 request = Net::HTTP::Get.new(url.path, initheader = {'Content-Type' =>'application/json'})

data/lib/cocoapods-byte-panglem-beta/panglem.rb

@@ -78,7 +78,7 @@ class Pod::Installer::Analyzer
       specs.each do |s|
         s.dependencies(platform).each do |dep|
           temp_name =  dep.name
-          if !temp_name.include?("Ads-Global/")
+          if !temp_name.include?("Ads-Global")
             all_specs[dep.name].each do |spec|
               if spec.non_library_specification?
                 if s.test_specification? && spec.name == s.consumer(platform).app_host_name && spec.app_specification?
@@ -108,10 +108,6 @@ class Pod::Installer::Analyzer
       resolver_specs_by_target.each do |target, specs|
 
         if specs.length > 0
-           ## SDK 场景下 不需要
-          # Pod::UserInterface.section 'cocoapods-byte-panglem remove invalid dependencie from loaded dependencies ' do
-          #   PM::Analyzer.delete_invalid_adapters target, specs
-          # end if PM::Recorder.instance.get_global_note.auto_load
 
           if PM::Recorder.instance.is_release
             Pod::UserInterface.section "[cocoapods-byte-panglem-beta][info] start trying to update the sdk version (when is_release is yes) " do
@@ -159,9 +155,6 @@ module Pod
           when Hash
             PM::Recorder.instance.set_is_debug  options[:is_debug] if options.has_key?(:is_debug)
             PM::Recorder.instance.set_is_auto_update options[:is_auto_update]if options.has_key?(:is_auto_update)
-            m = PM::Recorder.instance.is_debug
-            n = PM::Recorder.instance.is_auto_update
-            c = 1
           end
 
           PMPlugin.update

data/lib/cocoapods-byte-panglem-beta/recorder.rb

@@ -5,6 +5,8 @@ require 'cocoapods'
 require_relative 'net'
 require_relative 'config'
 require_relative 'tool'
+require 'rubygems/version'
+
 
 
 
@@ -195,6 +197,7 @@ module PM
   class UpdateResut
     attr_accessor :is_sdk_update
     attr_accessor :is_rely_update
+    attr_accessor :is_rely_remove
     attr_accessor :sdk_list
     attr_accessor :rely_list
     attr_accessor :sdk_name
@@ -213,7 +216,7 @@ module PM
 
     def self.from_hash(hash)
       re = UpdateResut.new()
-      re.sdk_name =  "Ads-Global"
+      re.sdk_name =  PM::BuildConfig.pangle_sdk_beta
       re.rely_name = "BURelyFoundation_Global"
       re.sdk_original_version = hash["SDK_ORIGINAL_VERSION"]
       re.sdk_target_version = hash["SDK_TARGET_VERSION"]
@@ -432,10 +435,12 @@ module PM
       ## 3. 计算出升级时需要替换的所有的specfication
       info_r = get_info
       target_sdk_version = response_data["data"]["pangle_sdk_version"]
+      original_sdk_version = original_sdk_spec.spec.version.version
+
       # target_sdk_version = "5.9.0.4"
       sdk_name = PM::BuildConfig.pangle_sdk_beta
       if target_sdk_version == nil || target_sdk_version.length == 0
-        ## 兜底, 赋值为当前版本且为正式版
+        ## 赋值为当前版本且为正式版
         target_sdk_version = original_sdk_spec.spec.version.version
         sdk_name = PM::BuildConfig.pangle_sdk_release
       else
@@ -461,20 +466,42 @@ module PM
         result.sdk_target_version = target_sdk_root_spec.version.version
         PM::Recorder.instance.sdk_original_version = result.sdk_original_version
         PM::Recorder.instance.sdk_target_version = result.sdk_target_version
-        target_rely_version = target_sdk_root_spec.get_rely_version
-        original_rely_version = original_sdk_spec.spec.get_rely_version
+        target_rely_version = "0.0.0.0"
+        original_rely_version = "0.0.0.0"
+        if Gem::Version.new(target_sdk_version) < Gem::Version.new("6.3.0.0")
+          target_rely_version = target_sdk_root_spec.get_rely_version
+        end
+        if Gem::Version.new(original_sdk_version) < Gem::Version.new("6.3.0.0")
+          original_rely_version = original_sdk_spec.spec.get_rely_version
+        end
+
+
         # target_rely_version = "0.2.0.0"
-        if target_rely_version != original_rely_version
-          target_rely_spec_list = info_r[rely_name].select do |spec|
-            Pod::Specification.root_name(spec.name) == rely_name && spec.version.version == target_rely_version
-          end
-          result.is_rely_update = true
-          result.rely_list = target_rely_spec_list
+        ## 判断灰度目标版本是否>=6300, 大于等于 则删除rely的依赖
+        if Gem::Version.new(target_sdk_version) >= Gem::Version.new("6.3.0.0")
+          result.is_rely_remove = true;
+          result.is_rely_update = false
+          result.rely_list = []
           result.rely_original_version = original_rely_version
           result.rely_target_version = target_rely_version
           PM::Recorder.instance.rely_original_version = result.rely_original_version
           PM::Recorder.instance.rely_target_version = result.rely_target_version
+        else
+
+          if target_rely_version != original_rely_version
+            target_rely_spec_list = info_r[rely_name].select do |spec|
+              Pod::Specification.root_name(spec.name) == rely_name && spec.version.version == target_rely_version
+            end
+            result.is_rely_remove = false;
+            result.is_rely_update = true
+            result.rely_list = target_rely_spec_list
+            result.rely_original_version = original_rely_version
+            result.rely_target_version = target_rely_version
+            PM::Recorder.instance.rely_original_version = result.rely_original_version
+            PM::Recorder.instance.rely_target_version = result.rely_target_version
+          end
         end
+
       end
       result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-byte-panglem-beta
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - zhangtianhao.1230@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods