guard-sass 0.6.0 → 0.7.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 - 2011 Joshua Hawxwell
+Copyright (c) 2010 - 2012 Joshua Hawxwell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,12 +1,12 @@
 # Guard-Sass
 
-guard-sass compiles or validates your sass (and scss) files automatically when 
+guard-sass compiles or validates your sass (and scss) files automatically when
 changed.
 
 
 ## Install
 
-You will need to have [guard](http://github.com/guard/guard) to continue, so 
+You will need to have [guard](http://github.com/guard/guard) to continue, so
 install it now!
 
 Install the gem with:
@@ -44,22 +44,22 @@ If your output directory is the same as the input directory, you can simply skip
 
 ### Rails App With the Asset Pipeline
 
-With the introduction of the [asset pipeline][rpipe] in Rails 3.1 there is no 
-need to compile your Sass stylesheets with this Guard. However, if you would 
-still like to have feedback on the validation of your stylesheets (preferably 
-with a Growl notification) directly after you save a change, then you can still 
+With the introduction of the [asset pipeline][rpipe] in Rails 3.1 there is no
+need to compile your Sass stylesheets with this Guard. However, if you would
+still like to have feedback on the validation of your stylesheets (preferably
+with a Growl notification) directly after you save a change, then you can still
 use this Guard and simply skip generation of the output file:
 
     guard 'sass', :input => 'app/assets/stylesheets', :noop => true
 
-This gives you (almost) immediate feedback on whether the changes made are valid, 
-and is much faster than making a subsequent request to your Rails application. 
-If you just want to be notified when an error occurs you can hide the success 
+This gives you (almost) immediate feedback on whether the changes made are valid,
+and is much faster than making a subsequent request to your Rails application.
+If you just want to be notified when an error occurs you can hide the success
 compilation message:
 
-    guard 'sass', 
-      :input => 'app/assets/stylesheets', 
-      :noop => true, 
+    guard 'sass',
+      :input => 'app/assets/stylesheets',
+      :noop => true,
       :hide_success => true
 
 ### Rails App Without the Asset Pipeline
@@ -85,32 +85,36 @@ The following options can be passed to guard-sass:
     :input => 'sass'                    # Relative path to the input directory.
                                         # A suffix `/(.+\.s[ac]ss)` will be added to this option.
                                         # default: nil
-    
+
     :output => 'stylesheets'            # Relative path to the output directory.
                                         # default: 'css' or the :input option when supplied
-                                        
+
     :all_on_start => true               # Compiles all sass files on start
                                         # default: false
-                                        
+
     :extension => ''                    # Extension used for written files.
                                         # default: '.css'
-    
+
     :hide_success => true               # Disable successful compilation messages.
                                         # default: false
-    
+
     :shallow => true                    # Do not create nested output directories.
                                         # default: false
-    
-    :style => :nested                   # Controls the output style. Accepted options are :nested, 
+
+    :style => :nested                   # Controls the output style. Accepted options are :nested,
                                         # :compact, :compressed and :expanded
                                         # default: :nested
-    
+
     :load_paths => ['sass/partials']    # Paths for sass to find imported sass files from.
-                                        # default: all directories under current
-    
+                                        # default: template locations provided by the sass gem
+
     :noop => true                       # No operation: Do not write output file
                                         # default: false
-    
+
+    :line_numbers => true               # Add human readable source filname and line number
+                                        # information as comments.
+                                        # default: false
+
     :debug_info => true                 # File and line number info for FireSass.
                                         # default: false
 
@@ -129,7 +133,7 @@ These are equivalent to
     guard 'sass', :output => 'styles' do
       watch %r{^sass/(.+\.s[ac]ss)$}
     end
-    
+
     guard 'sass' do
       watch %r{^stylesheets/(.+\.s[ac]ss)$}
     end
@@ -139,7 +143,7 @@ These are equivalent to
 By default the guard detects nested directories and writes files into the output
 directory with the same structure.
 
-The Guard detects by default nested directories and creates these within the 
+The Guard detects by default nested directories and creates these within the
 output directory. The detection is based on the match of the watch regular expression:
 
 A file
@@ -158,10 +162,10 @@ will be compiled to
 
     public/stylesheets/form/button.css
 
-Note the parenthesis around `.+\.s[ac]ss`. This enables guard-sass to place 
+Note the parenthesis around `.+\.s[ac]ss`. This enables guard-sass to place
 the full path that was matched inside the parenthesis into the proper output directory.
 
-This behaviour can be switched off by passing the option `:shallow => true` to the 
+This behaviour can be switched off by passing the option `:shallow => true` to the
 Guard, so that all stylesheets will be compiled directly to the output directory.
 So the previous example would have compiled to `public/stylesheets/button.css`.
 
@@ -181,7 +185,7 @@ on `#guard` (irc.freenode.net).
 
 Have a look at the [GitHub contributor][contrib] list to see all contributors.
 
-Since this Guard is very close to [guard-coffeescript][gcs], some features have been 
+Since this Guard is very close to [guard-coffeescript][gcs], some features have been
 incorporated into guard-sass.
 
 
@@ -189,7 +193,7 @@ incorporated into guard-sass.
 
 (The MIT License)
 
-Copyright (c) 2010 - 2011 Joshua Hawxwell
+Copyright (c) 2010 - 2012 Joshua Hawxwell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -216,4 +220,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [rpipe]:   http://guides.rubyonrails.org/asset_pipeline.html
 [issues]:  http://github.com/hawx/guard-sass/issues
 [ggroup]:  http://groups.google.com/group/guard-dev
-[contrib]: http://github.com/hawx/guard-sass/contributors
+[contrib]: http://github.com/hawx/guard-sass/contributors

data/lib/guard/sass/runner.rb

@@ -2,11 +2,11 @@ require 'sass'
 
 module Guard
   class Sass
-    
+
     class Runner
-    
+
       attr_reader :options
-    
+
       # @param watchers [Array<Guard::Watcher>]
       # @param options [Hash] See Guard::Sass::DEFAULTS for available options
       def initialize(watchers, options={})
@@ -14,14 +14,14 @@ module Guard
         @options   = options
         @formatter = Formatter.new(:hide_success => options[:hide_success])
       end
-    
+
       # @param files [Array<String>]
       # @return [Array<Array,Boolean>]
       def run(files)
         changed_files, errors =  compile_files(files)
         [changed_files, errors.empty?]
       end
-      
+
       private
 
       # @param files [Array<String>] Files to compile
@@ -30,45 +30,46 @@ module Guard
       def compile_files(files)
         errors        = []
         changed_files = []
-        
+
         # Assume partials have been checked for previously, so no partials are included here
-        files.each do |file|          
+        files.each do |file|
           begin
             css_file = write_file(compile(file), get_output_dir(file), file)
             message = options[:noop] ? "verified #{file}" : "compiled #{file} to #{css_file}"
             @formatter.success "-> #{message}", :notification => message
             changed_files << css_file
-            
+
           rescue ::Sass::SyntaxError => e
             message = (options[:noop] ? 'validation' : 'rebuild') + " of #{file} failed"
             errors << message
             @formatter.error "Sass > #{e.sass_backtrace_str(file)}", :notification => message
           end
         end
-        
+
         [changed_files.compact, errors]
       end
-      
+
       # @param file [String] Path to sass/scss file to compile
       # @return [String] Compiled css.
       def compile(file)
-        content = IO.read(File.join(::Guard.listener.directory, file))
-        
+        content = IO.read(file)
+
         sass_options = {
-          :syntax     => file[-4..-1].to_sym,
-          :load_paths => options[:load_paths],
-          :style      => options[:style],
-          :debug_info => options[:debug_info]
+          :syntax       => file[-4..-1].to_sym,
+          :load_paths   => options[:load_paths],
+          :style        => options[:style],
+          :debug_info   => options[:debug_info],
+          :line_numbers => options[:line_numbers]
         }
-        
+
         ::Sass::Engine.new(content, sass_options).render
       end
-      
+
       # @param file [String]
       # @return [String] Directory to write +file+ to
       def get_output_dir(file)
         folder = options[:output]
-  
+
         unless options[:shallow]
           @watchers.product([file]).each do |watcher, file|
             if matches = file.match(watcher.pattern)
@@ -79,10 +80,10 @@ module Guard
             end
           end
         end
-        
+
         folder
       end
-      
+
       # Write file contents, creating directories where required.
       #
       # @param content [String] Contents of the file
@@ -96,10 +97,10 @@ module Guard
           FileUtils.mkdir_p(dir)
           File.open(path, 'w') {|f| f.write(content) }
         end
-        
+
         path
       end
-    
+
     end
   end
-end
+end

data/lib/guard/sass/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class SassVersion
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/guard/sass.rb

@@ -1,12 +1,11 @@
+require 'sass/plugin'
+
 require 'guard'
 require 'guard/guard'
 require 'guard/watcher'
 
 module Guard
   class Sass < Guard
-  
-    autoload :Runner,    'guard/sass/runner'
-    autoload :Formatter, 'guard/sass/formatter'
 
     DEFAULTS = {
       :all_on_start => false,
@@ -14,22 +13,25 @@ module Guard
       :extension    => '.css',
       :style        => :nested,
       :shallow      => false,
+      :line_numbers => false,
       :debug_info   => false,
       :noop         => false,
       :hide_success => false,
-      :load_paths   => Dir.glob('**/**').find_all {|i| File.directory?(i) }
+      :load_paths   => ::Sass::Plugin.template_location_array.map(&:first)
     }
 
     # @param watchers [Array<Guard::Watcher>]
     # @param options [Hash]
     # @option options [String] :input
     #   The input directory
-    # @option options [String] :output 
+    # @option options [String] :output
     #   The output directory
     # @option options [Array<String>] :load_paths
-    #   List of directories you can @import from 
-    # @option options [Boolean] :shallow 
+    #   List of directories you can @import from
+    # @option options [Boolean] :shallow
     #   Whether to output nested directories
+    # @option options [Boolean] :line_numbers
+    #   Whether to output human readable line numbers as comments in the file
     # @option options [Boolean] :debug_info
     #   Whether to output file and line number info for FireSass
     # @option options [Boolean] :noop
@@ -39,56 +41,56 @@ module Guard
     # @option options [Symbol] :style
     #   See http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#output_style
     def initialize(watchers=[], options={})
+      load_paths = options.delete(:load_paths) || []
+
       if options[:input]
+        load_paths << options[:input]
         options[:output] = options[:input] unless options.has_key?(:output)
         watchers << ::Guard::Watcher.new(%r{^#{ options.delete(:input) }/(.+\.s[ac]ss)$})
       end
-      
+
       options = DEFAULTS.merge(options)
+      options[:load_paths] += load_paths
+
       @runner = Runner.new(watchers, options)
       super(watchers, options)
     end
-    
-    def partial?(path)
-      File.basename(path)[0,1] == "_"
-    end
 
     # If option set to run all on start, run all when started.
+    #
+    # @raise [:task_has_failed]
     def start
-      if options[:all_on_start]
-        run_all
-      end
+      run_all if options[:all_on_start]
     end
 
     # Build all files being watched
     #
-    # @return [Boolean] No errors?
+    # @raise [:task_has_failed]
     def run_all
-      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) }
-        )
-      )
+      files = Dir.glob('**/*.s[ac]ss').reject {|f| partial?(f) }
+      run_on_changes Watcher.match_files(self, files)
     end
