maid 0.6.0.alpha.2 → 0.6.0.alpha.3

data/lib/maid/maid.rb

@@ -24,11 +24,11 @@ class Maid::Maid
   include ::Maid::Tools
 
   # Make a new Maid, setting up paths for the log and trash.
-  # 
+  #
   # Sane defaults for a log and trash path are set for Mac OS X, but they can easily be overridden like so:
-  # 
+  #
   #     Maid::Maid.new(:log_device => '/home/username/log/maid.log', :trash_path => '/home/username/my_trash')
-  # 
+  #
   def initialize(options = {})
     options = DEFAULTS.merge(options.reject { |k, v| v.nil? })
 
@@ -56,7 +56,7 @@ class Maid::Maid
     @repeats = []
     @rules = []
   end
-  
+
   # Start cleaning, based on the rules defined at rules_path.
   def clean
     unless @log_device.kind_of?(IO)
@@ -84,15 +84,15 @@ class Maid::Maid
   rescue LoadError => e
     STDERR.puts e.message
   end
-  
+
   def watch(path, &rules)
     @watches << ::Maid::Watch.new(self, path, &rules)
   end
-  
+
   def repeat(timestring, &rules)
     @repeats << ::Maid::Repeat.new(self, timestring, &rules)
   end
-  
+
   # Daemonizes the process by starting all watches and repeats and joining
   # the threads of the schedulers/watchers
   def daemonize
@@ -102,13 +102,16 @@ class Maid::Maid
       all = @watches + @repeats
       all.each(&:run)
       trap("SIGINT") do
-        all.each(&:stop)
-        exit!
+        # Running in a thread fixes celluloid ThreadError
+        Thread.new do
+          all.each(&:stop)
+          exit!
+        end.join
       end
       sleep
     end
   end
-  
+
   # Run a shell command.
   #--
   # Delegates to `Kernel.\``.  Made primarily for testing other commands and some error handling.

data/lib/maid/rake/single_rule.rb

@@ -18,9 +18,7 @@ module Maid
       end
 
       def define
-        maid_instance.rule name do
-          maid_instance.instance_eval(&task)
-        end
+        maid_instance.rule(name, &task)
         self
       end
 

data/lib/maid/rule.rb

@@ -1,6 +1,6 @@
-class Maid::Rule < Struct.new(:description, :instructions)
+class Maid::Rule < Struct.new(:description, :instructions, :maid)
   # Follow the instructions of the rule.
   def follow(*args)
-    instructions.call(*args)
+    maid.instance_exec(*args, &instructions)
   end
 end

data/lib/maid/rule_container.rb

@@ -1,17 +1,18 @@
 module Maid::RuleContainer
+  include ::Maid::Tools
   attr_reader :rules
-  
+
   # initialize_rules
   def initialize_rules(&rules)
     @rules ||= []
     instance_exec(&rules)
   end
-  
+
   # Register a rule with a description and instructions (lambda function).
   def rule(description, &instructions)
-    @rules << ::Maid::Rule.new(description, instructions)
+    @rules << ::Maid::Rule.new(description, instructions, @maid || self)
   end
-  
+
   # Follow all registered rules.
   def follow_rules(*args)
     @rules.each do |rule|

data/lib/maid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maid
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha.2
+  version: 0.6.0.alpha.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &19806060 !ruby/object:Gem::Requirement
+  requirement: &17252340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19806060
+  version_requirements: *17252340
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &19804940 !ruby/object:Gem::Requirement
+  requirement: &17251340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19804940
+  version_requirements: *17251340
 - !ruby/object:Gem::Dependency
   name: deprecated
-  requirement: &19803580 !ruby/object:Gem::Requirement
+  requirement: &17249860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19803580
+  version_requirements: *17249860
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &19803040 !ruby/object:Gem::Requirement
+  requirement: &17249340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19803040
+  version_requirements: *17249340
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &19802100 !ruby/object:Gem::Requirement
+  requirement: &17248660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19802100
+  version_requirements: *17248660
 - !ruby/object:Gem::Dependency
   name: xdg
-  requirement: &19801280 !ruby/object:Gem::Requirement
+  requirement: &17247680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *19801280
+  version_requirements: *17247680
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &19800320 !ruby/object:Gem::Requirement
+  requirement: &17246700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: 2.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *19800320
+  version_requirements: *17246700
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &19786680 !ruby/object:Gem::Requirement
+  requirement: &17233580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +104,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *19786680
+  version_requirements: *17233580
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &19785940 !ruby/object:Gem::Requirement
+  requirement: &17232800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *19785940
+  version_requirements: *17232800
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19785300 !ruby/object:Gem::Requirement
+  requirement: &17232080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *19785300
+  version_requirements: *17232080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19784740 !ruby/object:Gem::Requirement
+  requirement: &17231520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 4.3.1
   type: :development
   prerelease: false
-  version_requirements: *19784740
+  version_requirements: *17231520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19784140 !ruby/object:Gem::Requirement
+  requirement: &17230980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +148,10 @@ dependencies:
         version: 10.3.2
   type: :development
   prerelease: false
-  version_requirements: *19784140
+  version_requirements: *17230980
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &19783380 !ruby/object:Gem::Requirement
+  requirement: &17230180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +159,10 @@ dependencies:
         version: 3.1.2
   type: :development
   prerelease: false
-  version_requirements: *19783380
+  version_requirements: *17230180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19782360 !ruby/object:Gem::Requirement
+  requirement: &17229180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -173,10 +173,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *19782360
+  version_requirements: *17229180
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &19781640 !ruby/object:Gem::Requirement
+  requirement: &17228420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -184,10 +184,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *19781640
+  version_requirements: *17228420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19780960 !ruby/object:Gem::Requirement
+  requirement: &17227860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -195,10 +195,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *19780960
+  version_requirements: *17227860
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &19780280 !ruby/object:Gem::Requirement
+  requirement: &17227100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -206,10 +206,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *19780280
+  version_requirements: *17227100
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &19779560 !ruby/object:Gem::Requirement
+  requirement: &17226400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -217,7 +217,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *19779560
+  version_requirements: *17226400
 description: ! 'Be lazy: let Maid clean up after you. Think of it as "Hazel for hackers".'
 email:
 - hello@benjaminoakes.com