appship 0.1.0 → 0.2.0

data/lib/appship/project_config.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Appship
+  class ProjectConfig < Cache
+    def self.path(project_dir = Dir.pwd)
+      File.join(File.expand_path(project_dir), "appship", "config.yml")
+    end
+
+    def self.load(global_path = DEFAULT_PATH, project_dir: Dir.pwd, interactive: true, provider: "pgyer")
+      local_path = path(project_dir)
+      unless File.exist?(local_path) || File.symlink?(local_path)
+        return Cache.load(global_path, project_dir: project_dir, interactive: interactive, provider: provider)
+      end
+      unless File.file?(local_path) && !File.symlink?(local_path)
+        raise ConfigurationError, "项目配置必须是普通文件: #{local_path}"
+      end
+
+      new(global_path, project_dir: project_dir)
+    end
+
+    def self.init!(project_dir: Dir.pwd)
+      config_path = "#{path(project_dir)}.sample"
+      if File.exist?(config_path) || File.symlink?(config_path)
+        unless File.file?(config_path) && !File.symlink?(config_path)
+          raise ConfigurationError, "项目配置必须是普通文件: #{config_path}"
+        end
+      else
+        name = Cache.infer_project_name!(project_dir)
+        FileUtils.mkdir_p(File.dirname(config_path), mode: 0o700)
+        File.open(config_path, "wx", 0o600) do |file|
+          file.write(<<~YAML)
+            # 按需取消注释并填写；未配置的字段继承全局配置。
+            # 密码或 Webhook 填 "" 表示关闭对应设置。
+
+            #{YAML.dump("project_name" => name).delete_prefix("---\n").chomp}
+
+            # app_name: app-name                # ipa 名字
+
+            # 蒲公英 API Key（登录后查看）：https://www.pgyer.com/account/api
+            # pgyer_api_key: "your-pgyer-api-key"
+            # pgyer_password: "your-pgyer-password"
+
+            # fir.im API Token（登录后查看）：https://www.betaqr.com.cn/apps/apitoken
+            # fir_api_key: "your-fir-api-key"
+            # fir_password: "your-fir-password"
+
+            # 机器人配置
+            # wechat_webhook: ""                # 企微机器人
+            # dingtalk_webhook: ""              # 钉钉机器人
+            # feishu_webhook: ""                # 飞书机器人
+            # feishu_webhook_secret: ""         # 飞书签名密钥，仅开启签名校验时填写
+
+            # App Icon 角标
+            # app_icon_badge: true              # 是否启用角标
+            # app_icon_badge_environment: true  # 显示 DEBUG / RELEASE
+            # app_icon_badge_version: false     # 预留，暂不绘制版本号
+          YAML
+        end
+      end
+      [config_path, Message.init!(project_dir: project_dir)]
+    end
+
+    def initialize(global_path, project_dir: Dir.pwd)
+      @path = self.class.path(project_dir)
+      @global_path = File.expand_path(global_path)
+      @project_dir = File.expand_path(project_dir)
+      @project_data = Config.new(@path).data
+      @entries = []
+    end
+
+    def resolve(project_name: nil, project_dir: @project_dir, provider: "pgyer", interactive: true, credential_overrides: {}, credentials: true)
+      name = project_name.to_s.strip
+      name = @project_data["project_name"].to_s.strip if name.empty?
+      name = Cache.infer_project_name!(project_dir) if name.empty?
+      global_entries = if File.file?(@global_path) && !File.read(@global_path).strip.empty?
+                         Cache.new(@global_path).entries
+                       else
+                         []
+                       end
+      matches = global_entries.select { |entry| entry["project_name"] == name }
+      raise ConfigurationError, "全局配置中 project_name 重复: #{name}" if matches.length > 1
+
+      entry = (matches.first || {}).merge(@project_data).merge("project_name" => name)
+      @entries = [entry]
+      @baseline = entry.dup
+      if credentials && entry["app_name"].to_s.empty?
+        unless interactive && $stdin.tty?
+          raise ConfigurationError, "项目配置缺少 app_name: #{@path}"
+        end
+        update_profile!(entry, "app_name" => Cache.prompt_required("app_name"))
+      end
+      super(project_name: name, project_dir: project_dir, provider: provider, interactive: interactive,
+            credential_overrides: credential_overrides, credentials: credentials)
+    end
+
+    def update_profile!(entry, values)
+      values = values.transform_keys(&:to_s).reject { |_key, value| value.nil? }
+      @project_data.merge!(values)
+      entry.merge!(values)
+      persist!
+      entry
+    end
+
+    private
+
+    def persist!
+      entry = @entries.first
+      @project_data.merge!(entry.reject { |key, value| @baseline.key?(key) && @baseline[key] == value })
+      @project_data["project_name"] ||= entry["project_name"]
+      File.write(@path, YAML.dump(@project_data))
+      File.chmod(0o600, @path)
+      @baseline = entry.dup
+    end
+  end
+end

