fir-cli 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950b4ea3196bb693db53fc7ca7fdc00c74aa2b71
-  data.tar.gz: 4004385a955dfc2679db2383a5e9f8060619de89
+  metadata.gz: 81eb6326b7b1e1ff334ee9d2c0277dcf9e40430f
+  data.tar.gz: ff5a608d1a33177c964b5a16ef54606f6c08ddb2
 SHA512:
-  metadata.gz: 6fa36221d880aa52c85f20f68abffa8041207ce02c9db4ba589c575454bb5a17c1bfc9de139ec42faef61e5b4a99ebb603831107557bd296f68ca5d1b0fb1ac1
-  data.tar.gz: 3a8811213616a2c9d7868ef8de12c8345d7ed367e3606f3792e99566f357cdca9ff30f14053b4c5fb6755766f3ae7bef72603c1adb7e6cf084e348dc723f9dc5
+  metadata.gz: edefb7042202cbc3f1f633c7640b2e731b6e1b12adff12cd318d89f79f52eab14b7bbcc99930c0919819b05a40a0a5b41543248879d3227ba666531dd6907899
+  data.tar.gz: befd4d052fc98329a999a3305558134bd74eb389051ff5aa60ab2b849814aed9e5ec92e7492d761d2f7b198eacc46c9f0b9f61a65d691c896be31f003b7d3ceb

data/CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### fir-cli 1.3.2
+- 支持打包提供 app watch 的应用
+
 ### fir-cli 1.3.1
 - 暂时修复多个 target 的 build 打包 app 的 bug
 

data/fir-cli.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.3.1
-  - 暂时修复多个 target 的 build 打包 app 的 bug
+  ### fir-cli 1.3.2
+  - 已经支持打包提供 app watch 的应用
   - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG
   - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request

data/lib/fir/util/build_common.rb

@@ -45,7 +45,12 @@ module FIR
       logger.info 'Building......'
       logger_info_dividing_line
 
-      logger.info `#{@build_cmd}`
+      status = system(@build_cmd)
+
+      unless status
+        logger.error 'Build failed'
+        exit 1
+      end
     end
 
     # split ['a=1', 'b=2'] => { 'a' => '1', 'b' => '2' }

data/lib/fir/util/build_ipa.rb

@@ -45,24 +45,45 @@ module FIR
     end
 
     def output_ipa_and_dsym
-      Dir.chdir(@build_tmp_dir) do
-        apps = Dir['*.app'].sort_by(&:size)
-        check_no_output_app(apps)
+      apps = Dir["#{@build_tmp_dir}/*.app"].sort_by(&:size)
+      check_no_output_app(apps)
 
-        temp_ipa  = zip_app2ipa(File.join(@build_tmp_dir, apps.first))
-        ipa_info  = FIR.ipa_info(temp_ipa)
-        ipa_name  = "#{ipa_info[:name]}-#{ipa_info[:version]}-build-#{ipa_info[:build]}"
-        dsym_name = "#{@output_path}/#{ipa_info[:name]}.app.dSYM"
+      @temp_ipa = "#{@build_tmp_dir}/#{Time.now.to_i}.ipa"
+      archive_ipa(apps)
 
-        @builded_app_path = "#{@output_path}/#{ipa_name}.ipa"
+      check_archived_ipa_is_exist
+      rename_ipa_and_dsym
 
-        FileUtils.mv(temp_ipa, @builded_app_path, force: true)
-        if File.exist?(dsym_name)
-          FileUtils.mv(dsym_name, "#{@output_path}/#{ipa_name}.app.dSYM", force: true)
-        end
+      logger.info 'Build Success'
+    end
+
+    def archive_ipa(apps)
+      logger.info 'Archiving......'
+      logger_info_dividing_line
+
+      @xcrun_cmd = "xcrun -sdk iphoneos PackageApplication -v #{apps.join(' ')} -o #{@temp_ipa}"
+      puts @xcrun_cmd if $DEBUG
+      logger.info `#{@xcrun_cmd}`
+    end
+
+    def check_archived_ipa_is_exist
+      unless File.exist?(@temp_ipa)
+        logger.error 'Archive failed'
+        exit 1
       end
+    end
 
-      logger.info 'Build Success'
+    def rename_ipa_and_dsym
+      ipa_info  = FIR.ipa_info(@temp_ipa)
+      ipa_name  = "#{ipa_info[:name]}-#{ipa_info[:version]}-build-#{ipa_info[:build]}"
+      dsym_name = "#{@output_path}/#{ipa_info[:name]}.app.dSYM"
+
+      @builded_app_path = "#{@output_path}/#{ipa_name}.ipa"
+
+      FileUtils.mv(@temp_ipa, @builded_app_path, force: true)
+      if File.exist?(dsym_name)
+        FileUtils.mv(dsym_name, "#{@output_path}/#{ipa_name}.app.dSYM", force: true)
+      end
     end
 
     def upload_build_dsym_mapping_file
@@ -124,20 +145,5 @@ module FIR
         exit 1
       end
     end
-
-    def zip_app2ipa(app_path)
-      ipa_path = Tempfile.new(['temp', '.ipa']).path
-
-      Dir.mktmpdir do |tmpdir|
-        Dir.chdir(tmpdir) do
-          Dir.mkdir('Payload')
-          FileUtils.cp_r(app_path, 'Payload')
-          system("rm -rf #{ipa_path}") if File.file?(ipa_path)
-          system("zip -qr #{ipa_path} Payload")
-        end
-      end
-
-      ipa_path
-    end
   end
 end

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - NaixSpirit
@@ -196,9 +196,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.3.1\n  - 暂时修复多个 target 的 build 打包 app 的 bug\n  - 详细更新记录,
-  请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n  - [fir-cli](https://github.com/FIRHQ/fir-cli)
-  已经开源\n  - 欢迎 fork, issue 和 pull request\n  "
+  \ ## 更新记录\n  ### fir-cli 1.3.2\n  - 已经支持打包提供 app watch 的应用\n  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n
+  \ - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
+  request\n  "
 rdoc_options: []
 require_paths:
 - lib