maid 0.8.0.alpha.1 → 0.8.0.alpha.2

data/ChangeLog

@@ -7,6 +7,7 @@ maid (0.8.0) unstable; urgency=low
   * Song Chen Wen: Added "hidden?", "has_been_used?", "used_at", "added_at"
     tools, using OSX Spotlight metadata when available
   * Song Chen Wen: Added Aria2 and Tunder support to "downloading?" tool
+  * Song Chen Wen: Reduce "watch" CPU usage by throttling (Closes: #149, #150)
 
  -- Benjamin Oakes <hello@benjaminoakes.com>  TODO
 

data/lib/maid.rb

@@ -4,6 +4,7 @@ Deprecated.set_action(:warn)
 
 # Must be in this order:
 require 'maid/version'
+require 'maid/downloading'
 require 'maid/tools'
 require 'maid/rule_container'
 require 'maid/maid'

data/lib/maid/downloading.rb

@@ -0,0 +1,19 @@
+module Maid::Downloading
+  class << self
+    def downloading?(path)
+      !!(downloading_file_regexps.any? { |re| path.match(re) } || firefox_extra?(path) || aria2_extra?(path))
+    end
+
+    def downloading_file_regexps
+      [/\.crdownload$/, /\.download$/, /\.aria2$/, /\.td$/, /\.td.cfg$/, /\.part$/]
+    end
+
+    def firefox_extra?(path)
+      File.exist?("#{path}.part")
+    end
+
+    def aria2_extra?(path)
+      File.exist?("#{path}.aria2")
+    end
+  end
+end

data/lib/maid/tools.rb

@@ -358,11 +358,12 @@ module Maid::Tools
     mdls_to_array(path, 'kMDItemWhereFroms')
   end
 
+  include Maid::Downloading
   # Detect whether the path is currently being downloaded in Chrome, Firefox or Safari.
   #
   # See also: `dir_safe`
   def downloading?(path)
-    !!(chrome_downloading?(path) || firefox_downloading?(path) || safari_downloading?(path) || aria2_downloading?(path) || thunder_downloading?(path))
+    Maid::Downloading.downloading?(path)
   end
 
   # Find all duplicate files in the given globs.
@@ -940,27 +941,6 @@ module Maid::Tools
 
   private
 
-  def firefox_downloading?(path)
-    path =~ /\.part$/ ||
-      File.exist?("#{path}.part")
-  end
-
-  def chrome_downloading?(path)
-    path =~ /\.crdownload$/
-  end
-
-  def safari_downloading?(path)
-    path =~ /\.download$/
-  end
-
-  def aria2_downloading?(path)
-    File.exist?("#{path}.aria2") || path =~ /\.aria2$/
-  end
-
-  def thunder_downloading?(path)
-    path =~ /\.td$/ || path =~ /\.td.cfg$/
-  end
-
   def has_tag_available?()
     return Maid::Platform.osx? && system("which -s tag")
   end

data/lib/maid/version.rb

@@ -1,4 +1,4 @@
 module Maid
-  VERSION = '0.8.0.alpha.1'
+  VERSION = '0.8.0.alpha.2'
   SUMMARY = 'Be lazy. Let Maid clean up after you, based on rules you define. Think of it as "Hazel for hackers".'
 end

data/lib/maid/watch.rb

@@ -1,12 +1,20 @@
 require 'listen'
 class Maid::Watch
   include Maid::RuleContainer
+  include Maid::Downloading
 
   attr_reader :path, :listener, :logger
 
   def initialize(maid, path, options = {}, &rules)
     @maid = maid
-    @options = options
+    if options.nil? 
+      @lazy = true
+      @options = { wait_for_delay: 10, 
+                   ignore: Maid::Downloading.downloading_file_regexps }
+    else
+      @lazy = options.delete(:lazy) { |key| true }
+      @options = options
+    end
     @logger = maid.logger # TODO: Maybe it's better to create seperate loggers?
     @path = File.expand_path(path)
     initialize_rules(&rules)
@@ -15,7 +23,9 @@ class Maid::Watch
   def run
     unless rules.empty?
       @listener = Listen.to(path, @options) do |modified, added, removed|
-        follow_rules(modified, added, removed)
+        if !@lazy || added.any? || removed.any?
+          follow_rules(modified, added, removed)
+        end
       end
       @listener.start
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maid
 version: !ruby/object:Gem::Version
-  version: 0.8.0.alpha.1
+  version: 0.8.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &6312460 !ruby/object:Gem::Requirement
+  requirement: &13164820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *6312460
+  version_requirements: *13164820
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &6307360 !ruby/object:Gem::Requirement
+  requirement: &13164080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *6307360
+  version_requirements: *13164080
 - !ruby/object:Gem::Dependency
   name: deprecated
-  requirement: &6305140 !ruby/object:Gem::Requirement
+  requirement: &13163360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *6305140
+  version_requirements: *13163360
 - !ruby/object:Gem::Dependency
   name: dimensions
-  requirement: &6303640 !ruby/object:Gem::Requirement
+  requirement: &13162880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -63,10 +63,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *6303640
+  version_requirements: *13162880
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &6300180 !ruby/object:Gem::Requirement
+  requirement: &13162080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -74,10 +74,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *6300180
+  version_requirements: *13162080
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &6299560 !ruby/object:Gem::Requirement
+  requirement: &13161580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,10 +85,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *6299560
+  version_requirements: *13161580
 - !ruby/object:Gem::Dependency
   name: xdg
-  requirement: &6298260 !ruby/object:Gem::Requirement
+  requirement: &13160980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *6298260
+  version_requirements: *13160980
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &6296740 !ruby/object:Gem::Requirement
+  requirement: &13158260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *6296740
+  version_requirements: *13158260
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &6295240 !ruby/object:Gem::Requirement
+  requirement: &13173700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *6295240
+  version_requirements: *13173700
 - !ruby/object:Gem::Dependency
   name: exifr
-  requirement: &6293880 !ruby/object:Gem::Requirement
+  requirement: &13172960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *6293880
+  version_requirements: *13172960
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &6292380 !ruby/object:Gem::Requirement
+  requirement: &13172120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *6292380
+  version_requirements: *13172120
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &6290640 !ruby/object:Gem::Requirement
+  requirement: &13169320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *6290640
+  version_requirements: *13169320
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &6289200 !ruby/object:Gem::Requirement
+  requirement: &13167680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 2.12.5
   type: :development
   prerelease: false
-  version_requirements: *6289200
+  version_requirements: *13167680
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &6287740 !ruby/object:Gem::Requirement
+  requirement: &13167000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *6287740
+  version_requirements: *13167000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6286640 !ruby/object:Gem::Requirement
+  requirement: &13166280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 10.4.2
   type: :development
   prerelease: false
-  version_requirements: *6286640
+  version_requirements: *13166280
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &6285780 !ruby/object:Gem::Requirement
+  requirement: &13181680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *6285780
+  version_requirements: *13181680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6284440 !ruby/object:Gem::Requirement
+  requirement: &13180660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *6284440
+  version_requirements: *13180660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &6282200 !ruby/object:Gem::Requirement
+  requirement: &13180020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *6282200
+  version_requirements: *13180020
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &6274480 !ruby/object:Gem::Requirement
+  requirement: &13179340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *6274480
+  version_requirements: *13179340
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &6270600 !ruby/object:Gem::Requirement
+  requirement: &13178640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *6270600
+  version_requirements: *13178640
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &6267620 !ruby/object:Gem::Requirement
+  requirement: &13178180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,7 +253,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *6267620
+  version_requirements: *13178180
 description: Be lazy. Let Maid clean up after you, based on rules you define. Think
   of it as "Hazel for hackers".
 email:
@@ -281,6 +281,7 @@ files:
 - bin/maid
 - lib/maid.rb
 - lib/maid/app.rb
+- lib/maid/downloading.rb
 - lib/maid/maid.rb
 - lib/maid/numeric_extensions.rb
 - lib/maid/platform.rb
@@ -311,7 +312,7 @@ files:
 - spec/fixtures/files/ruby.jpg
 - spec/fixtures/files/sydney.jpg
 - spec/fixtures/files/unknown.foo
-- ! "spec/fixtures/files/ã\x81\x95.zip"
+- spec/fixtures/files/さ.zip
 - spec/lib/maid/app_spec.rb
 - spec/lib/maid/maid_spec.rb
 - spec/lib/maid/numeric_extensions_spec.rb