maid 0.6.0.beta.1 → 0.6.0.beta.2

data/ChangeLog

@@ -2,7 +2,7 @@ maid (0.6.0) unstable; urgency=low
 
   * Stats! { 'collaborators' => 17, 'downloads' => 16684, 'forks' => 48,
     'open_issues' => 35, 'closed_issues' => 98, 'stars' => 1045,
-    'users_sharing_rules' => 40 }
+    'users_sharing_rules' => 42 }
   * Started official support for Ruby 2.1.1, 2.1.2, 2.1.3, 2.1.4, 2.1.5, and 2.2.0.
   * Updated dependencies: "thor", "listen", "rufus-scheduler"
   * Jayson Rhynas: Add Safari download detection to "downloading?" (Closes: #121)
@@ -11,6 +11,7 @@ maid (0.6.0) unstable; urgency=low
   * Jurriaan Pruis: Add "ignore" option support for "watch" (Closes: #132)
   * Nico Ritschel: Add "copy" tool (Closes: #72, #133)
   * Add maid introduction and links (Closes: #128)
+  * Add "dimensions_px" tool, inspired by Coby Chapple's rules
 
  -- Benjamin Oakes <hello@benjaminoakes.com>  TODO
 

data/README.md

@@ -195,8 +195,7 @@ For help with command line usage, run `maid help`.  For more help, please see th
 Once you get a hang for what you can do with Maid, let it do its stuff automatically throughout the day.  You'll find
 your computer stays a little tidier with as you teach it how to handle your common files.
 
-**Note:** Both Mac OS X and Ubuntu support callbacks when folders are changed (`fsevent`/`inotify`), and that may be a forthcoming feature in Maid.
-That said, I find `cron` to take care of most of my needs.  Pull requests are welcome, however.  :)
+**Note:** Daemon support (using `fsevent`/`inotify`) was recently added.  That said, `cron` takes care of the needs of many users.
 
 To do this, edit your crontab in your tool of choice:
 
@@ -217,24 +216,26 @@ 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
-    # some task
+Maid.rules do
+  repeat '1s' do
+    rule 'This rule will run every second' do
+      # some task
+    end
   end
-end
 
-watch '/home/user/Downloads' do
-  rule 'This rule will run on every change to the downloads directory' do
-    # another task
+  watch '/home/user/Downloads' do
+    rule 'This rule will run on every change to the downloads directory' do
+      # another task
+    end
   end
-end
 
-watch '~/Desktop', ignore: /some_directory/ do
-  # rules in here
+  watch '~/Desktop', ignore: /some_directory/ do
+    # rules in here
+  end
 end
 ```
 
-To run the daemon run `maid daemon`
+To run the daemon run `maid daemon`.  Starting the daemon on login depends on the platform.
 
 ### Rake Tasks
 

data/lib/maid/tools.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'time'
 
 require 'mime/types'
+require 'dimensions'
 require 'zip'
 
 # These "tools" are methods available in the Maid DSL.
@@ -398,6 +399,17 @@ module Maid::Tools
       flatten
   end
 
+  # Determine the dimensions of GIF, PNG, JPEG, or TIFF images.
+  #
+  # Value returned is [width, height].
+  #
+  # ## Examples
+  #
+  #     dimensions_px('image.jpg') # => [1024, 768]
+  def dimensions_px(path)
+    Dimensions.dimensions(path)
+  end
+
   # [Mac OS X] Use Spotlight metadata to determine audio length.
   #
   # ## Examples

data/lib/maid/version.rb

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

data/maid.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('escape', '>= 0.0.1', '< 0.1.0') # Used for better Ruby 1.8.7 support, could be replaced with `Shellwords`
   s.add_dependency('thor', '>= 0.14.0', '< 1.0.0')
   s.add_dependency('deprecated', '~> 3.0.0')
+  s.add_dependency('dimensions', '>= 1.0.0', '< 2.0')
   s.add_dependency('mime-types', '~> 2.0')
   s.add_dependency('rubyzip', '~> 1.1.0')
   s.add_dependency('xdg', '~> 2.2.3') # previous versions had bugs

data/spec/dependency_spec.rb

@@ -1,3 +1,4 @@
+require 'dimensions'
 require 'logger'
 require 'mime/types'
 require 'rbconfig'
@@ -77,4 +78,10 @@ describe 'Dependency expectations' do
       end
     end
   end
+
+  describe Dimensions do
+    it 'returns dimensions as an array' do
+      expect(Dimensions.dimensions("#@file_fixtures_path/283x240.jpg")).to eq([283, 240])
+    end
+  end
 end

data/spec/lib/maid/tools_spec.rb

@@ -630,6 +630,20 @@ module Maid
       end
     end
 
+    describe '#dimensions_px' do
+      context 'given a JPEG image' do
+        it 'reports the known size' do
+          expect(@maid.dimensions_px(image_path)).to eq([32, 32])
+        end
+      end
+
+      context 'given an unknown type' do
+        it 'returns nil' do
+          expect(@maid.dimensions_px(unknown_path)).to be_nil
+        end
+      end
+    end
+
     describe '#mime_type' do
       context 'given a JPEG image' do
         it 'reports "image/jpeg"' do
@@ -660,11 +674,12 @@ module Maid
 
     describe '#where_content_type' do
       context 'given "image"' do
-        it 'only lists the fixture JPEG' do
+        it 'only lists the fixture JPEGs' do
           matches = @maid.where_content_type(@maid.dir(file_fixtures_glob), 'image')
 
-          expect(matches.length).to eq(1)
-          expect(matches.first).to end_with('spec/fixtures/files/ruby.jpg')
+          expect(matches.length).to eq(2)
+          expect(matches.first).to end_with('spec/fixtures/files/283x240.jpg')
+          expect(matches.last).to end_with('spec/fixtures/files/ruby.jpg')
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maid
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta.1
+  version: 0.6.0.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &12455220 !ruby/object:Gem::Requirement
+  requirement: &12511240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12455220
+  version_requirements: *12511240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12487080 !ruby/object:Gem::Requirement
+  requirement: &12508320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *12487080
+  version_requirements: *12508320
 - !ruby/object:Gem::Dependency
   name: deprecated
-  requirement: &12496420 !ruby/object:Gem::Requirement
+  requirement: &12506260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,24 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *12496420
+  version_requirements: *12506260
+- !ruby/object:Gem::Dependency
+  name: dimensions
+  requirement: &12503140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12503140
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &12489500 !ruby/object:Gem::Requirement
+  requirement: &12501680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +74,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12489500
+  version_requirements: *12501680
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &12548980 !ruby/object:Gem::Requirement
+  requirement: &12499880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +85,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12548980
+  version_requirements: *12499880
 - !ruby/object:Gem::Dependency
   name: xdg
-  requirement: &12546220 !ruby/object:Gem::Requirement
+  requirement: &12496640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +96,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *12546220
+  version_requirements: *12496640
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &12550460 !ruby/object:Gem::Requirement
+  requirement: &12495320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +107,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *12550460
+  version_requirements: *12495320
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &12593220 !ruby/object:Gem::Requirement
+  requirement: &12493620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +118,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *12593220
+  version_requirements: *12493620
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &12596320 !ruby/object:Gem::Requirement
+  requirement: &12492700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +129,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *12596320
+  version_requirements: *12492700
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12621840 !ruby/object:Gem::Requirement
+  requirement: &12491920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +140,10 @@ dependencies:
         version: 2.10.4
   type: :development
   prerelease: false
-  version_requirements: *12621840
+  version_requirements: *12491920
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &12617380 !ruby/object:Gem::Requirement
+  requirement: &12490940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +151,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *12617380
+  version_requirements: *12490940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12640620 !ruby/object:Gem::Requirement
+  requirement: &12489340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,10 +162,10 @@ dependencies:
         version: 10.4.2
   type: :development
   prerelease: false
-  version_requirements: *12640620
+  version_requirements: *12489340
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &12638760 !ruby/object:Gem::Requirement
+  requirement: &12488580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,10 +173,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *12638760
+  version_requirements: *12488580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12636260 !ruby/object:Gem::Requirement
+  requirement: &12487780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,10 +184,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *12636260
+  version_requirements: *12487780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &12634540 !ruby/object:Gem::Requirement
+  requirement: &12483760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,10 +195,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *12634540
+  version_requirements: *12483760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12659500 !ruby/object:Gem::Requirement
+  requirement: &12456320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -192,10 +206,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *12659500
+  version_requirements: *12456320
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &12657640 !ruby/object:Gem::Requirement
+  requirement: &12454800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -203,10 +217,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *12657640
+  version_requirements: *12454800
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &12656220 !ruby/object:Gem::Requirement
+  requirement: &12452460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -214,7 +228,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *12656220
+  version_requirements: *12452460
 description: Be lazy. Let Maid clean up after you, based on rules you define. Think
   of it as "Hazel for hackers".
 email:
@@ -267,6 +281,7 @@ files:
 - script/vagrant-test-all
 - spec/dependency_spec.rb
 - spec/fixtures/files/1.zip
+- spec/fixtures/files/283x240.jpg
 - spec/fixtures/files/bar.zip
 - spec/fixtures/files/foo.zip
 - spec/fixtures/files/ruby.jpg