lhj-tools 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc16cb199d5effe6c4e343846614075ce57b187a5ffc94029018b6aba9984806
-  data.tar.gz: 95f135ea8bc7b9149ca8c0038ddd8b385e0d56b6ff5f19f8da871c844ff5bae1
+  metadata.gz: 2ccdf622ec71e3f0f9b8c090e0587ecde300a61d05cccde837d3730b9b0fdebe
+  data.tar.gz: 92d0a661cf877bce61751e137f764155244cc3c8f629c910556c342b0766ae6d
 SHA512:
-  metadata.gz: '0738172f4def843dfd49872dabb456db63dec9a1f92b335dfa5fd027cbba51077890f0e693349d08b9cb91b020506fae1fd3676aa32b00d14d0d074d80331a4a'
-  data.tar.gz: 5b835d1c230e54377d9fa2c8ad9a847b00c37fa57a5737d60fbdf6834a1925f84033f58f429671cef50e57319e39ed18c8662bdfdd9141d403e5e72371394d8e
+  metadata.gz: 6fd7f9f518499f766beb7afd778e1542d61c40522958ff02ffdf5f3d167ed1260ea5e915de33848e0b2fbfc042313bfd96920f5436c72648e5222eddeda76d6b
+  data.tar.gz: b9df71c7bb5d7cdb63e18319fe23278d08d13d9a39d94133be4cf99cb8e3cc4f7f04f4f4cce73f528dbe88f757dcd5c0e87fb04a302cd2dd56939a78d89fcd75

data/lib/lhj/command/sync_pod_repo.rb

@@ -29,20 +29,20 @@ module Lhj
 
         ma = nil
         Dir.chdir(dest) do
-          Dir.glob("*.podspec").each do |p|
+          Dir.glob('*.podspec').each do |p|
             update_podspec_version(p)
             version_line = IO.readlines(p).find{ |line| (/\.version/ =~ line) && (version_regex =~ line) }
             ma = version_line.match(version_regex)
           end
           puts '2.更新版本号成功'.green
 
-          Actions.sh("git add .")
+          Actions.sh('git add .')
           puts '3.git add成功'.green
 
           Actions.sh("git commit -m '同步主工程代码by fastlane'")
           puts '4.git 提交成功'.green
 
-          Actions.sh("git push")
+          Actions.sh('git push')
           puts '5.git 推送成功'.green
 
           add_tag(ma[0]) if ma
@@ -56,15 +56,27 @@ module Lhj
 
         end
 
-        if ma
-          pod_version = ma[0]
-          update_all_pod_dependency(pod_name, pod_version)
-          puts '9.更新主工程引用pod版本号成功'.green
+        # find src root dir
+        src_root_dir = find_src_root_dir(src)
+        Dir.chdir(src_root_dir) do
+          if ma
+            pod_version = ma[0]
+            update_all_pod_dependency(pod_name, pod_version)
+            puts '9.更新主工程引用pod版本号成功'.green
+          end
         end
 
         puts '10.手动执行`pod update --verbose --no-repo-update`更新pod'.green
       end
 
+      def find_src_root_dir(src)
+        ps = []
+        src.scan(%r{(/[^/]*)}).flatten.each do |path|
+          path =~ /Code/ ? break : ps << path
+        end
+        File.join(ps)
+      end
+
       def version_regex
         /\d+\.\d+\.(\d+)/
       end
@@ -94,7 +106,7 @@ module Lhj
 
       def push_tag
         cmd = ['git push --tags']
-        UI.message("git push --tags 🎯.")
+        UI.message('git push --tags 🎯.')
         Actions.sh(cmd.join(' '))
       end
 
@@ -103,27 +115,28 @@ module Lhj
         cmd = ['pod repo push']
         pod_repo_name = 'miguatech-aomi_ios-mlspecs'
         cmd << pod_repo_name
-        cmd << "*.podspec"
+        cmd << '*.podspec'
         cmd << "--sources=#{pod_repo_name},aliyun,trunk"
-        cmd << "--allow-warnings"
-        cmd << "--use-libraries"
-        cmd << "--verbose"
+        cmd << '--allow-warnings'
+        cmd << '--use-libraries'
+        cmd << '--verbose'
         Actions.sh(cmd.join(' '), log: true, error_callback: nil)
       end
 
       def update_all_pod_dependency(pod_name, pod_version)
-        Dir.glob(["./**/*.podspec", "./**/Podfile"]).each do |p|
-          unless /Example/ =~ p
-            puts "更新文件:#{p}".magenta
-            update_main_proj_podspec_version(p, pod_name, pod_version)
-          end
+        Dir.glob(%w[./**/*.podspec ./**/Podfile]).each do |p|
+          next if /Example/ =~ p || /temp/ =~ p
+
+          update_main_version(p, pod_name, pod_version)
         end
       end
 
-      def update_main_proj_podspec_version(path, pod_name, pod_version)
+      def update_main_version(file, pod_name, pod_version)
         cont = ''
-        File.readlines(path).each do |l|
+        File.readlines(file).each do |l|
           if (/#{pod_name}/ =~ l) && (/\d+\.\d+\.\d+/ =~ l)
+            path = File.absolute_path(file)
+            puts "更新文件:#{path}".magenta
             l.scan(/\d+\.\d+\.\d+/).each do |key|
               cont += l.gsub(key, pod_version)
             end
@@ -131,7 +144,7 @@ module Lhj
             cont += l.dup
           end
         end
-        File.write(path, cont)
+        File.write(file, cont)
       end
     end
   end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - lihaijian