-    
+
     # Build the files given. If a 'partial' file is found (begins with '_') calls
     # {#run_all} as we don't know which other files need to use it.
-    # 
+    #
     # @param paths [Array<String>]
-    # @return [Boolean] No errors?
-    def run_on_change(paths)
-      has_partials = paths.any? {|f| partial?(f) }
-      return run_all if has_partials
-      
+    # @raise [:task_has_failed]
+    def run_on_changes(paths)
+      return run_all if paths.any? {|f| partial?(f) }
+
       changed_files, success = @runner.run(paths)
-      
       notify changed_files
-      success
+
+      throw :task_has_failed unless success
+    end
+
+    # Restore previous behaviour, when a file is removed we don't want to call
+    # {#run_on_changes}.
+    def run_on_removals(paths)
+
     end
-    
+
     # Notify other guards about files that have been changed so that other guards can
     # work on the changed files.
     #
@@ -100,5 +102,12 @@ module Guard
       end
     end
 
+    def partial?(path)
+      File.basename(path)[0,1] == "_"
+    end
+
   end
 end
+
+require 'guard/sass/runner'
+require 'guard/sass/formatter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-sass
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157310180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157310180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2157309720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2157309720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157309260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2157309260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157308800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -54,7 +69,12 @@ dependencies:
         version: 2.0.0.rc
   type: :development
   prerelease: false
-  version_requirements: *2157308800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc
 description: Guard::Sass automatically rebuilds sass (like sass --watch)
 email:
 - m@hawx.me
@@ -89,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-sass
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Guard gem for Sass
 test_files: []
-has_rdoc: