Merge pull request #2042 from mxl/expand-glob

Expand glob patterns.

8 files changed, 18 insertions, 13 deletions

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb
index b0ad0c626..8416f3f88 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-installable.rb
@@ -11,10 +11,11 @@ cask 'with-installable' do
             quit:       'my.fancy.package.app',
             login_item: 'Fancy',
             delete:     [
-                          '/permissible/absolute/path',
-                          '~/permissible/path/with/tilde',
+                          "#{TEST_TMPDIR}/absolute_path",
+                          '~/path_with_tilde',
+                          "#{TEST_TMPDIR}/glob_path*",
                           'impermissible/relative/path',
                           '/another/impermissible/../relative/path',
                         ],
-            rmdir:      "#{TEST_FIXTURE_DIR}/cask/empty_directory"
+            rmdir:      "#{TEST_TMPDIR}/empty_directory_path"
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb
index cba51f18f..c7d2e4767 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-delete.rb
@@ -8,8 +8,9 @@ cask 'with-uninstall-delete' do
   pkg 'Fancy.pkg'
 
   uninstall delete: [
-                      '/permissible/absolute/path',
-                      '~/permissible/path/with/tilde',
+                      "#{TEST_TMPDIR}/absolute_path",
+                      '~/path_with_tilde',
+                      "#{TEST_TMPDIR}/glob_path*",
                       'impermissible/relative/path',
                       '/another/impermissible/../relative/path',
                     ]
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb
index 252d81994..8ded5b835 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-rmdir.rb
@@ -7,5 +7,5 @@ cask 'with-uninstall-rmdir' do
 
   pkg 'MyFancyPkg/Fancy.pkg'
 
-  uninstall rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory"
+  uninstall rmdir: "#{TEST_TMPDIR}/empty_directory_path"
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb
index 171780bb7..b085b3e32 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-trash.rb
@@ -8,8 +8,9 @@ cask 'with-uninstall-trash' do
   pkg 'Fancy.pkg'
 
   uninstall trash: [
-                     '/permissible/absolute/path',
-                     '~/permissible/path/with/tilde',
+                     "#{TEST_TMPDIR}/absolute_path",
+                     '~/path_with_tilde',
+                     "#{TEST_TMPDIR}/glob_path*",
                      'impermissible/relative/path',
                      '/another/impermissible/../relative/path',
                    ]
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb
index a0ab83fc2..d81a387f9 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-delete.rb
@@ -8,8 +8,9 @@ cask 'with-zap-delete' do
   pkg 'Fancy.pkg'
 
   zap delete: [
-                '/permissible/absolute/path',
-                '~/permissible/path/with/tilde',
+                "#{TEST_TMPDIR}/absolute_path",
+                '~/path_with_tilde',
+                "#{TEST_TMPDIR}/glob_path*",
                 'impermissible/relative/path',
                 '/another/impermissible/../relative/path',
               ]
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb
index 02139b3b0..a67c4ca9a 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-rmdir.rb
@@ -7,5 +7,5 @@ cask 'with-zap-rmdir' do
 
   pkg 'MyFancyPkg/Fancy.pkg'
 
-  zap rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory"
+  zap rmdir: "#{TEST_TMPDIR}/empty_directory_path"
 end
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb
index 8f4e91d67..ea2bc2a01 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-zap-trash.rb
@@ -8,8 +8,9 @@ cask 'with-zap-trash' do
   pkg 'Fancy.pkg'
 
   zap trash: [
-               '/permissible/absolute/path',
-               '~/permissible/path/with/tilde',
+               "#{TEST_TMPDIR}/absolute_path",
+               '~/path_with_tilde',
+               "#{TEST_TMPDIR}/glob_path*",
                'impermissible/relative/path',
                '/another/impermissible/../relative/path',
              ]
diff --git a/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore b/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore
deleted file mode 100644
index e69de29bb..000000000
--- a/Library/Homebrew/test/support/fixtures/cask/empty_directory/.gitignore
+++ /dev/null