From 494c1d568609e791d4ed31a85de4f65232ae2744 Mon Sep 17 00:00:00 2001
From: Alex Malinovich <amalinovich@engineyard.com>
Date: Sun, 2 May 2010 11:46:52 +0800
Subject: [PATCH] Using bundler for fun and profit!

---
 Gemfile      |  1 +
 Gemfile.lock | 98 +++++++++++++++++++++++++++++-----------------------
 bin/fog      | 18 +++++-----
 3 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/Gemfile b/Gemfile
index 996a243f5..db51a6873 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,3 +10,4 @@ gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
 gem 'shindo', '>= 0'
+gem 'fog', :path => '.'
diff --git a/Gemfile.lock b/Gemfile.lock
index 52729be3b..dfcaf1e3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,45 +1,4 @@
 --- 
-dependencies: 
-  formatador: 
-    group: 
-    - :default
-    version: ">= 0.0.10"
-  rake: 
-    group: 
-    - :default
-    version: ">= 0"
-  ruby-hmac: 
-    group: 
-    - :default
-    version: ">= 0"
-  mime-types: 
-    group: 
-    - :default
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :default
-    version: ">= 0"
-  net-ssh: 
-    group: 
-    - :default
-    version: ">= 0"
-  json: 
-    group: 
-    - :default
-    version: ">= 0"
-  excon: 
-    group: 
-    - :default
-    version: ">= 0.0.21"
-  shindo: 
-    group: 
-    - :default
-    version: ">= 0"
-  nokogiri: 
-    group: 
-    - :default
-    version: ">= 0"
 specs: 
 - rake: 
     version: 0.8.7
@@ -57,13 +16,64 @@ specs:
     version: 2.0.22
 - nokogiri: 
     version: 1.4.1
-- rspec: 
-    version: 1.3.0
 - ruby-hmac: 
     version: 0.4.0
+- fog: 
+    version: 0.0.84
+    source: 0
+- rspec: 
+    version: 1.3.0
 - shindo: 
     version: 0.0.17
-hash: e443f12a9a7794f2ff4fc8e8d201b12b1e8b30bb
+hash: 6cf30542dfb9f6105f2e82d59ca1b74d7285aa68
 sources: 
+- Path: 
+    path: !ruby/object:Pathname 
+      path: .
 - Rubygems: 
     uri: http://gemcutter.org
+dependencies: 
+  formatador: 
+    version: ">= 0.0.10"
+    group: 
+    - :default
+  nokogiri: 
+    version: ">= 0"
+    group: 
+    - :default
+  rspec: 
+    version: ">= 0"
+    group: 
+    - :default
+  rake: 
+    version: ">= 0"
+    group: 
+    - :default
+  mime-types: 
+    version: ">= 0"
+    group: 
+    - :default
+  ruby-hmac: 
+    version: ">= 0"
+    group: 
+    - :default
+  net-ssh: 
+    version: ">= 0"
+    group: 
+    - :default
+  fog: 
+    version: ">= 0"
+    group: 
+    - :default
+  excon: 
+    version: ">= 0.0.21"
+    group: 
+    - :default
+  json: 
+    version: ">= 0"
+    group: 
+    - :default
+  shindo: 
+    version: ">= 0"
+    group: 
+    - :default
diff --git a/bin/fog b/bin/fog
index 4a3fb9546..982923183 100755
--- a/bin/fog
+++ b/bin/fog
@@ -1,21 +1,19 @@
 #!/usr/bin/env ruby
-lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
-require File.join(lib_dir, 'fog')
+require 'fog'
 require 'irb'
 require 'yaml'
-
-require File.join(lib_dir, 'fog', 'credentials')
-require File.join(lib_dir, 'fog', 'bin')
+require 'fog/credentials'
+require 'fog/bin'
 
 Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
 unless Fog.credentials
   exit
 end
 
-require File.join(lib_dir, 'fog', 'aws', 'bin')
-require File.join(lib_dir, 'fog', 'rackspace', 'bin')
-require File.join(lib_dir, 'fog', 'slicehost', 'bin')
-require File.join(lib_dir, 'fog', 'terremark', 'bin')
+require 'fog/aws/bin'
+require 'fog/rackspace/bin'
+require 'fog/slicehost/bin'
+require 'fog/terremark/bin'
 
 if ARGV.length > 1
   print(instance_eval(ARGV[1..-1].join(' ')).to_json)
@@ -41,4 +39,4 @@ else
 
   catch(:IRB_EXIT) { @irb.eval_input }
 
-end
\ No newline at end of file
+end