maid 0.6.0.alpha.4 → 0.6.0.alpha.5

data/.travis.yml

@@ -9,5 +9,5 @@ rvm:
   - 2.1.3
   - 2.1.4
   - 2.1.5
-  - 2.2.0-preview2
+  - 2.2.0
   - ruby-head

data/ChangeLog

@@ -1,10 +1,10 @@
 maid (0.6.0) unstable; urgency=low
 
-  * Started official support for Ruby 2.1.1, 2.1.2, 2.1.3.  Tentative support
-    for Ruby 2.2.0.
+  * Started official support for Ruby 2.1.1, 2.1.2, 2.1.3, 2.2.0.
   * Jayson Rhynas: Add Safari download detection to "downloading?" (Closes: #121)
   * Pedro Lambert: Add support for Rake tasks defined by Maid (Closes: #68, #123)
   * Jurriaan Pruis: Add daemon mode and repeat support (Closes: #126, #131)
+  * Jurriaan Pruis: Add "ignore" option support for "watch" (Closes: #132)
 
  -- Benjamin Oakes <hello@benjaminoakes.com>  TODO
 

data/README.md

@@ -211,9 +211,11 @@ Example for every day at 1am:
     0 1 * * * /bin/bash -li -c "maid clean --force --silent"
     
 ### Running as a daemon
+
 To run Maid as a daemon you first have to specify watch/repeat rules.
 
 They are defined like this:
+
 ```ruby
 repeat '1s' do
   rule 'This rule will run every second' do
@@ -226,6 +228,10 @@ watch '/home/user/Downloads' do
     # another task
   end
 end
+
+watch '~/Desktop', ignore: /some_directory/ do
+  # rules in here
+end
 ```
 
 To run the daemon run `maid daemon`

data/lib/maid/maid.rb

@@ -85,8 +85,8 @@ class Maid::Maid
     STDERR.puts e.message
   end
 
-  def watch(path, &rules)
-    @watches << ::Maid::Watch.new(self, path, &rules)
+  def watch(path, options = {}, &rules)
+    @watches << ::Maid::Watch.new(self, path, options, &rules)
   end
 
   def repeat(timestring, &rules)

data/lib/maid/version.rb

@@ -1,3 +1,3 @@
 module Maid
-  VERSION = '0.6.0.alpha.4'
+  VERSION = '0.6.0.alpha.5'
 end

data/lib/maid/watch.rb

@@ -1,11 +1,12 @@
 require 'listen'
 class Maid::Watch
   include Maid::RuleContainer
-  
+
   attr_reader :path, :listener, :logger
-  
-  def initialize(maid, path, &rules)
+
+  def initialize(maid, path, options = {}, &rules)
     @maid = maid
+    @options = options
     @logger = maid.logger # TODO: Maybe it's better to create seperate loggers?
     @path = File.expand_path(path)
     initialize_rules(&rules)
@@ -13,17 +14,17 @@ class Maid::Watch
 
   def run
     unless rules.empty?
-      @listener = Listen.to(path) do |modified, added, removed|
+      @listener = Listen.to(path, @options) do |modified, added, removed|
         follow_rules(modified, added, removed)
       end
       @listener.start
     end
   end
-  
+
   def stop
     @listener.stop
   end
-  
+
   def join
     @listener.thread.join unless @listener.nil? || @listener.paused?
   end

data/spec/lib/maid/maid_spec.rb

@@ -176,15 +176,17 @@ module Maid
         expect(@maid.rules.first.description).to eq('description')
       end
     end
-    
+
     describe '#watch' do
       before do
+        Listen.stub(:to)
+        Listen.stub(:start)
         @maid = Maid.new
       end
 
       it 'adds a watch to the list of watches' do
         expect(@maid.watches.length).to eq(0)
-        
+
         @maid.watch('watch_dir') do
           'instructions'
         end
@@ -192,8 +194,28 @@ module Maid
         expect(@maid.watches.length).to eq(1)
         expect(@maid.watches.first.path).to eq(File.expand_path('watch_dir'))
       end
+
+      it 'accepts a hash of options and passes them to Listen' do
+        hash = { :some => :options }
+        @maid.watch('some_dir', hash) do
+          rule 'test' do
+          end
+        end
+
+        listener = double('listener')
+
+        expect(Listen).to receive(:to) do |dir, opts|
+          expect(dir).to eq File.expand_path('some_dir')
+          expect(opts).to eq(hash)
+          listener
+        end
+
+        expect(listener).to receive(:start)
+
+        @maid.watches.last.run
+      end
     end
-    
+
     describe '#repeat' do
       before do
         @maid = Maid.new
@@ -201,7 +223,7 @@ module Maid
 
       it 'adds a repeat to the list of repeats' do
         expect(@maid.repeats.length).to eq(0)
-        
+
         @maid.repeat('1s') do
           'instructions'
         end
@@ -216,8 +238,8 @@ module Maid
         n = 3
         maid = Maid.new
         expect(@logger).to receive(:info).exactly(n).times
-        rules = (1..n).map do |n|
-          d = double("rule ##{ n }", :description => 'description')
+        rules = (1..n).map do |i|
+          d = double("rule ##{ i }", :description => 'description')
           expect(d).to receive(:follow)
           d
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maid
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha.4
+  version: 0.6.0.alpha.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &16193980 !ruby/object:Gem::Requirement
+  requirement: &9484660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *16193980
+  version_requirements: *9484660
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &16190100 !ruby/object:Gem::Requirement
+  requirement: &9480520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *16190100
+  version_requirements: *9480520
 - !ruby/object:Gem::Dependency
   name: deprecated
-  requirement: &16165540 !ruby/object:Gem::Requirement
+  requirement: &9456100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *16165540
+  version_requirements: *9456100
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &16164520 !ruby/object:Gem::Requirement
+  requirement: &9455100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16164520
+  version_requirements: *9455100
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &16163540 !ruby/object:Gem::Requirement
+  requirement: &9454180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *16163540
+  version_requirements: *9454180
 - !ruby/object:Gem::Dependency
   name: xdg
-  requirement: &16162880 !ruby/object:Gem::Requirement
+  requirement: &9453500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *16162880
+  version_requirements: *9453500
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &16162260 !ruby/object:Gem::Requirement
+  requirement: &9452900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *16162260
+  version_requirements: *9452900
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &16161600 !ruby/object:Gem::Requirement
+  requirement: &9452200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *16161600
+  version_requirements: *9452200
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &16161020 !ruby/object:Gem::Requirement
+  requirement: &9451640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *16161020
+  version_requirements: *9451640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &16160460 !ruby/object:Gem::Requirement
+  requirement: &9451060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 2.10.4
   type: :development
   prerelease: false
-  version_requirements: *16160460
+  version_requirements: *9451060
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &16159780 !ruby/object:Gem::Requirement
+  requirement: &9450300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *16159780
+  version_requirements: *9450300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16159120 !ruby/object:Gem::Requirement
+  requirement: &9449720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: 10.4.2
   type: :development
   prerelease: false
-  version_requirements: *16159120
+  version_requirements: *9449720
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &16158460 !ruby/object:Gem::Requirement
+  requirement: &9449100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *16158460
+  version_requirements: *9449100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16157880 !ruby/object:Gem::Requirement
+  requirement: &9448460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +170,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *16157880
+  version_requirements: *9448460
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &16113640 !ruby/object:Gem::Requirement
+  requirement: &9404220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,10 +181,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *16113640
+  version_requirements: *9404220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16112840 !ruby/object:Gem::Requirement
+  requirement: &9403340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,10 +192,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *16112840
+  version_requirements: *9403340
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &16111980 !ruby/object:Gem::Requirement
+  requirement: &9402600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -203,10 +203,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *16111980
+  version_requirements: *9402600
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &16110740 !ruby/object:Gem::Requirement
+  requirement: &9401380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -214,7 +214,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *16110740
+  version_requirements: *9401380
 description: ! 'Be lazy: let Maid clean up after you. Think of it as "Hazel for hackers".'
 email:
 - hello@benjaminoakes.com