Changeset 88

Timestamp:

04/16/08 22:25:45 (7 months ago)

Author:

jweiss

Message:

apply #77 with modifications: check syntax of recipes

Location:

trunk

Files:

• CHANGELOG.txt (modified) (1 diff)
• app/models/recipe.rb (modified) (1 diff)
• test/unit/recipe_test.rb (modified) (1 diff)

trunk/CHANGELOG.txt

@@ -1 +1 @@
 
 * SVN *
+
+* Check syntax of recipes. Provided by Mathias Meyer
 
 * Ajax-Preview on recipe edit. Provided by Mathias Meyer

trunk/app/models/recipe.rb

@@ -9 +9 @@
   
   tz_time_attributes :created_at, :updated_at
+  
+ 
+ def validate
+   check_syntax
+ end
+ 
+  def check_syntax
+   return if self.body.blank?
+
+   result = ""
+   Open4::popen4 "ruby -wc" do |pid, stdin, stdout, stderr|
+     stdin.write self.body
+     stdin.close
+     output = stdout.read
+     errors = stderr.read
+     result = output.any? ? output : errors
+   end
+
+   unless result == "Syntax OK"
+     line = $1.to_i if result =~ /^-:(\d+):/
+     errors.add(:body, "syntax error at line: #{line}") unless line.nil?
+   end
+  rescue => e
+    RAILS_DEFAULT_LOGGER.error "Error while validating recipe syntax of recipe #{self.id}: #{e.inspect} - #{e.backtrace.join("\n")}"
+  end
+ 
 end

trunk/test/unit/recipe_test.rb

@@ -51 +51 @@
     assert !recipe.valid?
   end
+
+  def test_validate_invalid_syntax_on_create
+    recipe = Recipe.create(:name => "Copy Config files",
+                           :description => "Recipe body intentionally erronous",
+                           :body => "set config_files, database.yml'")
+    assert !recipe.valid?
+    assert_equal "syntax error at line: 1", recipe.errors.on(:body)
+  end
   
+  def test_validate_valid_syntax_on_create
+    recipe = Recipe.create(:name => "Copy Config files",
+                           :description => "Recipe body intentionally erronous",
+                           :body => "set :config_files, 'database.yml'")
+    assert !recipe.errors.on(:body)
+  end
+  
+  def test_validate_with_open4_error
+    Open4.expects(:popen4).raises(RuntimeError)
+    recipe = Recipe.create(:name => "Copy Config files",
+                           :description => "Recipe body intentionally erronous",
+                           :body => "set :config_files, 'database.yml'")
+    assert !recipe.errors.on(:body)
+  end
 end