maid 0.7.0.alpha.1 → 0.7.0.alpha.2

data/ChangeLog

@@ -2,6 +2,8 @@ maid (0.7.0) unstable; urgency=low
 
   * Add dependencies: "exifr", "geocoder"
   * Add "location_city" tool
+  * Itsuki Kurokawa: Add "ignore_child_dirs" tool
+  * Itsuki Kurokawa: Add "tree_empty?" tool
 
  -- Benjamin Oakes <hello@benjaminoakes.com>  TODO
 

data/lib/maid/tools.rb

@@ -703,6 +703,57 @@ module Maid::Tools
     Array(paths).select { |p| !(filter_types & content_types(p)).empty? }
   end
 
+  # Test whether a directory is either empty, or contains only empty
+  # directories/subdirectories.
+  #
+  # ## Example
+  #
+  #     if tree_empty? dir('~/Downloads/foo')
+  #       trash '~/Downloads/foo'
+  #     end
+  def tree_empty?(root)
+    return nil if File.file? root
+    return true if Dir.glob(root + '/*').length == 0
+
+    ignore = []
+
+    # Look for files.
+    return false if Dir.glob(root + '/*').select { |f| File.file? f }.length > 0
+
+    empty_dirs = Dir.glob(root + '/**/*').select { |d|
+      File.directory?(d)
+    }.reverse.select { |d|
+      # `.reverse` sorts deeper directories first.
+
+      # If the directory is empty, its parent should ignore it.
+      should_ignore = Dir.glob(d + '/*').select { |n|
+        not ignore.include? n
+      }.length == 0
+
+      ignore << d if should_ignore
+
+      should_ignore
+    }
+
+    Dir.glob(root + '/*').select { |n|
+      not empty_dirs.include? n
+    }.length == 0
+  end
+
+  # Given an array of directories, return a new array without any child
+  # directories whose parent is already present in that array.
+  #
+  # ## Example
+  #
+  #     ignore_child_dirs(["foo", "foo/a", "foo/b", "bar"]) # => ["foo", "bar"]
+  def ignore_child_dirs(arr)
+    arr.sort { |x, y|
+      y.count('/') - x.count('/')
+    }.select { |d|
+      not arr.include?(File.dirname(d))
+    }
+  end
+
   private
 
   def firefox_downloading?(path)

data/lib/maid/version.rb

@@ -1,4 +1,4 @@
 module Maid
-  VERSION = '0.7.0.alpha.1'
+  VERSION = '0.7.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/spec/lib/maid/tools_spec.rb

@@ -698,5 +698,69 @@ module Maid
         end
       end
     end
+
+    describe '#tree_empty?' do
+      before do
+        @root = '~/Source'
+        @empty_dir = (@parent_of_empty_dir = @root + '/empty-parent') + '/empty'
+        @file = (@non_empty_dir = @root + '/non-empty') + '/file.txt'
+        FileUtils.mkdir_p(@empty_dir)
+        FileUtils.mkdir_p(@non_empty_dir)
+        FileUtils.touch(@file)
+      end
+
+      it 'returns false for non-empty directories' do
+        expect(@maid.tree_empty?(@non_empty_dir)).to be(false)
+      end
+
+      it 'returns true for empty directories' do
+        expect(@maid.tree_empty?(@empty_dir)).to be(true)
+      end
+
+      it 'returns true for directories with empty subdirectories' do
+        expect(@maid.tree_empty?(@parent_of_empty_dir)).to be(true)
+      end
+
+      it 'returns false for directories with non-empty subdirectories' do
+        expect(@maid.tree_empty?(@root)).to be(false)
+      end
+    end
+
+    describe '#ignore_child_dirs' do
+      it 'filters out any child directory' do
+        src = [
+          "a",
+          "b",
+          "b/x",
+          "c",
+          "c/x",
+          "c/y",
+          "d/x",
+          "d/y",
+          "e/x/y",
+          "e/x/y/z",
+          "f/x/y/z",
+          "g/x/y",
+          "g/x/z",
+          "g/y/a/b",
+          "g/y/a/c",
+        ]
+        expected = [
+          "a", # no child directories
+          "b", # ignore b/x
+          "c", # ignore c/x and c/y
+          "d/x", # no child directories
+          "d/y", # no child directories
+          "e/x/y", # ignore e/x/y/z
+          "f/x/y/z", # no empty parents
+          "g/x/y", # g/x isn't empty
+          "g/x/z",
+          "g/y/a/b", # g/y/a isn't empty
+          "g/y/a/c",
+        ].sort
+
+        expect(@maid.ignore_child_dirs(src).sort).to eq(expected)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maid
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.1
+  version: 0.7.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &21482480 !ruby/object:Gem::Requirement
+  requirement: &15664940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *21482480
+  version_requirements: *15664940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &21481740 !ruby/object:Gem::Requirement
+  requirement: &15662820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *21481740
+  version_requirements: *15662820
 - !ruby/object:Gem::Dependency
   name: deprecated
