jekyll-compass 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 991b44490647b3bc643a59696942b001ace53ec7
-  data.tar.gz: 2dc501f7609d300e337afa91f13d7eb3a21203db
+  metadata.gz: c880ee9b97bfbe280c0a61da02418face4e9b1aa
+  data.tar.gz: 42e233388db99f835769f81e8fa795aeea8cd9fb
 SHA512:
-  metadata.gz: 26fbd86a0871d3b8153b5554d8fe204dc380dcb18c39bbee0a9564c8ba1a751466057e07b2f34d29856b1fe5b9b299a02740a89c22d9626b5ade2b798b67f1b1
-  data.tar.gz: 62b91303d69e84effefbdb8cbbb2111e6ec01a02d3090ee7cee0ea6ca70857cce36bd5138d249153537f8bb9254b0b21027ea6f97c37554aebe2fe1418485f47
+  metadata.gz: 95467a8f7109f2cfca214d31ba46b720bc4ee3a9e6c8b8fcd4c3ebeea58eb2df710f86be8ab934d380b2b028da5265afc89da233474195831be48540efdaf331
+  data.tar.gz: 558d51c86415334db03d56fb7f1bfc17439dd147b8d74fbf254436f1571d40f7e1be2da283f5ba511724922708ea04f417f55b61a97d8699cb918746a09e9d0c

data/README.md

@@ -51,12 +51,12 @@ Other `compass` commands will then work as per usual:
     compass compile
     compass watch
 
-You will also note that Compass will build your Sass files whenever jekyll builds the rest of your website, ensuring
+You will also note that Compass will build your Sass files whenever Jekyll builds the rest of your website, ensuring
 that what you publish is always up to date.
 
     # Compiles your entire website, including Sass/Compass
     jekyll build
-    jekyll serve
+    jekyll serve --watch
 
 Configuration
 -------------

data/lib/jekyll/compass/compass_installer.rb

@@ -71,6 +71,7 @@ This can be done in one of the following ways:
      jekyll build (compile your entire website, including Sass)
   2. To monitor your project for changes and automatically recompile:
      compass watch (just watches your Sass)
+     jekyll serve --watch (watch your entire website, including Sass)
 
 More Resources:
   * Website: http://compass-style.org/

data/lib/jekyll/compass/generator.rb

@@ -21,12 +21,10 @@ module Jekyll
 
         config = configuration(@site.source)
         configure_compass(config)
+
+        return unless File.exist? ::Compass.configuration.sass_path
         puts "\rGenerating Compass: #{::Compass.configuration.sass_path}" +
                  " => #{::Compass.configuration.css_path}"
-        unless File.exist? ::Compass.configuration.sass_dir
-          print "      Generating... "
-          return
-        end
 
         ::Compass::Commands::UpdateProject.new(@site.config['source'], {:project_type => :jekyll}).execute
 
@@ -47,7 +45,9 @@ module Jekyll
         config[:project_path] = source
         config.extend(@site.config['compass'] || {})
         config.extend(@site.data['compass'] || {})
-        config[:css_path] = File.join(@site.config['destination'], config[:css_dir]) unless config.has_key? :css_path
+        unless config.has_key? :css_path
+          config[:css_path] = File.join(real_destination, config[:css_dir])
+        end
         config.to_compass
       end
 
@@ -70,7 +70,7 @@ module Jekyll
         )
 
         Dir["#{::Compass.configuration.css_path}/**/*"].each do |path|
-          source = @site.config['destination']
+          source = real_destination
           @site.static_files <<
               CompassFile.new(
                   @site,
@@ -88,7 +88,7 @@ module Jekyll
       # @param filename [String] The name of the created stylesheet.
       # @return [void]
       def on_stylesheet_saved(filename)
-        source = @site.config['destination']
+        source = real_destination
         @site.static_files <<
             CompassFile.new(
                 @site,
@@ -121,7 +121,7 @@ module Jekyll
       def on_sprite_removed(filename)
         @site.static_files = @site.static_files.select do |p|
           if p.path == filename
-            sprite_output = p.destination(@site.config['destination'])
+            sprite_output = p.destination(real_destination)
             File.delete sprite_output if File.exist? sprite_output
             false
           else
@@ -130,6 +130,10 @@ module Jekyll
         end
         nil
       end
+
+      def real_destination
+        File.expand_path @site.config['destination']
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compass
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass