lib/rvm/environment.rb in rvm-1.0.9 vs lib/rvm/environment.rb in rvm-1.0.10

@@ -10,11 +10,12 @@
       require File.join("rvm", "environment", key)
     end
 
     # The default config has rvm_silence_logging so that log doesn't print anything to stdout.
     merge_config! :rvm_silence_logging => 1,
-                  :rvm_promptless      => 1
+                  :rvm_promptless      => 1,
+                  :rvm_ruby_api        => 1
 
     attr_reader :environment_name, :shell_wrapper
 
     # Creates a new environment with the given name and optionally
     # a set of extra environment variables to be set on load.
@@ -43,10 +44,10 @@
 
     protected
 
     # Automatically load rvm config from the multiple sources.
     def source_rvm_environment
-      rvm_path = config_value_for(:rvm_path, File.expand_path("~/.rvm"), false)
+      rvm_path = config_value_for(:rvm_path, self.class.default_rvm_path, false)
       actual_config = defined_config.merge('rvm_path' => rvm_path)
       config = []
       actual_config.each_pair do |k, v|
         config << "#{k}=#{escape_argument(v.to_s)}"
       end