vfastdev 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec54b3d19de0c5df31ea509bf1c01d54a08e691
-  data.tar.gz: b9950f0d64e91f9ea16a84b0381ae8727e31f649
+  metadata.gz: 2f7ecdf7b933adeddd9e52b8dc64888beb9b6b77
+  data.tar.gz: d9927eebb60b0b50421de554b8ecf3e3d76ee9f9
 SHA512:
-  metadata.gz: c82df81552723c9594639ab64591d04b78fc847545425f04a2e15fedefb8a2a2f27c020914cc8b590ec2eb718eecc05de65ccf319a3ff8ebe7841a65409b46ab
-  data.tar.gz: 615fca763462f7f07682457aaa28ddfe6521cf90f29154e6a914a8e19e005bb59089152db40336e74254a7b30dbe23fd60dece540338901d12da3cbd8cf69467
+  metadata.gz: 6026a90d195ee48898c97137ec27f7dc5604444a9d9845a6ac2ba76fea409e9e81db198f3626ac2d54171c4e5432a0c8024aaa9ae7b855c2fa0a0720ed47bea7
+  data.tar.gz: da072d107c2e4a38c1c00433c0ca3bc1aa0fc86bcfe810fad5c21b42964749f6cc03bd5530a32a91baf3ca15360099c786e07a239cc180cf9329048de21e055f

data/bin/vfastdev

@@ -30,7 +30,7 @@ usage = <<EOF
     
 \033[1mEXAMPLE\033[0m
     vfastdev -k "VSBizUserCenter VSBizCollection"
-        保留VSBizUserCenter和VSBizCollection作为工程引入，其它业务模块通过静态库引入。Spec，VSBaseModule,VSPublic,Pods工程会默认保留。
+        保留VSBizUserCenter和VSBizCollection作为工程引入，其它业务模块通过静态库引入。Spec，Pods工程会默认保留。
 
 \033[1mISSUES\033[0m
     1.如果你的代码版本和develop相差太多，可能导致出现“找不到头文件”，“没有这个方法”，“找不到符号”等问题
@@ -43,14 +43,13 @@ usage = <<EOF
     7.出现___llvm_profile_runtime未找到符号的错误，可在Spec target的OTHER_LDFLAGS增加-fprofile-instr-generate来解决。
     8.由于大部分模块都变成静态库，那么会导致查找不到其他模块的源码。
     9.目前服务器架设在我的iMac上面，如果公司路由器重启会导致ip改变，会导致静态库下载失败。
-    10.更多细节参考文档
+    10.VSBaseModule和VSPublic作为静态库引入的方法是拷贝静态库到TARGET_BUILD_DIR目录下面，所以celan工程之后需要再次运行命令
+    11.更多细节参考文档
 EOF
 
-
-
 class VFastDev
   def initialize(options)
-    @version = '0.1.8'
+    @version = '0.1.10'
     @vs_project_names = parse_vs_project_names
     @vs_framework_dir = 'VSFrameworks'
     @fastdev_dir = 'FastDev'
@@ -78,8 +77,8 @@ class VFastDev
         exit 0
       end
     end
-    @project_kept_names << "VSBaseModule"
-    @project_kept_names << "VSPublic"
+    # @project_kept_names << "VSBaseModule"
+    # @project_kept_names << "VSPublic"
     if @sync_main_project
       puts "还没实现"
     else
@@ -90,6 +89,7 @@ class VFastDev
         download_libs
         unzip_libs
       end
+      copy_framework_to_products
       del_sepc_app
       say_after_done
     end
@@ -132,10 +132,14 @@ class VFastDev
   end
 
   def ajust_project
+    @project_kept_names << "VSPublic"
+    @project_kept_names << "VSBaseModule"
     exclude_framework_names = [] #排除在外的静态库
     @project_kept_names.each do |name|
-      exclude_framework_names << name + ".framework"
+        exclude_framework_names << name + ".framework"
     end
+    exclude_framework_names << "VSPublic" + ".framework"
+    exclude_framework_names << "VSBaseModule" + ".framework"
 
     vs_framework_paths = [] #所有静态库路径
     @vs_project_names.each do |name|
@@ -195,7 +199,6 @@ class VFastDev
         file_ref.set_path(@vs_framework_dir + "/" + file_ref.path)
       end
     end
-
     puts '修改Copy Modular * 脚本'
     project.targets.each do |target|
       target.shell_script_build_phases.each do |phase|
@@ -239,9 +242,9 @@ XML
   # 输出静态库版本信息
   def print_version_info
     begin
-      url = 'http://192.168.33.79:8000/lib/latest_framework_info?app_id=Spec'
+      url = 'http://10.199.214.86:8000/lib/latest_framework_info?app_id=Spec'
       unless @commit_hash.nil?
-        url = "http://192.168.33.79:8000/lib/framework_info?app_id=Spec&git_commit_hash=#{@commit_hash}"
+        url = "http://10.199.214.86:8000/lib/latest_framework_info?app_id=Spec&git_commit_hash=#{@commit_hash}"
       end
       open(url) do |f|
         puts "静态库版本信息: " + f.read
@@ -254,7 +257,7 @@ XML
   # 输出静态库列表
   def print_lib_list
     begin
-      open('http://192.168.33.79:8000/lib/framework_info_list?app_id=Spec') do |f|
+      open('http://10.199.214.86:8000/lib/framework_info_list?app_id=Spec') do |f|
         puts '静态库版本列表'
         puts  f.read
       end
@@ -284,7 +287,7 @@ XML
       puts '下载：' + name
       File.open("#{@vs_framework_dir}/#{name}.framework.zip", 'wb') do |f|
         framework_name = "#{name}.framework"
-        url = "http://192.168.33.79:8000/lib/dowload_framework_file?app_id=Spec&name=#{framework_name}"
+        url = "http://10.199.214.86:8000/lib/dowload_framework_file?app_id=Spec&name=#{framework_name}"
         unless @commit_hash.nil?
           url = url + "&git_commit_hash=#{@commit_hash}"
         end
@@ -323,7 +326,12 @@ done
   end
 
   def say_after_done
-    puts 'FastDev完成。关闭旧的Spec.xcworkspace，打开FastDev/Spec.xcworkspace文件开始开发。'
+    say = <<EOF
+FastDev完成。关闭旧的Spec.xcworkspace，打开FastDev/Spec.xcworkspace文件开始开发。
+EOF
+# \033[33mVSBaseModule和VSPublic作为静态库引入的方法是拷贝静态库到TARGET_BUILD_DIR目录下面，所以celan工程之后需要再次运行命令！！！\033[0m
+    puts say
+    
   end
   def del_sepc_app
     system `
@@ -337,8 +345,66 @@ fi
 
 `
   end
+  def copy_framework_to_products
+    if not @project_kept_names.include?("VSPublic")
+     
+      `
+      sdk_version=$(xcodebuild -showsdks | grep -oE 'iphonesimulator[0-9\.]+' | grep -oE '[0-9\.]+')
+      # 输出目录下面的文件
+      TARGET_BUILD_DIR=$(xcodebuild -workspace Spec.xcworkspace -scheme Spec -showBuildSettings -sdk iphonesimulator${sdk_version} | grep 'TARGET_BUILD_DIR' | cut -d '=' -f2)
+      FRAMEWORK_PATH="${TARGET_BUILD_DIR}/VSPublic.framework"
+
+      if [ -d $FRAMEWORK_PATH ];then
+          rm -r $FRAMEWORK_PATH
+      else
+        mkdir -p $FRAMEWORK_PATH
+      fi
+      echo $FRAMEWORK_PATH
+      cp -R VSFrameworks/VSPublic.framework/ $FRAMEWORK_PATH
+      `
+    else
+      `
+      sdk_version=$(xcodebuild -showsdks | grep -oE 'iphonesimulator[0-9\.]+' | grep -oE '[0-9\.]+')
+      # 输出目录下面的文件
+      TARGET_BUILD_DIR=$(xcodebuild -workspace Spec.xcworkspace -scheme Spec -showBuildSettings -sdk iphonesimulator${sdk_version} | grep 'TARGET_BUILD_DIR' | cut -d '=' -f2)
+      FRAMEWORK_PATH="${TARGET_BUILD_DIR}/VSPublic.framework"
+
+      if [ -d $FRAMEWORK_PATH ];then
+          rm -r $FRAMEWORK_PATH
+      fi
+      `
+    end
+    if not @project_kept_names.include?("VSBaseModule")
+      `
+      sdk_version=$(xcodebuild -showsdks | grep -oE 'iphonesimulator[0-9\.]+' | grep -oE '[0-9\.]+')
+      # 输出目录下面的文件
+      TARGET_BUILD_DIR=$(xcodebuild -workspace Spec.xcworkspace -scheme Spec -showBuildSettings -sdk iphonesimulator${sdk_version} | grep 'TARGET_BUILD_DIR' | cut -d '=' -f2)
+      FRAMEWORK_PATH="${TARGET_BUILD_DIR}/VSBaseModule.framework"
+
+      if [ -d $FRAMEWORK_PATH ];then
+          rm -r $FRAMEWORK_PATH
+      else
+        mkdir -p $FRAMEWORK_PATH
+      fi
+      cp -R VSFrameworks/VSBaseModule.framework/ $FRAMEWORK_PATH
+      `
+    else
+      `
+      sdk_version=$(xcodebuild -showsdks | grep -oE 'iphonesimulator[0-9\.]+' | grep -oE '[0-9\.]+')
+      # 输出目录下面的文件
+      TARGET_BUILD_DIR=$(xcodebuild -workspace Spec.xcworkspace -scheme Spec -showBuildSettings -sdk iphonesimulator${sdk_version} | grep 'TARGET_BUILD_DIR' | cut -d '=' -f2)
+      FRAMEWORK_PATH="${TARGET_BUILD_DIR}/VSBaseModule.framework"
+
+      if [ -d $FRAMEWORK_PATH ];then
+          rm -r $FRAMEWORK_PATH
+      fi
+      `
+    end
+  end
 end
 
+
+
 dev_opts = {
     keep:[],
     no_download_lib:false ,

metadata

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