Merge branch 'release/1.4.9'

CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### fir-cli 1.4.9
+- 修正 --password 与 --open 冲突的问题
+
 ### fir-cli 1.4.8
 - 修正 build 后直接 -p 发布的权限错误
 

fir-cli.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.4.8
+  ### fir-cli 1.4.9
   - 修正 build 后直接 -p 发布的权限错误
   - 增加上传时候设置密码及公开访问权限
   - 增加 build_ipa 中的 destination 参数

lib/fir/util/publish.rb

@@ -159,7 +159,7 @@ module FIR
       @changelog     = read_changelog(options[:changelog]).to_s.to_utf8
       @short         = options[:short].to_s
       @passwd        = options[:password].to_s
-      @is_opened     = !!options[:open]
+      @is_opened     = @passwd.blank? ? !!options[:open] : false
       @export_qrcode = !!options[:qrcode]
     end
 

lib/fir/version.rb

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

test/publish_test.rb

@@ -16,9 +16,22 @@ class PublishTest < Minitest::Test
 
   def test_update_app_info
     short     = SecureRandom.hex[3..9]
-    passwd    = SecureRandom.hex[0..9]
     is_opened = (rand(100) % 2) == 0
 
+    update_info = { short: short, open: is_opened }
+    FIR.publish(default_ipa, @options.merge(update_info))
+
+    info = FIR.fetch_app_info
+
+    assert_equal short, info[:short]
+    assert_equal is_opened, info[:is_opened]
+  end
+
+  def test_update_app_passwd
+    short     = SecureRandom.hex[3..9]
+    is_opened = (rand(100) % 2) == 0
+    passwd    = SecureRandom.hex[0..9]
+
     update_info = { short: short, password: passwd, open: is_opened }
     FIR.publish(default_ipa, @options.merge(update_info))
 
@@ -26,6 +39,6 @@ class PublishTest < Minitest::Test
 
     assert_equal short, info[:short]
     assert_equal passwd, info[:passwd]
-    assert_equal is_opened, info[:is_opened]
+    assert_equal false, info[:is_opened]
   end
 end