sprout 0.7.203-x86-linux → 0.7.204-x86-linux

data/lib/sprout/process_runner.rb

@@ -38,6 +38,10 @@ module Sprout #:nodoc:
       @alive = update_status
     end
     
+    def kill
+      Process.kill(9, pid)
+    end
+    
     def close
       update_status
     end

data/lib/sprout/tasks/tool_task.rb

@@ -29,6 +29,19 @@ module Sprout
   # that is implemented on this class.
   #
   class ToolTask < Rake::FileTask
+    @@preprocessed_tasks = Hash.new
+    
+    def self.add_preprocessed_task(name)
+      @@preprocessed_tasks[name] = true
+    end
+
+    def self.has_preprocessed_task?(name)
+      !@@preprocessed_tasks[name].nil?
+    end
+
+    def self.clear_preprocessed_tasks
+      @@preprocessed_tasks.clear
+    end
     
     def initialize(name, app) # :nodoc:
       super
@@ -558,37 +571,54 @@ module Sprout
       return if(File.directory?(input_file))
       CLEAN.add(belongs_to.preprocessed_path) if(!CLEAN.index(belongs_to.preprocessed_path))
       
-      file input_file
-      file output_file => input_file do
-        dir = File.dirname(output_file)
-        if(!File.exists?(dir))
-          FileUtils.mkdir_p(dir)
-        end
-        File.open(input_file, 'r') do |readable|
+      # Only create the preprocessed action if one does not
+      # already exist. There were many being created before...
+      if(!ToolTask::has_preprocessed_task?(input_file))
+        ToolTask::add_preprocessed_task(input_file)
+        
+        file input_file
+        file output_file => input_file do
+          dir = File.dirname(output_file)
+          if(!File.exists?(dir))
+            FileUtils.mkdir_p(dir)
+          end
+          
+          content = nil
+          # Open the input file and read its content:
+          File.open(input_file, 'r') do |readable|
+            content = readable.read
+          end
+          
+          # Preprocess the content if it's a known text file type:
+          if(text_file?(input_file))
+            content = preprocess_content(content, belongs_to.preprocessor, input_file)
+          end
+          
+          # Write the content to the output file:
           File.open(output_file, 'w+') do |writable|
-            if(text_file?(input_file))
-              preprocess_content(readable, writable, belongs_to.preprocessor, input_file)
-            else
-              writable.write(readable.read)
-            end
+            writable.write(content)
           end
+          
         end
+
+        belongs_to.prerequisites << output_file
       end
-      belongs_to.prerequisites << output_file
     end
     
-    def preprocess_content(readable, writable, processor, file)
-      process = ProcessRunner.new(processor)
-      process.puts(readable.read)
+    def preprocess_content(content, statement, file_name)
+      process = ProcessRunner.new(statement)
+      process.puts(content)
       process.close_write
       result = process.read
       error = process.read_err
       if(error.size > 0)
         belongs_to.display_preprocess_message
         FileUtils.rm_rf(belongs_to.preprocessed_path)
-        raise ExecutionError.new("[ERROR] Preprocessor failed on file #{file} #{error}")
+        raise ExecutionError.new("[ERROR] Preprocessor failed on file #{file_name} #{error}")
       end
-      writable.write(result)
+      process.kill
+      Log.puts ">> Preprocessed and created: #{belongs_to.preprocessed_path}/#{file_name}"
+      return result
     end
     
   end

data/lib/sprout/version.rb

@@ -2,7 +2,7 @@ module Sprout
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 203
+    TINY  = 204
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     MAJOR_MINOR = [MAJOR, MINOR].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.203
+  version: 0.7.204
 platform: x86-linux
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency