cocoapods-linkline 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 060556e0e88328405394bbe9ad9156393fa3a58bb87cfb12055d63d6a4d86ed7
-  data.tar.gz: bac7256d626bf4cca1c43c30b60e1c68f4cd2d8e08198213c2790a9ac058f3a7
+  metadata.gz: dfaad3614b774f7f8090bbdfa2d473195e9d511df7961d4281bb4daea2fdb428
+  data.tar.gz: 70195a0667aa1831ed0f1f88aed4c23d86bebc28b54bafdde59334f59c4673dc
 SHA512:
-  metadata.gz: 12cb2fe72e0f31e22741c281f033098545235fc0ce3bb99d37c55c8a1ded8904af52396c4b9d45ae276e8ad6cf71e35ee77f8536db474f25528860e20fea1e9c
-  data.tar.gz: 65b2e15fca457df86d1af02d7a83f674c9c695d774815d0c9f43f4c2c6d89975360d7919f0022c0b6baeb36d20de04172320a4d9c35bf630a36e437612d1d672
+  metadata.gz: 549f0fe3eacc95c91a4e67cef950187067776c2de6402d24a9e100c96d7e823ea2cc620d1d76bb9763667deeb6937cb3459ce5aed7f09661e1682dc1769f56a3
+  data.tar.gz: 287ae23888bb5a3cbb5c7fec3ee86133d56c295c7c10f9b5046578d8973955ee0bbed69b6eb934a8b41b9834cbe2abbabd169c13e575e927172ee055c237b720

data/lib/cocoapods-linkline/command/stable/stable.rb

@@ -23,7 +23,8 @@ module Pod
           ll_cloneStable
 
           #4、fetch newest code
-          git_fetch
+          git_reset
+          git_pull
 
           require File.join(Pathname.pwd,"#{ll_stable_lock}.rb")
           require File.join(env, "#{$ll_stable_lock_origin}.rb")
@@ -49,23 +50,25 @@ module Pod
         def ll_show_lock_diff(stable_lock_arr, stable_lock_origin_arr)
           added, updated, rollbacked = ll_compare_specs(stable_lock_arr, stable_lock_origin_arr)
 
+          #31m: 红色 32m:绿色 33m:黄色 34m:蓝色
+          #puts "\e[34m#{string}\e[0m"
           if added.any?
-            puts "新增了以下项目:"
+            puts "\n新增了以下项目:".send(:green)
             puts added.join("\n")
           end
 
           if updated.any?
-            puts "\n更新了以下项目:"
-            puts updated.join("\n") 
+            puts "\n更新了以下项目:".send(:blue)
+            puts updated.join("\n")
           end
 
           if rollbacked.any?
-            puts "\n回滚了以下项目:"
-            puts rollbacked.join("\n") 
+            puts "\n回滚了以下项目:".send(:red)
+            puts rollbacked.join("\n")
           end
 
           unless added.any? || updated.any? || added.any?
-            puts "\n已经是最新版本"
+            puts "\n已经是最新版本".send(:green)
           end
         end
 
@@ -95,10 +98,10 @@ module Pod
             matching_project_1 = specs_1.find { |project_1| project_1[0] == project_name_2 }
         
             if matching_project_1.nil?
-              added_projects << "【#{project_name_2}】 (#{version_2.to_s.send(:red)})"
+              added_projects << "【#{project_name_2}】 (#{version_2.to_s.send(:green)})"
             elsif matching_project_1[1] != version_2
               if versionGreat(version_2,matching_project_1[1])
-                updated_projects << "【#{project_name_2}】 (#{matching_project_1[1]}) -> (#{version_2.to_s.send(:red)})"
+                updated_projects << "【#{project_name_2}】 (#{matching_project_1[1]}) -> (#{version_2.to_s.send(:blue)})"
               else
                 rollbacked_projects << "【#{project_name_2}】 (#{version_2.to_s.send(:red)}) <- (#{matching_project_1[1]})"
               end
@@ -170,11 +173,17 @@ module Pod
 
         ##### git command 
         def git(*args)
-         Dir.chdir(File.join(env)) { return git! args }
+         Dir.chdir(File.join(env)) { 
+          return git! args 
+        }
         end
 
-        def git_fetch 
-           git('fetch') #fommate git command
+        def git_reset 
+          git('reset','--hard') #fommate git command
+        end
+
+        def git_pull 
+           git('pull','origin','main','-f') #fommate git command
         end
 
         def git_clone(source, path)

data/lib/cocoapods-linkline/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsLinkline
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-linkline
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - youhui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Build the component and all child inherit dependencies with dynamic framework  pod