lhj-tools 0.1.7 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bc16cb199d5effe6c4e343846614075ce57b187a5ffc94029018b6aba9984806
4
- data.tar.gz: 95f135ea8bc7b9149ca8c0038ddd8b385e0d56b6ff5f19f8da871c844ff5bae1
3
+ metadata.gz: 2ccdf622ec71e3f0f9b8c090e0587ecde300a61d05cccde837d3730b9b0fdebe
4
+ data.tar.gz: 92d0a661cf877bce61751e137f764155244cc3c8f629c910556c342b0766ae6d
5
5
  SHA512:
6
- metadata.gz: '0738172f4def843dfd49872dabb456db63dec9a1f92b335dfa5fd027cbba51077890f0e693349d08b9cb91b020506fae1fd3676aa32b00d14d0d074d80331a4a'
7
- data.tar.gz: 5b835d1c230e54377d9fa2c8ad9a847b00c37fa57a5737d60fbdf6834a1925f84033f58f429671cef50e57319e39ed18c8662bdfdd9141d403e5e72371394d8e
6
+ metadata.gz: 6fd7f9f518499f766beb7afd778e1542d61c40522958ff02ffdf5f3d167ed1260ea5e915de33848e0b2fbfc042313bfd96920f5436c72648e5222eddeda76d6b
7
+ data.tar.gz: b9df71c7bb5d7cdb63e18319fe23278d08d13d9a39d94133be4cf99cb8e3cc4f7f04f4f4cce73f528dbe88f757dcd5c0e87fb04a302cd2dd56939a78d89fcd75
@@ -29,20 +29,20 @@ module Lhj
29
29
 
30
30
  ma = nil
31
31
  Dir.chdir(dest) do
32
- Dir.glob("*.podspec").each do |p|
32
+ Dir.glob('*.podspec').each do |p|
33
33
  update_podspec_version(p)
34
34
  version_line = IO.readlines(p).find{ |line| (/\.version/ =~ line) && (version_regex =~ line) }
35
35
  ma = version_line.match(version_regex)
36
36
  end
37
37
  puts '2.更新版本号成功'.green
38
38
 
39
- Actions.sh("git add .")
39
+ Actions.sh('git add .')
40
40
  puts '3.git add成功'.green
41
41
 
42
42
  Actions.sh("git commit -m '同步主工程代码by fastlane'")
43
43
  puts '4.git 提交成功'.green
44
44
 
45
- Actions.sh("git push")
45
+ Actions.sh('git push')
46
46
  puts '5.git 推送成功'.green
47
47
 
48
48
  add_tag(ma[0]) if ma
@@ -56,15 +56,27 @@ module Lhj
56
56
 
57
57
  end
58
58
 
59
- if ma
60
- pod_version = ma[0]
61
- update_all_pod_dependency(pod_name, pod_version)
62
- puts '9.更新主工程引用pod版本号成功'.green
59
+ # find src root dir
60
+ src_root_dir = find_src_root_dir(src)
61
+ Dir.chdir(src_root_dir) do
62
+ if ma
63
+ pod_version = ma[0]
64
+ update_all_pod_dependency(pod_name, pod_version)
65
+ puts '9.更新主工程引用pod版本号成功'.green
66
+ end
63
67
  end
64
68
 
65
69
  puts '10.手动执行`pod update --verbose --no-repo-update`更新pod'.green
66
70
  end
67
71
 
72
+ def find_src_root_dir(src)
73
+ ps = []
74
+ src.scan(%r{(/[^/]*)}).flatten.each do |path|
75
+ path =~ /Code/ ? break : ps << path
76
+ end
77
+ File.join(ps)
78
+ end
79
+
68
80
  def version_regex
69
81
  /\d+\.\d+\.(\d+)/
70
82
  end
@@ -94,7 +106,7 @@ module Lhj
94
106
 
95
107
  def push_tag
96
108
  cmd = ['git push --tags']
97
- UI.message("git push --tags 🎯.")
109
+ UI.message('git push --tags 🎯.')
98
110
  Actions.sh(cmd.join(' '))
99
111
  end
100
112
 
@@ -103,27 +115,28 @@ module Lhj
103
115
  cmd = ['pod repo push']
104
116
  pod_repo_name = 'miguatech-aomi_ios-mlspecs'
105
117
  cmd << pod_repo_name
106
- cmd << "*.podspec"
118
+ cmd << '*.podspec'
107
119
  cmd << "--sources=#{pod_repo_name},aliyun,trunk"
108
- cmd << "--allow-warnings"
109
- cmd << "--use-libraries"
110
- cmd << "--verbose"
120
+ cmd << '--allow-warnings'
121
+ cmd << '--use-libraries'
122
+ cmd << '--verbose'
111
123
  Actions.sh(cmd.join(' '), log: true, error_callback: nil)
112
124
  end
113
125
 
114
126
  def update_all_pod_dependency(pod_name, pod_version)
115
- Dir.glob(["./**/*.podspec", "./**/Podfile"]).each do |p|
116
- unless /Example/ =~ p
117
- puts "更新文件:#{p}".magenta
118
- update_main_proj_podspec_version(p, pod_name, pod_version)
119
- end
127
+ Dir.glob(%w[./**/*.podspec ./**/Podfile]).each do |p|
128
+ next if /Example/ =~ p || /temp/ =~ p
129
+
130
+ update_main_version(p, pod_name, pod_version)
120
131
  end
121
132
  end
122
133
 
123
- def update_main_proj_podspec_version(path, pod_name, pod_version)
134
+ def update_main_version(file, pod_name, pod_version)
124
135
  cont = ''
125
- File.readlines(path).each do |l|
136
+ File.readlines(file).each do |l|
126
137
  if (/#{pod_name}/ =~ l) && (/\d+\.\d+\.\d+/ =~ l)
138
+ path = File.absolute_path(file)
139
+ puts "更新文件:#{path}".magenta
127
140
  l.scan(/\d+\.\d+\.\d+/).each do |key|
128
141
  cont += l.gsub(key, pod_version)
129
142
  end
@@ -131,7 +144,7 @@ module Lhj
131
144
  cont += l.dup
132
145
  end
133
146
  end
134
- File.write(path, cont)
147
+ File.write(file, cont)
135
148
  end
136
149
  end
137
150
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Lhj
4
4
  module Tools
5
- VERSION = "0.1.7"
5
+ VERSION = "0.1.8"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lhj-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.7
4
+ version: 0.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - lihaijian