guard-sass 0.2.0 → 0.2.1

data/README.md

@@ -23,27 +23,44 @@ And finally add a basic setup to your Guardfile with:
 
 ```ruby
 guard 'sass' do
-  watch(%r{^sass/.+\.s[ac]ss})
+  watch(%r{^sass/(.+\.s[ac]ss)})
 end
 ```
 
-Defaults to writing to 'css/' but this can be changed....
+Defaults to writing to 'css/' but this can be changed by setting the output option
 
 ```ruby
 guard 'sass', :output => 'styles' do
-  watch(%r{^sass/.+\.s[ac]ss})
+  watch(%r{^sass/(.+\.s[ac]ss)})
 end
 ```
 
+By default a file such as `sass/forms/buttons.sass` with the above guard file would be
+output to `styles/forms/buttons.css` because `forms` would be matched with the parentheses.
+This can be disabled by passing `:shallow => true` so that it would be written to
+`styles/buttons.css` instead.
+
 guard-sass also has a short notation like [guard-coffeescript][gcs], this let's you define 
 an input folder (with an optional output folder) and the watcher is defined for you.
 
 ```ruby
-guard 'sass', :input => 'sass', :output => 'css'
+guard 'sass', :input => 'sass', :output => 'styles'
 # or
 guard 'sass', :input => 'stylesheets'
 ```
 
+These are equivelant to
+
+```ruby
+guard 'sass', :output => 'styles' do
+  watch %r{^sass/(.+\.s[ac]ss)$}
+end
+
+guard 'sass' do
+  watch %r{^stylesheets/(.+\.s[ac]ss)$}
+end
+```
+
 
 ## Options
 
@@ -52,6 +69,8 @@ guard 'sass', :input => 'stylesheets'
 :output => 'css'                    # Relative path to the output directory
 :notification => false              # Whether to display notifications after finished,
                                     #  default: true
+:shallow => true                    # Whether to output nested directories or just put css
+                                    #  directly in output folder, default: false
 :load_paths => ['sass/partials']    # Paths for sass to find imported sass files from,
                                     #  default: all directories under current
 ```

data/lib/guard/sass/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class SassVersion
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/lib/guard/sass.rb

@@ -8,15 +8,16 @@ module Guard
   class Sass < Guard
   
     DEFAULTS = {
-      :output => 'css',
-      :notification => true,
+      :output => 'css',              # Output directory
+      :notification => true,         # Enable notifications?
+      :shallow  => false,            # Output nested directories?
       :load_paths => Dir.glob('**/**').find_all {|i| File.directory?(i) }
     }
     
     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
       
       super(watchers, DEFAULTS.merge(options))
@@ -45,6 +46,18 @@ module Guard
     #
     def get_output(file)
       folder = File.join ::Guard.listener.directory, options[:output]
+        
+      unless options[:shallow]
+        watchers.product([file]).each do |watcher, file|
+          if matches = file.match(watcher.pattern)
+            if matches[1]
+              folder = File.join(::Guard.listener.directory, options[:output], File.dirname(matches[1])).gsub(/\/\.$/, '')
+              break
+            end
+          end
+        end
+      end
+      
       FileUtils.mkdir_p folder
       r = File.join folder, File.basename(file).split('.')[0]
       r << '.css'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-sass
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-17 00:00:00.000000000 +01:00
+date: 2011-06-18 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156091280 !ruby/object:Gem::Requirement
+  requirement: &2151905780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156091280
+  version_requirements: *2151905780
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2156090820 !ruby/object:Gem::Requirement
+  requirement: &2151905220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156090820
+  version_requirements: *2151905220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156090360 !ruby/object:Gem::Requirement
+  requirement: &2151904520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2156090360
+  version_requirements: *2151904520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156089900 !ruby/object:Gem::Requirement
+  requirement: &2151903980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -55,7 +55,7 @@ dependencies:
         version: 2.0.0.rc
   type: :development
   prerelease: false
-  version_requirements: *2156089900
+  version_requirements: *2151903980
 description: Guard::Sass automatically rebuilds sass (like sass --watch)
 email:
 - m@hawx.me