-  requirement: &21481020 !ruby/object:Gem::Requirement
+  requirement: &15660640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *21481020
+  version_requirements: *15660640
 - !ruby/object:Gem::Dependency
   name: dimensions
-  requirement: &21480540 !ruby/object:Gem::Requirement
+  requirement: &15659060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -63,10 +63,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21480540
+  version_requirements: *15659060
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &21479820 !ruby/object:Gem::Requirement
+  requirement: &15671640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -74,10 +74,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21479820
+  version_requirements: *15671640
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &21479360 !ruby/object:Gem::Requirement
+  requirement: &15669140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,10 +85,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *21479360
+  version_requirements: *15669140
 - !ruby/object:Gem::Dependency
   name: xdg
-  requirement: &21478900 !ruby/object:Gem::Requirement
+  requirement: &15682880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *21478900
+  version_requirements: *15682880
 - !ruby/object:Gem::Dependency
   name: listen
-  requirement: &20897480 !ruby/object:Gem::Requirement
+  requirement: &15680240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,10 +107,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *20897480
+  version_requirements: *15680240
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &20895860 !ruby/object:Gem::Requirement
+  requirement: &15690200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -118,10 +118,10 @@ dependencies:
         version: 3.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *20895860
+  version_requirements: *15690200
 - !ruby/object:Gem::Dependency
   name: exifr
-  requirement: &20894420 !ruby/object:Gem::Requirement
+  requirement: &15688820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -129,10 +129,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *20894420
+  version_requirements: *15688820
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &20192760 !ruby/object:Gem::Requirement
+  requirement: &15688100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -140,10 +140,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *20192760
+  version_requirements: *15688100
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &20192300 !ruby/object:Gem::Requirement
+  requirement: &15687040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -151,10 +151,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *20192300
+  version_requirements: *15687040
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &20191840 !ruby/object:Gem::Requirement
+  requirement: &15719380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -162,10 +162,10 @@ dependencies:
         version: 2.10.4
   type: :development
   prerelease: false
-  version_requirements: *20191840
+  version_requirements: *15719380
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &20191380 !ruby/object:Gem::Requirement
+  requirement: &15715640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -173,10 +173,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *20191380
+  version_requirements: *15715640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20190920 !ruby/object:Gem::Requirement
+  requirement: &15714700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -184,10 +184,10 @@ dependencies:
         version: 10.4.2
   type: :development
   prerelease: false
-  version_requirements: *20190920
+  version_requirements: *15714700
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &20190460 !ruby/object:Gem::Requirement
+  requirement: &15712460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -195,10 +195,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *20190460
+  version_requirements: *15712460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20190000 !ruby/object:Gem::Requirement
+  requirement: &15726780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -206,10 +206,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *20190000
+  version_requirements: *15726780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &20189540 !ruby/object:Gem::Requirement
+  requirement: &15722640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -217,10 +217,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *20189540
+  version_requirements: *15722640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &20189080 !ruby/object:Gem::Requirement
+  requirement: &15720520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -228,10 +228,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *20189080
+  version_requirements: *15720520
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &20188620 !ruby/object:Gem::Requirement
+  requirement: &15719640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -239,10 +239,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *20188620
+  version_requirements: *15719640
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &20188160 !ruby/object:Gem::Requirement
+  requirement: &15735180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -250,7 +250,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *20188160
+  version_requirements: *15735180
 description: Be lazy. Let Maid clean up after you, based on rules you define. Think
   of it as "Hazel for hackers".
 email:
@@ -308,7 +308,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