Updated to bundler 0.9.3 gemfile format

Gemfile

@@ -1,22 +1,15 @@
+source :gemcutter
+source "http://gems.github.com"
+
 # Gems required for the lib to even run
 gem "virtualbox", ">= 0.4.3"
 gem "net-ssh", ">= 2.0.19"
-
-source "http://gems.github.com"
 gem "jashmenn-git-style-binaries", ">= 0.1.10"
 
 # Gems required for testing only. To install run
 # gem bundle test
-only :test do
+group :test do
   gem "contest", ">= 0.1.2"
   gem "mocha"
   gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
-end
-
-# Since hobo uses bin/, change the bin_path to something
-# else...
-bin_path "gembin"
-
-# Makes sure that our code doesn't request gems outside
-# of our dependency list.
-disable_system_gems
+end

bin/hobo

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
+
 require 'git-style-binary/command'
 
 GitStyleBinary.primary do
   version "Somewhere between 0 and 0.1"
-  
+
   run { educate }
 end

bin/hobo-down

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
 
 require 'git-style-binary/command'

bin/hobo-resume

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
 
 require 'git-style-binary/command'

bin/hobo-ssh

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
 
 require 'git-style-binary/command'

bin/hobo-suspend

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
 
 require 'git-style-binary/command'

bin/hobo-up

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 begin
-  require File.expand_path(File.join(File.dirname(__FILE__), "../vendor/gems/ruby/1.8/environment"))
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
 
 require 'git-style-binary/command'

test/test_helper.rb

@@ -1,16 +1,10 @@
- begin
-  require File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
+begin
+  require File.expand_path('../.bundle/environment', __FILE__)
 rescue LoadError
-  puts <<-ENVERR
-==================================================
-ERROR: Gem environment file not found!
-
-Hobo uses bundler to handle gem dependencies. To setup the
-test environment, please run `gem bundle test` If you don't
-have bundler, you can install that with `gem install bundler`
-==================================================
-ENVERR
-  exit
+  # Fallback on doing the resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
 end
 
 # This silences logger output