From d0dc544023e8a1abb25204234d7c40ef47198734 Mon Sep 17 00:00:00 2001
From: Sebastian Ludwig <sebastian@lurado.de>
Date: Mon, 21 May 2018 13:43:57 +0200
Subject: [PATCH] Let consume-localization-archive fail if one file could not
 be consumed. Fixes #243.

---
 lib/twine/runner.rb                           |   6 ++++++
 .../fixtures/consume_localization_archive.zip | Bin 548 -> 652 bytes
 test/test_consume_localization_archive.rb     |  20 ++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/twine/runner.rb b/lib/twine/runner.rb
index fab6d18..bd1aca4 100644
--- a/lib/twine/runner.rb
+++ b/lib/twine/runner.rb
@@ -197,6 +197,7 @@ module Twine
         raise Twine::Error.new("File does not exist: #{@options[:input_path]}")
       end
 
+      error_encountered = false
       Dir.mktmpdir do |temp_dir|
         Zip::File.open(@options[:input_path]) do |zipfile|
           zipfile.each do |entry|
@@ -209,6 +210,7 @@ module Twine
               read_localization_file(real_path)
             rescue Twine::Error => e
               Twine::stderr.puts "#{e.message}"
+              error_encountered = true
             end
           end
         end
@@ -216,6 +218,10 @@ module Twine
 
       output_path = @options[:output_path] || @options[:twine_file]
       write_twine_data(output_path)
+
+      if error_encountered
+        raise Twine::Error.new("At least one file could not be consumed")
+      end
     end
 
     def validate_twine_file
diff --git a/test/fixtures/consume_localization_archive.zip b/test/fixtures/consume_localization_archive.zip
index 5efca143cc3dce8d67b127a1bf7f6717d8fb2cd6..44619c8ceee54bb4f83b439cce0cbae862dfe5e5 100644
GIT binary patch
literal 652
zcmWIWW@Zs#0D-=otv+A|l;8l;KKaRsIjP0^0Z>&OU{$R=8x}1E%H9WJJ|tDCd3qJO
zIljH8`I-y_T(5r+P5#c>DeYWwM8Z_fPV58o)V>=WmzS_k-9NoO(0uZpo$AlsUansE
zpz)ZNuOasyOXej`-ma-<Zaq6SUB~xM#xct^9#U&nQhHxTb4Q0N7W~UB_sDQ*7SfY_
z;_u3__iXf^j^+iML{;1V9{OUMQJT%QrSo-<$F|7lzdviXB!8bP>7l+UnMug>*qgrC
z1Ct&WE!h<GP3))e1@FK1ucc8vv_xRSDy$wVM)A-mY#s`}+;r;x>BB2#d%oMNo_^>_
z=+qAm$y1kg{CwBL7_@HbBBdnX+K1fJj`&$Tm6@i}8zyw=R>|ttUM)e3|7)UEOcuFu
zJ{Q}xT&d;Uvvc)F;sP#qFflt=Z)01V=hJ6arp7#JUHHv+B|Hx<)ZPE`L}iOJlaQ#}
zo3^#*AN?z;7GLtl^o!eq$yN2&%mcg`nM{~*$0RVC7#M;0ts{tqh*y{{>@f>c3(~cu
oQ4L8KB%TpALiC~sB0}$XWWC@Z4e(}V1IaT3;W{9F0%QpT02wpjF8}}l

literal 548
zcmWIWW@Zs#0D;;C)$U*hl;8l;KKaRsIjP0^0Z>&OU{z}rb{@|J%60&;5R$6YJiX$Q
zqRhPX;>*`BJqo%IRG_1A!ZVaZPxI6nZ~d@>(`P(cJ9jOAwp2`Y+LC1&Dxq2}Q_`O;
z)slEI^R;BdlNzDVm%N292d@<g`rJ@ctEX41YZ35aZHsi90PCv2Q+{hrLV`AgG8mTx
zf4)>~)NMRv%}xeXhXwsp?!fA>Vrn_8yAhwmy19iu!yU%RWWtO)WP!oPzzD=|9YHKa
zIKy;d4{4BEkgg?-YDl^e;U3_PsvkW-5c>Bc>xTzVfHx}}NDVU(ZUfR0Aj=p4)s~~a

diff --git a/test/test_consume_localization_archive.rb b/test/test_consume_localization_archive.rb
index 21ac4ef..84280b4 100644
--- a/test/test_consume_localization_archive.rb
+++ b/test/test_consume_localization_archive.rb
@@ -4,24 +4,30 @@ class TestConsumeLocalizationArchive < CommandTest
   def setup
     super
 
-    options = {}
-    options[:input_path] = fixture_path 'consume_localization_archive.zip'
-    options[:output_path] = @output_path
-    options[:format] = 'apple'
-
     @twine_file = build_twine_file 'en', 'es' do
       add_section 'Section' do
         add_definition key1: 'value1'
       end
     end
+  end
 
-    @runner = Twine::Runner.new(options, @twine_file)
+  def new_runner(options = {})
+    options[:input_path] = fixture_path 'consume_localization_archive.zip'
+    options[:output_path] = @output_path
+
+    Twine::Runner.new(options, @twine_file)
   end
 
   def test_consumes_zip_file
-    @runner.consume_localization_archive
+    new_runner(format: 'android').consume_localization_archive
 
     assert @twine_file.definitions_by_key['key1'].translations['en'], 'value1-english'
     assert @twine_file.definitions_by_key['key1'].translations['es'], 'value1-spanish'
   end
+
+  def test_raises_error_if_format_ambiguous
+    assert_raises Twine::Error do
+      new_runner.consume_localization_archive
+    end
+  end
 end