vfastdev 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36eb2a935955165465ca8c9b119d6ef203f485ee
-  data.tar.gz: e39a391145074d34acb6b3c600875292ccf4bc2d
+  metadata.gz: 8b58ff615dbb0c674c8f30b2a02d9a2f5819a03c
+  data.tar.gz: 315a1bdfce49501a3d46275ca83f68eb5ee2656f
 SHA512:
-  metadata.gz: 2a07df0f18610bdd7727a5320a6b32c1d904ceee2a4705f09ced731127f1d2da012e7b05ec78d4ca9d495b5e2d85ebb9c882487bf6afb748e99abaebe0b522c4
-  data.tar.gz: e763cec7188ed3f1e567e7216ba65e3722295a2f7a37d9596a0322452bfab2b1694bb517c3b0d4368930fcca87478681db301c0fdd89a5591e40fc69b7dd0e2c
+  metadata.gz: b2df20276e78dd7d1fd05daaf69ae81c22561ec4dbdbd519a33920eedc3a4b3729d6a474f0b28db100bacfee217da36878419ffeda2e02d0e73dbacd93b5b142
+  data.tar.gz: 7846fb834ca4f1608d06bcf38ae416bbcbe33b18fb6728e35809f29a22a1c392d62c77007f9ccc8139ec3e3f265f212d6e17b1a1904b4863179c5d397459eb47

data/bin/vfastdev

@@ -87,19 +87,19 @@ FileUtils.cp_r('../Spec.xcworkspace', 'Spec.xcworkspace')
 puts '创建目录FastDev/VSFrameworks'
 Dir.mkdir(vs_framework_dir)
 
-vs_framework_name = []
+vs_framework_names = []
 tmp_workspace = Xcodeproj::Workspace.new_from_xcworkspace("Spec.xcworkspace")
 tmp_workspace.file_references.each do |file_ref|
   match = /VS[a-zA-Z0-9]*?(?=.xcodeproj)/.match(file_ref.path)
   if match != nil
     name = match[0]
-    vs_framework_name << name
+    vs_framework_names << name
   end
 end
 
 
 
-puts "工作空间包含的VS模块：#{vs_framework_name}"
+puts "工作空间包含的VS模块：#{vs_framework_names}"
 
 begin
   open('http://192.168.33.79:8000/lib/latest_framework_info?app_id=Spec') do |f|
@@ -112,7 +112,7 @@ end
 puts '下载模块静态库'
 Dir.chdir(vs_framework_dir)
 
-vs_framework_name.each do |name|
+vs_framework_names.each do |name|
   puts '下载：'+ name
   File.open("#{name}.framework.zip", 'wb') do |f|
     framework_name = "#{name}.framework"
@@ -144,6 +144,10 @@ biz_names.each do |name|
   k_framework_names << name + ".framework"
 end
 
+vs_framework_paths = []
+vs_framework_names.each do |name|
+  vs_framework_paths << name + ".framework"
+end
 project_path = 'Spec.xcodeproj'
 project = Xcodeproj::Project.open(project_path)
 
@@ -189,10 +193,10 @@ end
 
 puts'修改静态库库的引用'
 project.files.each do |file_ref|
-  if file_ref.last_known_file_type == "wrapper.framework" && file_ref.name =~ /^VS/ && !k_framework_names.include?(file_ref.name)
+  if file_ref.last_known_file_type == "wrapper.framework" && vs_framework_paths.include?(file_ref.name) && !k_framework_names.include?(file_ref.name)
     file_ref.set_source_tree("SOURCE_ROOT")
     file_ref.set_path(vs_framework_dir + "/" + file_ref.name)
-  elsif file_ref.explicit_file_type == "wrapper.framework" && file_ref.path =~ /^VS/ && !k_framework_names.include?(file_ref.path)
+  elsif file_ref.explicit_file_type == "wrapper.framework" && vs_framework_paths.include?(file_ref.name) && !k_framework_names.include?(file_ref.path)
     file_ref.set_source_tree("SOURCE_ROOT")
     file_ref.name = file_ref.path
     file_ref.set_path(vs_framework_dir + "/" + file_ref.path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vfastdev
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sen.Mao