From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat, 26 Mar 2005 19:16:37 +0000 (+0000)
Subject: Use Tempfile's for the embryo source- and amx code.
X-Git-Tag: redact-0.1.0~14
X-Git-Url: http://git.code-monkey.de/?p=redact.git;a=commitdiff_plain;h=8e136679c89b98b0de2f34e27015a73bf751bd0f

Use Tempfile's for the embryo source- and amx code.
---

diff --git a/ChangeLog b/ChangeLog
index 2574181..1615df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 --
-$Id: ChangeLog 1 2005-03-26 01:32:38Z tilman $
+$Id: ChangeLog 2 2005-03-26 19:16:37Z tilman $
 ++
 
+2005-03-26 Tilman Sauerbeck (tilman at code-monkey de)
+        * lib/redact/app.rb: Use Tempfile's for the Embryo source- and
+          amx code
+
 2005-03-22 Tilman Sauerbeck (tilman at code-monkey de)
         * lib/redact/app.rb: The default extension for Edje files is
           'edj' now
diff --git a/lib/redact/app.rb b/lib/redact/app.rb
index de66628..d2b1923 100644
--- a/lib/redact/app.rb
+++ b/lib/redact/app.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: app.rb 1 2005-03-26 01:32:38Z tilman $
+# $Id: app.rb 2 2005-03-26 19:16:37Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -25,6 +25,7 @@
 require "redact/redact.rb"
 require "redact/source.rb"
 require "ftools"
+require "tempfile"
 require "pathname"
 require "ostruct"
 require "optparse"
@@ -127,23 +128,21 @@ EOT
 			EDJE.collections.each_value do |col|
 				next unless col.has_embryo?
 
-				File.open("/tmp/redact.sma", "w") do |tf|
-					tf.puts "#include <edje>"
-					dump_sma(tf, col)
-					tf.flush
+				Tempfile.open("redact_col#{col.id}.sma") do |tf_in|
+					tf_in.puts "#include <edje>"
+					dump_sma(tf_in, col)
+					tf_in.flush
 
-					out = "/tmp/redact.amx"
-					File.rm_f(out)
+					Tempfile.open("redact_col#{col.id}.amx") do |tf_out|
+						incl = `edje-config --datadir`.strip
 
-					incl = `edje-config --datadir`.strip
-					c = "embryo_cc " +
-					    "-i #{incl}/include " +
-					    "-o #{out} #{tf.path}"
-					system(c)
+						c = "embryo_cc " +
+						    "-i #{incl}/include " +
+						    "-o #{tf_out.path} #{tf_in.path}"
+						system(c)
 
-					ret[col.id] = IO.read(out)
-					File.rm_f(out)
-					File.unlink(tf.path)
+						ret[col.id] = tf_out.read
+					end
 				end
 			end