flatten homebrew-fork and move it under vendor/lib

* remove transitional modifications to $LOAD_PATH
* all require statements are now explicit about loading from homebrew-fork

lib/brew-cask-cmd.rb

@@ -8,12 +8,10 @@
 
 require 'pathname'
 
-# todo remove internal Homebrew dependencies and remove this line
-$LOAD_PATH.unshift(File.expand_path('../homebrew-fork/Library/Homebrew', Pathname.new(__FILE__).realpath))
 $LOAD_PATH.unshift(File.expand_path('..', Pathname.new(__FILE__).realpath))
 
 # todo remove internal Homebrew dependencies and remove this line
-require 'global'
+require 'vendor/homebrew-fork/global'
 
 require 'cask'
 

lib/cask.rb

@@ -2,7 +2,8 @@
 
 class Cask; end
 
-require 'download_strategy'
+# todo remove internal Homebrew dependencies and remove this line
+require 'vendor/homebrew-fork/download_strategy'
 
 require 'cask/extend'
 require 'cask/artifact'

lib/homebrew-fork/Library/Homebrew/download_strategy.rb → lib/vendor/homebrew-fork/download_strategy.rb

@@ -1,4 +1,4 @@
-require 'resource'
+require 'vendor/homebrew-fork/resource'
 
 class AbstractDownloadStrategy
   attr_reader :name, :resource

lib/homebrew-fork/Library/Homebrew/global.rb → lib/vendor/homebrew-fork/global.rb

@@ -1,6 +1,6 @@
-require 'extend/pathname'
-require 'exceptions'
-require 'utils'
+require 'vendor/homebrew-fork/monkeypatch_pathname'
+require 'vendor/homebrew-fork/exceptions'
+require 'vendor/homebrew-fork/utils'
 
 def cache
   if ENV['HOMEBREW_CACHE']

lib/homebrew-fork/Library/Homebrew/resource.rb → lib/vendor/homebrew-fork/resource.rb

@@ -1,4 +1,4 @@
-require 'download_strategy'
+require 'vendor/homebrew-fork/download_strategy'
 
 # Resource is the fundamental representation of an external resource. The
 # primary formula download, along with other declared resources, are instances

lib/homebrew-fork/Library/Homebrew/test/testing_env.rb → lib/vendor/homebrew-fork/testing_env.rb

@@ -2,8 +2,8 @@
 
 $:.push(File.expand_path(__FILE__+'/../..'))
 
-require 'extend/pathname'
-require 'utils'
+require 'vendor/homebrew-fork/monkeypatch_pathname'
+require 'vendor/homebrew-fork/utils'
 require 'tmpdir'
 
 TEST_TMPDIR = Dir.mktmpdir("homebrew_tests")

lib/homebrew-fork/Library/Homebrew/utils.rb → lib/vendor/homebrew-fork/utils.rb

@@ -1,7 +1,7 @@
 require 'pathname'
-require 'exceptions'
-require 'hardware'
-require 'utils/popen'
+require 'vendor/homebrew-fork/exceptions'
+require 'vendor/homebrew-fork/hardware'
+require 'vendor/homebrew-fork/popen'
 
 def homebrew_fork_system cmd, *args
   puts "#{cmd} #{args*' '}" if Cask.verbose

spec/support/homebrew_testing_environment.rb

@@ -6,13 +6,10 @@ def self.included(base)
     # set some Homebrew constants used in our code
     base.const_set('HOMEBREW_BREW_FILE', '/usr/local/bin/brew')
 
-    # add our homebrew fork to load path
-    # todo: removeme, this is transitional
-    $:.push(Pathname.new(File.expand_path(__FILE__+'/../../../lib/homebrew-fork/Library/Homebrew')))
-
     # require homebrew testing env
     with_disabled_at_exit do
-      require 'test/testing_env'
+      # todo: removeme, this is transitional
+      require 'vendor/homebrew-fork/testing_env'
     end
   end
 end

test/test_helper.rb

@@ -18,12 +18,9 @@
 lib_path = brew_cask_path.join('lib')
 $:.push(lib_path)
 
-# add our homebrew fork to load path
-# todo: removeme, this is transitional
-$:.push(lib_path.join('homebrew-fork', 'Library', 'Homebrew'))
-
 # require homebrew testing env
-require 'test/testing_env'
+# todo: removeme, this is transitional
+require 'vendor/homebrew-fork/testing_env'
 
 # todo temporary, copied from old Homebrew, this method is now moved inside a class
 def shutup