guard-sass 0.5.1 → 0.5.2

data/lib/guard/sass/runner.rb

@@ -36,10 +36,11 @@ module Guard
           begin
             css_file = write_file(compile(file), get_output_dir(file), file)
             
-            message = options[:noop] ? "verified #{file}" : "compiled #{file} to #{css_file}"
+            output = css_file[::Guard.listener.directory.size+1..-1]
+            message = options[:noop] ? "verified #{file}" : "compiled #{file} to #{output}"
             @formatter.success "-> #{message}", :notification => message
             
-            changed_files << css_file
+            changed_files << output
             
           rescue ::Sass::SyntaxError => e
             message = (options[:noop] ? 'validation' : 'rebuild') + " of #{file} failed"
@@ -54,7 +55,7 @@ module Guard
       # @param file [String] Path to sass/scss file to compile
       # @return [String] Compiled css.
       def compile(file)
-        content = IO.read(file)
+        content = IO.read(File.join(::Guard.listener.directory, file))
         
         sass_options = {
           :syntax     => file[-4..-1].to_sym,
@@ -82,7 +83,7 @@ module Guard
           end
         end
   
-        folder
+        File.join(::Guard.listener.directory, folder)
       end
       
       # Write file contents, creating directories where required.

data/lib/guard/sass/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class SassVersion
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

data/lib/guard/sass.rb

@@ -39,13 +39,17 @@ module Guard
     def initialize(watchers=[], options={})
       if options[:input]
         options[:output] = options[:input] unless options.has_key?(:output)
-        watchers << ::Guard::Watcher.new(%r{^#{options.delete(:input)}/(.+\.s[ac]ss)$})
+        watchers << ::Guard::Watcher.new(%r{^#{ options.delete(:input) }/(.+\.s[ac]ss)$})
       end
       
       options = DEFAULTS.merge(options)
       @runner = Runner.new(watchers, options)
       super(watchers, options)
     end
+    
+    def partial?(path)
+      File.basename(path)[0,1] == "_"
+    end
 
     # ================
     # = Guard method =
@@ -55,7 +59,14 @@ module Guard
     #
     # @return [Boolean] No errors?
     def run_all
-      run_on_change(Watcher.match_files(self, Dir.glob(File.join('**', '[^_]*.*'))))
+      run_on_change(
+        Watcher.match_files(
+          self, 
+          Dir.glob(File.join(::Guard.listener.directory, '**', '*.s[ac]ss')).
+            map {|f| f[::Guard.listener.directory.size+1..-1] }.
+            reject {|f| partial?(f) }
+        )
+      )
     end
     
     # Build the files given. If a 'partial' file is found (begins with '_') calls
@@ -63,9 +74,9 @@ module Guard
     # 
     # @param paths [Array<String>]
     # @return [Boolean] No errors?
-    def run_on_change(paths)   
-      partials = paths.select {|f| File.basename(f)[0,1] == "_" }
-      return run_all unless partials.empty?
+    def run_on_change(paths)
+      has_partials = paths.any? {|f| partial?(f) }
+      return run_all if has_partials
       
       changed_files, success = @runner.run(paths)
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-sass
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153108200 !ruby/object:Gem::Requirement
+  requirement: &2153122600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153108200
+  version_requirements: *2153122600
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2153107480 !ruby/object:Gem::Requirement
+  requirement: &2153122100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2153107480
+  version_requirements: *2153122100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153106820 !ruby/object:Gem::Requirement
+  requirement: &2153121340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153106820
+  version_requirements: *2153121340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153106060 !ruby/object:Gem::Requirement
+  requirement: &2153120460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -54,7 +54,7 @@ dependencies:
         version: 2.0.0.rc
   type: :development
   prerelease: false
-  version_requirements: *2153106060
+  version_requirements: *2153120460
 description: Guard::Sass automatically rebuilds sass (like sass --watch)
 email:
 - m@hawx.me