data/lib/appship/uploader.rb

@@ -84,11 +84,13 @@ module Appship
       request["Content-Length"] = body.length.to_s
       request.body_stream = body
       response = http(uri).request(request)
-      return true if response.code.to_i == 204 || response.is_a?(Net::HTTPSuccess)
+      success = response.is_a?(Net::HTTPSuccess)
+      return true if success
 
       raise UploadError, "蒲公英文件上传失败（HTTP #{response.code}）: #{response.body}"
     ensure
-      progress&.finish
+      progress&.finish(success: !!success)
+      body&.close
     end
 
     def poll_build_info!(build_key)
@@ -340,11 +342,13 @@ module Appship
       request["Content-Length"] = body.length.to_s
       request.body_stream = body
       response = http(uri).request(request)
-      return true if response.is_a?(Net::HTTPSuccess)
+      success = response.is_a?(Net::HTTPSuccess)
+      return true if success
 
       raise UploadError, "fir.im 文件上传失败（HTTP #{response.code}）: #{response.body}"
     ensure
-      progress&.finish
+      progress&.finish(success: !!success)
+      body&.close
     end
 
     def http(uri)
@@ -377,6 +381,7 @@ module Appship
       @interactive = output.tty?
       @last_percent = -1
       @started = false
+      @current = 0
     end
 
     def start
@@ -385,20 +390,27 @@ module Appship
     end
 
     def update(current, total = @total)
+      return unless @started
+
       @total = [total.to_i, 1].max
-      percent = [[(current.to_i * 100.0 / @total).floor, 0].max, 100].min
+      @current = [[current.to_i, 0].max, @total].min
+      percent = [(@current * 100.0 / @total).floor, 99].min
       return if percent == @last_percent
 
-      render(percent, current.to_i)
+      render(percent, @current)
     end
 
-    def finish
+    def finish(success: false)
       return unless @started
 
-      render(100, @total)
-      if @interactive
-        @output.print "\r\e[2K"
+      @started = false
+      if success
+        render(100, @total)
+        @output.print "\r\e[2K" if @interactive
         @output.puts "☁️ 上传完成（#{format_size(@total)}）"
+      else
+        @output.print "\r\e[2K" if @interactive
+        @output.puts "❌ 上传失败（已读取 #{format_size(@current)}/#{format_size(@total)}）"
       end
       @output.flush
     end
@@ -452,6 +464,10 @@ module Appship
       @length
     end
 
+    def close
+      @file.close unless @file.closed?
+    end
+
     def read(length = nil, out_buffer = nil)
       requested = length || 16 * 1024
       result = out_buffer || +""

data/lib/appship/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appship
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/appship/webhook.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+module Appship
+  class Webhook
+    PLATFORMS = { "wechat" => "企业微信", "dingtalk" => "钉钉", "feishu" => "飞书" }.freeze
+    URL_FIELDS = PLATFORMS.keys.map { |platform| :"#{platform}_webhook" }.freeze
+    OPTION_FIELDS = (URL_FIELDS + [:feishu_webhook_secret]).freeze
+
+    def self.parse_url!(url)
+      uri = URI.parse(url)
+      unless uri.is_a?(URI::HTTPS) && !uri.host.to_s.empty? && !uri.userinfo && !uri.fragment
+        raise ConfigurationError, "Webhook 必须是有效的 HTTPS 地址，不能包含用户名、密码或片段标记"
+      end
+      uri
+    rescue URI::InvalidURIError
+      raise ConfigurationError, "Webhook 必须是有效的 HTTPS 地址"
+    end
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    def notify(message, failure: false, formats: {})
+      label = failure ? "失败通知" : "发布通知"
+      context = failure ? "" : "（应用已发布）"
+      PLATFORMS.each do |platform, name|
+        url = @options["#{platform}_webhook".to_sym].to_s.strip
+        next if url.empty?
+
+        content = content_for(message, platform, failure)
+        next if content.to_s.strip.empty?
+
+        begin
+          format = failure ? nil : formats["#{platform}_webhook_format"]
+          post!(self.class.parse_url!(url), platform, content, format)
+          puts "✅ #{name}#{label}已发送"
+        rescue Error => e
+          warn "⚠️ #{name}#{label}失败#{context}: #{e.message}"
+        rescue IOError, SystemCallError, SocketError, Timeout::Error, OpenSSL::SSL::SSLError, Net::ProtocolError => e
+          warn "⚠️ #{name}#{label}失败#{context}: 网络请求失败（#{e.class}）"
+        end
+      end
+    end
+
+    def failure(error)
+      return unless @options.values_at(*URL_FIELDS).any? { |url| !url.to_s.strip.empty? }
+
+      values = {
+        name: @options[:app_name] || @options[:project_name] || "未知",
+        provider: @options[:provider] == "fir" ? "fir.im" : "蒲公英",
+        configuration: @options[:configuration] || "未选择",
+        error_type: error.class.to_s,
+        error_message: error.message
+      }
+      message = [
+        "❌ Appship 发布流程失败",
+        "应用名称: #{values[:name]}",
+        "分发平台: #{values[:provider]}",
+        "构建配置: #{values[:configuration]}",
+        "错误类型: #{values[:error_type]}",
+        "错误原因: #{values[:error_message]}"
+      ].join("\n")
+      templates = Message.failure_templates(project_dir: @options[:project_dir] || Dir.pwd)
+      if templates.empty?
+        notify(safe_failure_content(message), failure: true)
+      else
+        messages = templates.transform_values { |body| Message.render_text(body, values) }
+        messages["default"] = message
+        notify(messages.transform_values { |body| safe_failure_content(body) }, failure: true)
+      end
+    end
+
+    private
+
+    def content_for(message, platform, failure)
+      return message unless message.is_a?(Hash)
+      return message.fetch("#{platform}_webhook_failure_content", message["default"]) if failure
+
+      message.fetch("#{platform}_webhook_success_content") do
+        message.fetch("#{platform}_webhook_content", message["cli_content"])
+      end
+    end
+
+    def safe_failure_content(message)
+      secrets = @options.values_at(:api_key, :password, :fir_api_token, :fir_password, *OPTION_FIELDS)
+      secrets << @options[:feishu_webhook].to_s[%r{/open-apis/bot/v2/hook/([^/?#]+)}, 1]
+      env_names = %w[PGYER_API_KEY PGYER_INSTALL_PASSWORD FIR_API_TOKEN FIR_PASSWORD]
+      env_names += @options.values_at(:api_key_env, :password_env, :fir_api_token_env, :fir_password_env).compact
+      secrets += env_names.map { |name| ENV[name] }
+      secrets.compact.map(&:to_s).reject(&:empty?).sort_by { |value| -value.length }.each do |secret|
+        message = message.gsub(secret, "[已隐藏]")
+      end
+      message = message.gsub(%r{(https?://[^\s"'<>?]+)\?[^\s"'<>]+}, '\\1?[已隐藏]')
+      message.byteslice(0, 1900).scrub("")
+    end
+
+    def post!(uri, platform, message, format)
+      request = Net::HTTP::Post.new(uri)
+      request["Content-Type"] = "application/json; charset=utf-8"
+      request.body = JSON.generate(payload(platform, message, format))
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.open_timeout = 10
+      http.read_timeout = 15
+      http.write_timeout = 15
+      http.max_retries = 0
+      response = http.request(request)
+      raise CommandError, "机器人返回 HTTP #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+
+      data = JSON.parse(response.body)
+      code = if data.is_a?(Hash)
+               platform == "feishu" ? data.fetch("code", data["StatusCode"]) : data["errcode"]
+             end
+      raise CommandError, "机器人未返回成功状态（错误码 #{code || "缺失"}）" unless code.to_s == "0"
+    rescue JSON::ParserError
+      raise CommandError, "机器人返回了无法解析的响应"
+    end
+
+    def payload(platform, message, format)
+      if platform == "feishu"
+        body = if format == "post"
+                 paragraphs = message.lines.filter_map do |line|
+                   next if line.strip.empty?
+
+                   line.chomp.split(%r{(https?://[^\s<>"，。]+)}).reject(&:empty?).map do |part|
+                     if part.start_with?("http://", "https://")
+                       { tag: "a", text: part, href: part }
+                     else
+                       { tag: "text", text: part }
+                     end
+                   end
+                 end
+                 { msg_type: "post", content: { post: { zh_cn: { title: "Appship 发布通知", content: paragraphs } } } }
+               else
+                 { msg_type: "text", content: { text: message } }
+               end
+        secret = @options[:feishu_webhook_secret].to_s
+        unless secret.empty?
+          timestamp = Time.now.to_i.to_s
+          body[:timestamp] = timestamp
+          body[:sign] = [OpenSSL::HMAC.digest("SHA256", "#{timestamp}\n#{secret}", "")].pack("m0")
+        end
+        body
+      elsif platform == "wechat" && format == "markdown"
+        { msgtype: "markdown", markdown: { content: message } }
+      else
+        { msgtype: "text", text: { content: message } }
+      end
+    end
+  end
+end

data/lib/appship.rb

@@ -21,5 +21,8 @@ require_relative "appship/runner"
 require_relative "appship/badger"
 require_relative "appship/ipa"
 require_relative "appship/uploader"
+require_relative "appship/message"
+require_relative "appship/project_config"
+require_relative "appship/webhook"
 require_relative "appship/builder"
 require_relative "appship/cli"

data/test/test_cache.rb

@@ -61,6 +61,201 @@ class CacheTest < Minitest::Test
     end
   end
 
+  def test_matches_project_files_instead_of_directory_name
+    Dir.mktmpdir("iosBuild-") do |directory|
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcodeproj"))
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcworkspace"))
+      path = File.join(directory, ".config")
+      File.write(path, JSON.generate([
+        { "project_name" => "WMApp", "pgyer_api_key" => "other-key" },
+        { "project_name" => "Demo", "pgyer_api_key" => "demo-key" }
+      ]))
+
+      profile = Appship::Cache.new(path).resolve(project_dir: directory, interactive: false)
+
+      assert_equal "Demo", profile["project_name"]
+      assert_equal "demo-key", profile["pgyer_api_key"]
+    end
+  end
+
+  def test_first_time_setup_can_resume_after_interruption
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcodeproj"))
+      original_stdin = $stdin
+      interrupted_input = InteractiveInput.new(["DemoApp"])
+      interrupted_input.define_singleton_method(:gets) { raise Interrupt }
+      $stdin = interrupted_input
+
+      capture_io do
+        assert_raises(Interrupt) { Appship::Cache.load(path, project_dir: directory) }
+      end
+      assert_equal [], JSON.parse(File.read(path))
+
+      $stdin = InteractiveInput.new(["DemoApp", "key", ""])
+      cache = nil
+      capture_io { cache = Appship::Cache.load(path, project_dir: directory) }
+      assert_equal "key", cache.entries.first["pgyer_api_key"]
+      assert_equal "", cache.entries.first["pgyer_password"]
+      assert_equal 0o600, File.stat(path).mode & 0o777
+    ensure
+      $stdin = original_stdin
+    end
+  end
+
+  def test_empty_array_without_terminal_gives_setup_instructions
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      content = "[ \n ]\n"
+      File.write(path, content)
+
+      error = assert_raises(Appship::ConfigurationError) { Appship::Cache.load(path, interactive: false) }
+      assert_includes error.message, "pgyer_api_key"
+      assert_equal content, File.read(path)
+    end
+  end
+
+  def test_eof_at_optional_password_does_not_commit_incomplete_setup
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcodeproj"))
+      original_stdin = $stdin
+      input = InteractiveInput.new([])
+      input.define_singleton_method(:gets) { @lines ||= ["DemoApp\n", "key\n"]; @lines.shift }
+      $stdin = input
+
+      capture_io do
+        error = assert_raises(Appship::ConfigurationError) { Appship::Cache.load(path, project_dir: directory) }
+        assert_includes error.message, "输入已中断"
+      end
+      assert_equal [], JSON.parse(File.read(path))
+    ensure
+      $stdin = original_stdin
+    end
+  end
+
+  def test_unmatched_project_prompts_for_configuration_without_changing_other_projects
+    Dir.mktmpdir("iosBuild-") do |directory|
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcodeproj"))
+      path = File.join(directory, ".config")
+      original = JSON.generate([{ "project_name" => "WMApp", "pgyer_api_key" => "other-key" }])
+      File.write(path, original)
+
+      error = assert_raises(Appship::ConfigurationError) do
+        Appship::Cache.new(path).resolve(
+          project_dir: directory,
+          interactive: false,
+          credential_overrides: { "pgyer_api_key" => "demo-key" }
+        )
+      end
+
+      assert_includes error.message, "增加当前项目配置"
+      assert_includes error.message, path
+      assert_includes error.message, "project_name 应填写: Demo"
+      assert_equal original, File.read(path)
+    end
+  end
+
+  def test_guides_new_project_setup_and_preserves_existing_profiles
+    %w[pgyer fir].each do |provider|
+      key_field = provider == "fir" ? "fir_api_key" : "pgyer_api_key"
+      password_field = provider == "fir" ? "fir_password" : "pgyer_password"
+      Dir.mktmpdir("iosBuild-") do |directory|
+        FileUtils.mkdir_p(File.join(directory, "Demo.xcodeproj"))
+        FileUtils.mkdir_p(File.join(directory, "Demo.xcworkspace"))
+        path = File.join(directory, ".config")
+        existing = { "project_name" => "WMApp", "app_name" => "ExistingApp", "pgyer_api_key" => "old-key", "custom" => "keep" }
+        File.write(path, JSON.generate([existing]))
+        original_stdin = $stdin
+        $stdin = InteractiveInput.new(["DemoApp", "new-key", ""])
+        cache = Appship::Cache.new(path)
+        profile = nil
+
+        output, = capture_io do
+          profile = cache.resolve(project_dir: directory, provider: provider)
+        end
+
+        assert_includes output, "请输入 app_name"
+        assert_includes output, "请输入 #{key_field}"
+        assert_includes output, "请输入 #{password_field}"
+        assert_equal "Demo", profile["project_name"]
+        assert_equal "DemoApp", profile["app_name"]
+        assert_equal "new-key", profile[key_field]
+        assert_equal "", profile[password_field]
+        assert_equal "", profile["wechat_webhook"]
+        assert_equal "", profile["dingtalk_webhook"]
+        refute profile.key?("api_key")
+        refute profile.key?("password")
+        assert_equal [existing, profile], JSON.parse(File.read(path))
+        assert_equal 0o600, File.stat(path).mode & 0o777
+        assert_equal profile, cache.resolve(project_dir: directory, provider: provider, interactive: false)
+        assert_equal 2, cache.entries.length
+      ensure
+        $stdin = original_stdin
+      end
+    end
+  end
+
+  def test_new_project_setup_uses_credential_overrides
+    Dir.mktmpdir do |directory|
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcworkspace"))
+      path = File.join(directory, ".config")
+      File.write(path, JSON.generate([{ "project_name" => "WMApp" }]))
+      original_stdin = $stdin
+      $stdin = InteractiveInput.new(["DemoApp"])
+      profile = nil
+
+      output, = capture_io do
+        profile = Appship::Cache.new(path).resolve(
+          project_dir: directory,
+          credential_overrides: { "pgyer_api_key" => "cli-key", "pgyer_password" => "" }
+        )
+      end
+
+      assert_equal "cli-key", profile["pgyer_api_key"]
+      assert_equal "", profile["pgyer_password"]
+      refute_includes output, "请输入 pgyer_api_key"
+      refute_includes output, "请输入 pgyer_password"
+    ensure
+      $stdin = original_stdin
+    end
+  end
+
+  def test_incomplete_new_project_setup_keeps_cache_unchanged
+    Dir.mktmpdir do |directory|
+      FileUtils.mkdir_p(File.join(directory, "Demo.xcodeproj"))
+      path = File.join(directory, ".config")
+      original = JSON.generate([{ "project_name" => "WMApp", "pgyer_api_key" => "old-key" }])
+      File.write(path, original)
+      original_stdin = $stdin
+      $stdin = InteractiveInput.new(["DemoApp", ""])
+
+      capture_io do
+        assert_raises(Appship::ConfigurationError) do
+          Appship::Cache.new(path).resolve(project_dir: directory)
+        end
+      end
+
+      assert_equal original, File.read(path)
+    ensure
+      $stdin = original_stdin
+    end
+  end
+
+  def test_missing_explicit_project_names_the_configured_cache_file
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      File.write(path, JSON.generate([{ "project_name" => "WMApp", "fir_api_key" => "other-key" }]))
+      error = assert_raises(Appship::ConfigurationError) do
+        Appship::Cache.new(path).resolve(project_name: "Demo", provider: "fir", interactive: false)
+      end
+
+      assert_includes error.message, path
+      assert_includes error.message, "project_name 应填写: Demo"
+      assert_includes error.message, "fir_api_key"
+    end
+  end
+
   def test_guides_first_time_setup
     Dir.mktmpdir do |directory|
       path = File.join(directory, ".config")
@@ -143,4 +338,72 @@ class CacheTest < Minitest::Test
       assert_equal "new-password", saved["fir_password"]
     end
   end
+
+  def test_loading_provider_specific_keys_preserves_all_fields_without_rewriting
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      original = [
+        { "project_name" => "Demo", "pgyer_api_key" => "old-key", "pgyer_password" => "",
+          "fir_api_key" => "fir-key", "fir_password" => "fir-password", "wechat_webhook" => "keep-url" },
+        { "project_name" => "Other", "pgyer_api_key" => "other-key", "custom" => "keep" }
+      ]
+      content = JSON.generate(original)
+      File.write(path, content)
+
+      entries = Appship::Cache.load(path, interactive: false).entries
+
+      assert_equal "old-key", entries.first["pgyer_api_key"]
+      assert_equal "", entries.first["pgyer_password"]
+      refute entries.first.key?("api_key")
+      refute entries.first.key?("password")
+      assert_equal "fir-key", entries.first["fir_api_key"]
+      assert_equal "fir-password", entries.first["fir_password"]
+      assert_equal "keep-url", entries.first["wechat_webhook"]
+      assert_equal original.last, entries.last
+      assert_equal original, entries
+      assert_equal content, File.read(path)
+    end
+  end
+
+  def test_generic_keys_do_not_satisfy_pgyer_credentials
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      content = JSON.generate([{ "project_name" => "Demo", "api_key" => "generic-key", "password" => "generic-password" }])
+      File.write(path, content)
+
+      error = assert_raises(Appship::ConfigurationError) do
+        Appship::Cache.new(path).resolve(project_name: "Demo", interactive: false)
+      end
+
+      assert_includes error.message, "缓存缺少 pgyer_api_key"
+      assert_equal content, File.read(path)
+    end
+  end
+
+  def test_invalid_cache_is_not_rewritten
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      content = JSON.generate([{ "project_name" => "Demo", "pgyer_api_key" => "old-key" }, "invalid"])
+      File.write(path, content)
+
+      assert_raises(Appship::ConfigurationError) { Appship::Cache.new(path) }
+      assert_equal content, File.read(path)
+    end
+  end
+
+  def test_pgyer_credential_overrides_use_provider_specific_keys
+    Dir.mktmpdir do |directory|
+      path = File.join(directory, ".config")
+      File.write(path, JSON.generate([{ "project_name" => "Demo", "pgyer_api_key" => "old-key", "pgyer_password" => "old-password" }]))
+
+      entry = Appship::Cache.new(path).resolve(
+        project_name: "Demo", interactive: false,
+        credential_overrides: { "pgyer_api_key" => "new-key", "pgyer_password" => "" }
+      )
+
+      assert_equal "new-key", entry["pgyer_api_key"]
+      assert_equal "", entry["pgyer_password"]
+      assert_equal [entry], JSON.parse(File.read(path))
+    end
+  end
 end