compass 1.1.0.alpha.1 → 1.1.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d27e0749bc3350ca12f3aab14eed3b6bdf56fe0
-  data.tar.gz: d2e42399d751703ab7e07d304e0511eeeadf726f
+  metadata.gz: c34f4a9522411d067ced24bf4e65aacd01b161b0
+  data.tar.gz: 9062ad628caa3eca0c7625a4c024a567cb65ca9a
 SHA512:
-  metadata.gz: 2b94391e2752fbd8042bc5b6bdb37a82feac4bbfc33152e65210a20e123514ffee8d13bda35e46d7effc8a7a23f94fce3cf79529a8b9aebb9363ad29fd2b022e
-  data.tar.gz: 4a3015c121fbf930a321a0b9ccd159cc2dd77de21db22147c9a5506dffe441fc2dbb7d5ee509f50e785c0104e229ed72bab025bb163e1a211798479b28c135b4
+  metadata.gz: 2aae0a4826987f8add3ba159a8d7d4f7243e180904c1e848f75b34d0b8f22481d61186c29bb23529b05568ce4f88de9173162925cfa995af75b0b851bb1f6534
+  data.tar.gz: b6eb04af255592ee36ead5c97df32a142ee03908985c088caceb6bb4fe83c85554d8d950c82c017b465fd6fa33cc217293e2154def054df42d106a19cefdc71e

data/lib/compass.rb

@@ -33,6 +33,7 @@ end
    configuration/file_data
    app_integration
    compiler
+   sass_compiler
    sprite_importer
 ).each do |lib|
   require "compass/#{lib}"

data/lib/compass/configuration/helpers.rb

@@ -47,11 +47,11 @@ module Compass
           else
             Sass::Plugin.on_updating_stylesheet(&on_saved)
           end
-          
+
           Sass::Plugin.on_compilation_error do |e, filename, css|
             Compass.configuration.run_stylesheet_error(filename, e.message)
           end
-          
+
           @callbacks_loaded = true
         end
       end
@@ -66,7 +66,7 @@ module Compass
         configuration_file_path = args.shift || detect_configuration_file
 
         raise ArgumentError, "Too many arguments" if args.any?
-        if AppIntegration.default? && data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
+        if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
           if data.raw_project_type
             add_configuration(data.raw_project_type.to_sym)
           elsif options[:project_type]
@@ -75,7 +75,7 @@ module Compass
             add_configuration(:stand_alone)
           end
           add_configuration(data)
-        else
+        elsif !AppIntegration.default?
           add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
         end
       end

data/lib/compass/generated_version.rb

@@ -1,4 +1,4 @@
 module Compass
-  VERSION = "1.1.0.alpha.1"
+  VERSION = "1.1.0.alpha.2"
   VERSION_NAME = "Polaris"
 end

data/lib/compass/sprite_importer.rb

@@ -86,7 +86,7 @@ module Compass
         end
         basenames
       end[:files]
-      return resolved_files if resolved_files.any?
+      return resolved_files.sort if resolved_files.any?
       path = Compass.configuration.sprite_resolver.asset_collections.map{|ac| ac.images_path }.join(", ")
       raise Compass::SpriteException, %Q{No images were found in the sprite path matching "#{uri}". Your current load paths are: #{path}}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.1
+  version: 1.1.0.alpha.2
 platform: ruby
 authors:
 - Chris Eppstein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -40,14 +40,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.alpha.1
+        version: 1.1.0.alpha.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.alpha.1
+        version: 1.1.0.alpha.2
 - !ruby/object:Gem::Dependency
   name: compass-import-once
   requirement: !ruby/object:Gem::Requirement