Merge 9998365 into ced213e

.gitignore

@@ -6,3 +6,4 @@
 *.egg-info
 /static/
 /static_root/
+.idea

collectfast/management/commands/collectstatic.py

@@ -2,6 +2,7 @@
 from multiprocessing.dummy import Pool
 import warnings
 
+from django.conf import settings as django_settings
 from django.contrib.staticfiles.management.commands import collectstatic
 from django.utils.encoding import smart_str
 
@@ -32,13 +33,18 @@ def __init__(self, *args, **kwargs):
         self.tasks = []
         self.etags = {}
         self.collectfast_enabled = settings.enabled
-        if self.storage.preload_metadata is not True:
-            self.storage.preload_metadata = True
-            warnings.warn(
-                "Collectfast does not work properly without "
-                "`preload_metadata` set to `True` on the storage class. Try "
-                "setting `AWS_PRELOAD_METADATA` to `True`. Overriding "
-                "`storage.preload_metadata` and continuing.")
+        if settings.enabled:
+            if django_settings.STATICFILES_STORAGE in ['storages.backends.s3boto3.S3Boto3Storage',
+                                                       'storages.backends.s3boto.S3BotoStorage']:
+                if self.storage.preload_metadata is not True:
+                    self.storage.preload_metadata = True
+                    warnings.warn(
+                        "Collectfast does not work properly without "
+                        "`preload_metadata` set to `True` on the storage class. Try "
+                        "setting `AWS_PRELOAD_METADATA` to `True`. Overriding "
+                        "`storage.preload_metadata` and continuing.")
+            else:
+                raise RuntimeError('Collectfast is intended to work with an S3 storage backend only.')
 
     def set_options(self, **options):
         """

collectfast/tests/test_command.py

@@ -2,6 +2,7 @@
 
 from django.core.management import call_command
 from django.utils.six import StringIO
+from django.test import override_settings as override_django_setting
 from mock import patch
 
 from .utils import test, clean_static_dir, create_static_file, override_setting
@@ -62,6 +63,34 @@ def test_collectfast_disabled(case):
     call_collectstatic()
 
 
+@test
+@override_django_setting(
+    STATICFILES_STORAGE='django.contrib.staticfiles.storage.StaticFilesStorage'
+)
+@override_setting("enabled", False)
+@with_bucket
+def test_non_s3_storage(case):
+    clean_static_dir()
+    create_static_file()
+    call_collectstatic()
+
+
+@test
+@override_django_setting(
+    STATICFILES_STORAGE='django.contrib.staticfiles.storage.StaticFilesStorage'
+)
+@with_bucket
+def test_enabled_with_non_s3_storage(case):
+    """
+    Running collectfast in enabled mode with a storage type other than S3 should
+    exit with an error.
+    """
+    clean_static_dir()
+    create_static_file()
+    with case.assertRaises(RuntimeError):
+        call_collectstatic()
+
+
 @test
 @with_bucket
 def test_disable_collectfast(case):