Fixed a regression in the rails installer.

pengwynn · May 31, 2010 · a7b6ae0 · a7b6ae0
1 parent 10804a2
commit a7b6ae0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/compass/commands/project_base.rb b/lib/compass/commands/project_base.rb
@@ -28,7 +28,9 @@ def configure!
       end
 
       def add_project_configuration
-        Compass.add_project_configuration(options[:configuration_file])
+        Compass.add_project_configuration(options[:configuration_file]) do
+          options[:project_type]
+        end
       end
 
       def projectize(path)

diff --git a/lib/compass/configuration/helpers.rb b/lib/compass/configuration/helpers.rb
@@ -78,7 +78,7 @@ def add_project_configuration(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         configuration_file_path = args.shift || detect_configuration_file
         raise ArgumentError, "Too many arguments" if args.any?
-        if configuration_file_path
+        if configuration_file_path && File.exists?(configuration_file_path)
 
           data = configuration_for(configuration_file_path)
 
@@ -92,7 +92,7 @@ def add_project_configuration(*args)
 
           add_configuration(data)
         else
-          add_configuration(options[:project_type] || configuration.project_type || :stand_alone)
+          add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
         end
       end
 

diff --git a/test/rails_integration_test.rb b/test/rails_integration_test.rb
@@ -15,7 +15,7 @@ def setup
   end
 
   def test_rails_install
-    # within_tmp_directory do
+    within_tmp_directory do
     begin
       generate_rails_app_directories("compass_rails")
       Dir.chdir "compass_rails" do
@@ -30,7 +30,7 @@ def test_rails_install
     ensure
       FileUtils.rm_rf "compass_rails"
     end
-    #end
+    end
   rescue LoadError
     puts "Skipping rails test. Couldn't Load rails"
   end