Remove bundler and add very basic support for manually vendored libs

NeilW · Oct 8, 2010 · b694473 · b694473
1 parent 65bb106
commit b694473
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+vendor/
diff --git a/Gemfile b/Gemfile
diff --git a/bbcloud.gemspec b/bbcloud.gemspec
@@ -14,12 +14,13 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "bbcloud"
 
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n") + `find vendor`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
 	s.add_dependency 'gli', '1.1.1'
 	s.add_dependency 'hirb', '0.3.4'
-	s.add_dependency 'fog', '0.3.0'
+	s.add_dependency 'fog', '0.3.1'
+	s.add_dependency 'ini', '0.1.1'
 end
diff --git a/lib/bbcloud/cli.rb b/lib/bbcloud/cli.rb
@@ -1,5 +1,8 @@
 require "rubygems"
-require "bundler/setup"
+# Add any vendored libraries into search path
+Dir.glob(File.join(File.dirname(__FILE__), '../../vendor/*')).each do |f|
+  $:.unshift File.join(f, 'lib')
+end
 require 'date'
 require 'gli'
 require 'hirb'