completed bundler integration

donnoman · Nov 15, 2009 · fb01822 · fb01822
1 parent a1d55db
commit fb01822
Show file tree

Hide file tree

Showing 24 changed files with 15 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 nbproject
-vendor/gems/gems
-vendor/gems/specifications
-vendor/gems/doc
-vendor/gems/environment.rb
+bin
+vendor/bundler_gems/gems
+vendor/bundler_gems/specifications
+vendor/bundler_gems/doc
+vendor/bundler_gems/environment.rb
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ disable_system_gems
 
 # Paths
 bundle_path "vendor/bundler_gems"
-bin_path "script"
 
 # Sources
 clear_sources
@@ -12,23 +11,19 @@ source "http://gems.rubyforge.org/"
 source "http://gems.github.com"
 
 # Stack
-directory "vendor/stack" do
-  gem "rails", "2.3.4"
-  gem "rack", "1.0.0"
-  gem "unicorn", "0.93.3"
-end
+gem "rails", "2.3.4"
+gem "rack", "1.0.0"
+gem "unicorn", "0.93.3"
 
 # Application
 gem "authlogic", :version => '2.1.2'
 
 # Testing
-only: test do
-  directory "vendor/test" do
-    gem "rspec", :version => '1.2.9', :require_as => 'spec'
-    gem "rspec-rails", :version => '1.2.9'
-    gem "webrat", :version => '0.5.3'
-    gem "cucumber", :version => '0.4.2'
-    gem "spork" , :version => '0.7.3'
-    gem "thoughtbot-factory_girl", :require_as => 'factory_girl'
-  end
+only :test do
+  gem "rspec", '1.2.9', :require_as => 'spec'
+  gem "rspec-rails", '1.2.9'
+  gem "webrat", '0.5.3'
+  gem "cucumber", '0.4.2'
+  gem "spork" , '0.7.3'
+  gem "thoughtbot-factory_girl", '1.2.2', :require_as => 'factory_girl'
 end
diff --git a/vendor/bundler_gems/cache/actionmailer-2.3.4.gem b/vendor/bundler_gems/cache/actionmailer-2.3.4.gem
diff --git a/vendor/bundler_gems/cache/actionpack-2.3.4.gem b/vendor/bundler_gems/cache/actionpack-2.3.4.gem
diff --git a/vendor/bundler_gems/cache/activerecord-2.3.4.gem b/vendor/bundler_gems/cache/activerecord-2.3.4.gem
diff --git a/vendor/bundler_gems/cache/activeresource-2.3.4.gem b/vendor/bundler_gems/cache/activeresource-2.3.4.gem
diff --git a/vendor/bundler_gems/cache/activesupport-2.3.4.gem b/vendor/bundler_gems/cache/activesupport-2.3.4.gem
diff --git a/vendor/bundler_gems/cache/authlogic-2.1.3.gem b/vendor/bundler_gems/cache/authlogic-2.1.3.gem
diff --git a/vendor/bundler_gems/cache/builder-2.1.2.gem b/vendor/bundler_gems/cache/builder-2.1.2.gem
diff --git a/vendor/bundler_gems/cache/cucumber-0.4.2.gem b/vendor/bundler_gems/cache/cucumber-0.4.2.gem
diff --git a/vendor/bundler_gems/cache/diff-lcs-1.1.2.gem b/vendor/bundler_gems/cache/diff-lcs-1.1.2.gem
diff --git a/vendor/bundler_gems/cache/nokogiri-1.4.0.gem b/vendor/bundler_gems/cache/nokogiri-1.4.0.gem
diff --git a/vendor/bundler_gems/cache/polyglot-0.2.9.gem b/vendor/bundler_gems/cache/polyglot-0.2.9.gem
diff --git a/vendor/bundler_gems/cache/rack-1.0.0.gem b/vendor/bundler_gems/cache/rack-1.0.0.gem
diff --git a/vendor/bundler_gems/cache/rails-2.3.4.gem b/vendor/bundler_gems/cache/rails-2.3.4.gem
diff --git a/vendor/bundler_gems/cache/rake-0.8.7.gem b/vendor/bundler_gems/cache/rake-0.8.7.gem
diff --git a/vendor/bundler_gems/cache/rspec-1.2.9.gem b/vendor/bundler_gems/cache/rspec-1.2.9.gem
diff --git a/vendor/bundler_gems/cache/rspec-rails-1.2.9.gem b/vendor/bundler_gems/cache/rspec-rails-1.2.9.gem
diff --git a/vendor/bundler_gems/cache/spork-0.7.3.gem b/vendor/bundler_gems/cache/spork-0.7.3.gem
diff --git a/vendor/bundler_gems/cache/term-ansicolor-1.0.4.gem b/vendor/bundler_gems/cache/term-ansicolor-1.0.4.gem
diff --git a/vendor/bundler_gems/cache/thoughtbot-factory_girl-1.2.2.gem b/vendor/bundler_gems/cache/thoughtbot-factory_girl-1.2.2.gem
diff --git a/vendor/bundler_gems/cache/treetop-1.4.2.gem b/vendor/bundler_gems/cache/treetop-1.4.2.gem
diff --git a/vendor/bundler_gems/cache/unicorn-0.93.3.gem b/vendor/bundler_gems/cache/unicorn-0.93.3.gem
diff --git a/vendor/bundler_gems/cache/webrat-0.5.3.gem b/vendor/bundler_gems/cache/webrat-0.5.3.gem