guard-less 0.1.2 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4019276249c78b8420a421f4347bfd47673ba98f
+  data.tar.gz: 2ea5cdce379953d455af60e613bf0e67a7804cd0
+SHA512:
+  metadata.gz: 7849747fc01004a686db16337af0d62796cbc7b5b50cb371e2cb9c2a0a1adb0a347fe87685a573bfed0dc0fe1090755e2ec678a38aa8cc24e8a746aa3e5a64d9
+  data.tar.gz: d55abb577b265d88e0ca3be5c9e44b75b88528a94a4ec33c7c265f1493bb9baa3c0c5e8c4784b90a2f597aa853ab85d22ac81fe70cbbb0a42c264010310ebcca

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2013 Brendan Erwin and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,19 +1,29 @@
-# Guard-Less
+# Guard::Less
+
+[![Gem Version](https://badge.fury.io/rb/guard-less.png)](http://badge.fury.io/rb/guard-less) [![Build Status](https://travis-ci.org/guard/guard-less.png?branch=master)](https://travis-ci.org/guard/guard-less) [![Dependency Status](https://gemnasium.com/guard/guard-less.png)](https://gemnasium.com/guard/guard-less) [![Code Climate](https://codeclimate.com/github/guard/guard-less.png)](https://codeclimate.com/github/guard/guard-less) [![Coverage Status](https://coveralls.io/repos/guard/guard-less/badge.png?branch=master)](https://coveralls.io/r/guard/guard-less)
 
 A guard extension that compiles `.less` files to `.css` files when changed.
 
+* Compatible with Less ~> 2.3.
+* Tested against Ruby 1.9.3, 2.0.0, Rubinius & JRuby (1.9 mode only).
+
 ## Install
 
 You will need to have [Guard](https://github.com/guard/guard) first.
 
 Install the gem with:
 
-    gem install guard-less
+```bash
+gem install guard-less
+```
 
 Add an initial setup to your Guardfile with:
 
-    guard init less
+```bash
+guard init less
+```
 
+Please note that you also have to install therubyracer (or therubyrhino when you are running JRuby).
 
 ## Usage
 
@@ -22,8 +32,15 @@ Please read [Guard usage doc](https://github.com/guard/guard#readme).
 ## Guardfile
 
 ```ruby
-guard 'less', :all_on_start => true, :all_after_change => true do
-  watch(%r{^.*\.less$})
+less_options = {
+  all_on_start: true,
+  all_after_change: true,
+  patterns: [/^.+\.less$/],
+  output: 'public/stylesheets'
+}
+
+guard :less, less_options do
+  less_options[:patterns].each { |pattern| watch(pattern) }
 end
 ```
 
@@ -32,34 +49,48 @@ Please read [Guard doc](https://github.com/guard/guard#readme) for more info abo
 ## Options
 
 ```ruby
-:all_after_change => [true|false]   # run on all files after any changed files
+all_after_change: [true|false]   # run on all files after any changed files
                                     # default: true
 
-:all_on_start => [true|false]       # run on all the files at startup
+all_on_start: [true|false]       # run on all the files at startup
                                     # default: true
 
-:output => 'relative/path'          # base directory for output CSS files; if unset,
+output: 'relative/path'          # base directory for output CSS files; if unset,
                                     # .css files are generated in the same directories
                                     # as their corresponding .less file
                                     # default: nil
 
-:import_paths => ['lib/styles']     # an array of additional load paths to pass to the
-                                    # LESS parser, used when resolving `@import`
-                                    # statements
-                                    # default: [] (see below)
+import_paths: ['lib/styles']     # an array of additional load paths to pass to the
+                                 # LESS parser, used when resolving `@import`
+                                 # statements
+                                 # default: [] (see below)
+
+compress: true                   # minify output
+
+yuicompress: true                # minify output using yui
+
+patterns: []                     # array of patterns for matching watched/processed files
 ```
 
 ### Output option
 
 By default, `.css` files will be generated in the same directories as their
 corresponding `.less` files (partials beginning with `_` are always excluded).
+
 To customize the output location, pass the `:output` option as described above,
 and be sure to use a match group in the regular expression in your watch to
 capture nested structure that will be preserved, i.e.
 
 ```ruby
-guard 'less', :output => 'public/stylesheets' do
-  watch(%r{^app/stylesheets/(.+\.less)$})
+less_options = {
+  all_on_start: true,
+  all_after_change: true,
+  patterns: [/^app/stylesheets/(.+\.less)$/],
+  output: 'public/stylesheets'
+}
+
+guard :less, less_options do
+  less_options[:patterns].each { |pattern| watch(pattern) }
 end
 ```
 
@@ -75,25 +106,14 @@ additional paths with this option so that, for the `['lib/styles']` example, a
 file at `lib/styles/reset.less` could be imported without a qualified path as
 `@import 'reset'`.
 
-# License
+## Author
+
+[Brendan Erwin](https://github.com/brendanjerwin) ([@brendanjerwin](http://twitter.com/brendanjerwin), [brendanjerwin.com](http://brendanjerwin.com))
 
-**Copyright (c) 2011 Brendan Erwin and contributors**
+## Maintainer
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+[Rémy Coutable](https://github.com/rymai)
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+## Contributors
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+[https://github.com/guard/guard-less/graphs/contributors](https://github.com/guard/guard-less/graphs/contributors)

data/lib/guard/less.rb

@@ -1,49 +1,39 @@
-require 'guard'
-require 'guard/guard'
+require 'guard/compat/plugin'
 require 'less'
 
-require File.dirname(__FILE__) + "/less/version"
-
 module Guard
-  class Less < Guard
+  class Less < Plugin
+    require 'guard/less/version'
 
-    # ================
-    # = Guard method =
-    # ================
-    def initialize(watchers=[], options={})
+    def initialize(options = {})
       defaults = {
-        :all_after_change => true,
-        :all_on_start => true,
-        :output => nil,
-        :import_paths => [],
-        :compress => false
+        all_after_change: true,
+        all_on_start: true,
+        output: nil,
+        import_paths: [],
+        compress: false,
+        patterns: [],
+        yuicompress: false
       }
-
-      super(watchers, defaults.merge(options))
+      super(defaults.merge(options))
     end
 
     def start
-      UI.info "Guard::Less #{LessVersion::VERSION} is on the job!"
+      Compat::UI.info "Guard::Less #{LessVersion::VERSION} is on the job!"
       run_all if options[:all_on_start]
     end
 
     # Call with Ctrl-/ signal
     # This method should be principally used for long action like running all specs/tests/...
     def run_all
-      UI.info "Guard::Less: compiling all files"
-      patterns = watchers.map { |w| w.pattern }
+      Compat::UI.info 'Guard::Less: compiling all files'
       files = Dir.glob('**/*.*')
-      paths = []
-      files.each do |file|
-        patterns.each do |pattern|
-          paths << file if file.match(Regexp.new(pattern))
-        end
-      end
+      paths = Compat.matching_files(self, files).uniq
       run(paths)
     end
 
     # Call on file(s) modifications
-    def run_on_change(paths)
+    def run_on_changes(paths)
       options[:all_after_change] ? run_all : run(paths)
     end
 
@@ -54,17 +44,17 @@ module Guard
         stylesheets.each do |lessfile|
           # Skip partials
           basename = File.basename(lessfile)
-          next if basename[0,1] == "_"
+          next if basename[0, 1] == '_'
 
           cssfile = File.join(destination, basename.gsub(/\.less$/, '.css'))
 
           # Just in case
           if cssfile == lessfile
-            UI.info "Guard::Less: Skipping #{lessfile} since the output would overwrite the original file"
+            Compat::UI.info "Guard::Less: Skipping #{lessfile} since output and source are the same"
           elsif mtime(cssfile) >= mtime_including_imports(lessfile)
-            UI.info "Guard::Less: Skipping #{lessfile} because #{cssfile} is already up-to-date"
+            Compat::UI.info "Guard::Less: Skipping #{lessfile} because #{cssfile} is already up-to-date"
           else
-            UI.info "Guard::Less: #{lessfile} -> #{cssfile}\n"
+            Compat::UI.info "Guard::Less: #{lessfile} -> #{cssfile}\n"
             FileUtils.mkdir_p(File.expand_path(destination))
             compile(lessfile, cssfile)
           end
@@ -77,16 +67,16 @@ module Guard
     # Parse the source lessfile and write to target cssfile
     def compile(lessfile, cssfile)
       import_paths = options[:import_paths].unshift(File.dirname(lessfile))
-      parser = ::Less::Parser.new :paths => import_paths, :filename => lessfile
-      File.open(lessfile,'r') do |infile|
-        File.open(cssfile,'w') do |outfile|
+      parser = ::Less::Parser.new paths: import_paths, filename: lessfile
+      File.open(lessfile, 'r') do |infile|
+        File.open(cssfile, 'w') do |outfile|
           tree = parser.parse(infile.read)
-          outfile << tree.to_css(:compress => options[:compress])
+          outfile << tree.to_css(compress: options[:compress], yuicompress: options[:yuicompress])
         end
       end
       true
-    rescue Exception => e
-      UI.info "Guard::Less: Compiling #{lessfile} failed with message: #{e.message}"
+    rescue StandardError => e
+      Compat::UI.info "Guard::Less: Compiling #{lessfile} failed with message: #{e.message}"
       false
     end
 
@@ -98,19 +88,15 @@ module Guard
     def nested_directory_map(paths)
       directories = {}
 
-      watchers.product(paths).each do |watcher, path|
-        if matches = path.match(watcher.pattern)
-          target = options[:output] || File.dirname(path)
-          if subpath = matches[1]
-            target = File.join(target, File.dirname(subpath)).gsub(/\/\.$/, '')
-          end
+      options[:patterns].product(paths).each do |pattern, path|
+        next unless (matches = path.match(pattern))
 
-          if directories[target]
-            directories[target] << path
-          else
-            directories[target] = [path]
-          end
+        target = options[:output] || File.dirname(path)
+        if (subpath = matches[1])
+          target = File.join(target, File.dirname(subpath)).gsub(/\/\.$/, '')
         end
+
+        (directories[target] ||= []) << path
       end
 
       directories
@@ -128,17 +114,20 @@ module Guard
     def mtime_including_imports(file)
       mtimes = [mtime(file)]
       File.readlines(file).each do |line|
-        if line =~ /^\s*@import ['"]([^'"]+)/
-          imported = File.join(File.dirname(file), $1)
-          mtimes << if imported =~ /\.le?ss$/ # complete path given ?
-            mtime(imported)
-          else # we need to add .less or .lss
-            [mtime("#{imported}.less"), mtime("#{imported}.lss")].max
-          end
-        end
+        next unless line =~ /^\s*@import ['"]([^'"]+)/
+
+        imported = File.join(File.dirname(file), Regexp.last_match[1])
+
+        # complete path given ?
+        mod_time = if imported =~ /\.le?ss$/
+                     mtime(imported)
+                   else
+                     # we need to add .less or .lss
+                     [mtime("#{imported}.less"), mtime("#{imported}.lss")].max
+                   end
+        mtimes << mod_time
       end
       mtimes.max
     end
-
   end
 end

data/lib/guard/less.rb.orig

@@ -0,0 +1,139 @@
+require 'guard'
+require 'guard/plugin'
+require 'less'
+
+module Guard
+  class Less < Plugin
+
+    require 'guard/less/version'
+
+    # ================
+    # = Guard method =
+    # ================
+    def initialize(options = {})
+      defaults = {
+        all_after_change: true,
+        all_on_start: true,
+        output: nil,
+        import_paths: [],
+        compress: false,
+        yuicompress: false,
+      }
+
+      super(defaults.merge(options))
+    end
+
+    def start
+      UI.info "Guard::Less #{LessVersion::VERSION} is on the job!"
+      run_all if options[:all_on_start]
+    end
+
+    # Call with Ctrl-/ signal
+    # This method should be principally used for long action like running all specs/tests/...
+    def run_all
+      UI.info "Guard::Less: compiling all files"
+      files = Dir.glob('**/*.*')
+      paths = Watcher.match_files(self, files).uniq
+      run(paths)
+    end
+
+    # Call on file(s) modifications
+    def run_on_changes(paths)
+      options[:all_after_change] ? run_all : run(paths)
+    end
+
+    def run(paths)
+      directories = nested_directory_map(paths)
+
+      directories.each do |destination, stylesheets|
+        stylesheets.each do |lessfile|
+          # Skip partials
+          basename = File.basename(lessfile)
+          next if basename[0,1] == "_"
+
+          cssfile = File.join(destination, basename.gsub(/\.less$/, '.css'))
+
+          # Just in case
+          if cssfile == lessfile
+            UI.info "Guard::Less: Skipping #{lessfile} since the output would overwrite the original file"
+          elsif mtime(cssfile) >= mtime_including_imports(lessfile)
+            UI.info "Guard::Less: Skipping #{lessfile} because #{cssfile} is already up-to-date"
+          else
+            UI.info "Guard::Less: #{lessfile} -> #{cssfile}\n"
+            FileUtils.mkdir_p(File.expand_path(destination))
+            compile(lessfile, cssfile)
+          end
+        end
+      end
+    end
+
+    private
+
+    # Parse the source lessfile and write to target cssfile
+    def compile(lessfile, cssfile)
+      import_paths = options[:import_paths].unshift(File.dirname(lessfile))
+      parser = ::Less::Parser.new paths: import_paths, filename: lessfile
+      File.open(lessfile,'r') do |infile|
+        File.open(cssfile,'w') do |outfile|
+          tree = parser.parse(infile.read)
+         	outfile << tree.to_css(compress: options[:compress], yuicompress: options[:yuicompress])
+        end
+      end
+      true
+    rescue Exception => e
+      UI.info "Guard::Less: Compiling #{lessfile} failed with message: #{e.message}"
+      false
+    end
+
+    # Creates a hash of changed files keyed by their target nested directory,
+    # which is based on either the original source directory or the :output
+    # option, plus the regex match group in a watcher like:
+    #
+    #    %r{^app/stylesheets/(.+\.less)$}
+    def nested_directory_map(paths)
+      directories = {}
+
+      watchers.product(paths).each do |watcher, path|
+        if matches = path.match(watcher.pattern)
+          target = options[:output] || File.dirname(path)
+          if subpath = matches[1]
+            target = File.join(target, File.dirname(subpath)).gsub(/\/\.$/, '')
+          end
+
+          if directories[target]
+            directories[target] << path
+          else
+            directories[target] = [path]
+          end
+        end
+      end
+
+      directories
+    end
+
+    # mtime checking borrowed from the old official LESS Rails plugin:
+    #    https://github.com/cloudhead/more
+    def mtime(file)
+      return 0 unless File.file?(file)
+      File.mtime(file).to_i
+    end
+
+    # consider imports for mtime
+    # just 1 level deep so we do not get any looping/nesting errors
+    def mtime_including_imports(file)
+      mtimes = [mtime(file)]
+      File.readlines(file).each do |line|
+        if line =~ /^\s*@import ['"]([^'"]+)/
+          imported = File.join(File.dirname(file), $1)
+          mtimes << if imported =~ /\.le?ss$/ # complete path given ?
+            mtime(imported)
+          else # we need to add .less or .lss
+            [mtime("#{imported}.less"), mtime("#{imported}.lss")].max
+          end
+        end
+      end
+      mtimes.max
+    end
+
+  end
+end

data/lib/guard/less/templates/Guardfile

@@ -1,3 +1,23 @@
-guard 'less', :all_on_start => true, :all_after_change => true do
-  watch(%r{^.+\.less$})
+# NOTE: the subpath hack using a regexp group no longer works
+# - instead, use the patterns option, e.g. change:
+#
+#    guard :less do
+#      watch /^foo\/(.+)\.less/
+#    end
+#
+#  into:
+#
+#    patterns = [/^foo\/(.+)\.less/]
+#    guard :less, patterns: patterns do
+#      patterns.each { |pattern| watch(pattern) }
+#    end
+
+less_options = {
+  all_on_start: true,
+  all_after_change: true,
+  patterns: [/^.+\.less$/]
+}
+
+guard :less, less_options do
+  less_options[:patterns].each { |pattern| watch(pattern) }
 end

data/lib/guard/less/templates/Guardfile.orig

@@ -0,0 +1,3 @@
+guard :less, all_on_start: true, all_after_change: true do
+  watch %r{^.+\.less$}
+end

data/lib/guard/less/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module LessVersion
-    VERSION = "0.1.2"
+    VERSION = '2.0.0'
   end
 end

data/lib/guard/less/version.rb.orig

@@ -0,0 +1,5 @@
+module Guard
+  module LessVersion
+    VERSION = '1.0.0'
+  end
+end

metadata

@@ -1,112 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: guard-less
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Brendan Erwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: less
+  name: guard-compat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: less
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 description: Guard::Less automatically compiles less (like lessc --watch)
 email:
 - brendanjerwin@gmail.com
@@ -114,32 +73,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/guard/less.rb
+- lib/guard/less.rb.orig
 - lib/guard/less/templates/Guardfile
+- lib/guard/less/templates/Guardfile.orig
 - lib/guard/less/version.rb
-- lib/guard/less.rb
-- README.md
-homepage: https://github.com/guard/guard-less
-licenses: []
+- lib/guard/less/version.rb.orig
+homepage: https://rubygems.org/gems/guard-less
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guard gem for Less
 test_files: []