Merge pull request #195 from mattbrictson/future-wait

Use Future#wait! to ensure concurrent compile exceptions are re-raised
rails · Dec 4, 2015 · da13ee6 · da13ee6
2 parents eaed749 + 03048cb
commit da13ee6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/sprockets/manifest.rb b/lib/sprockets/manifest.rb
@@ -202,13 +202,13 @@ def compile(*args)
           logger.debug "Skipping #{target}.gz, already exists"
         else
           logger.info "Writing #{target}.gz"
-          concurrent_compressors << Concurrent::Future.execute { write_file.wait; gzip.compress(target) }
+          concurrent_compressors << Concurrent::Future.execute { write_file.wait!; gzip.compress(target) }
         end
 
       end
-      concurrent_writers.each(&:wait)
-      concurrent_compressors.each(&:wait)
-      Concurrent::Future.execute { self.save }.wait
+      concurrent_writers.each(&:wait!)
+      concurrent_compressors.each(&:wait!)
+      save
 
       filenames
     end

diff --git a/test/test_manifest.rb b/test/test_manifest.rb
@@ -657,4 +657,11 @@ def teardown
       refute File.exist?("#{@dir}/#{original_path}.gz"), "Expecting '#{original_path}' to not generate gzipped file: '#{original_path}.gz' but it did"
     end
   end
+
+  test 'raises exception when gzip fails' do
+    manifest = Sprockets::Manifest.new(@env, @dir)
+    Zlib::GzipWriter.stub(:new, -> { fail 'kaboom' }) do
+      assert_raises('kaboom') { manifest.compile('application.js') }
+    end
+  end
 end