Merge pull request #211 from morgoth/fixed-yaml-usage

fixed using YAML
2012-06-11 12:57:24 -07:00
parent 8b18143281 b01355a093
commit 7774b7f150
1 changed files with 2 additions and 1 deletions
@@ -4,6 +4,7 @@ require "foreman/engine"
 require "foreman/engine/cli"
 require "foreman/export"
 require "shellwords"
+require "yaml"
 require "thor"

 class Foreman::CLI < Thor
@@ -126,7 +127,7 @@ private ######################################################################
  def options
    original_options = super
    return original_options unless File.exists?(".foreman")
-    defaults = YAML::load_file(".foreman") || {}
+    defaults = ::YAML::load_file(".foreman") || {}
    Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
  end