Update to latest bundler best practices.

- Initialize bundler using require 'bundler/setup' - Do not include Gemfile.lock in repository.
wvanbergen · Dec 19, 2010 · f53ad77 · f53ad77
1 parent ded86da
commit f53ad77
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ spec/resources/_*.png
 /doc
 /.yardoc
 /.bundle
+Gemfile.lock
 *.rbc
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Rakefile b/Rakefile
@@ -1,8 +1,3 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.setup
-
 Dir['tasks/*.rake'].each { |file| load(file) }
 
 GithubGem::RakeTasks.new(:gem)

diff --git a/benchmarks/decoding_benchmark.rb b/benchmarks/decoding_benchmark.rb
@@ -1,7 +1,5 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.setup
+require 'bundler/setup'
 
 require 'benchmark'
 require 'chunky_png'

diff --git a/benchmarks/encoding_benchmark.rb b/benchmarks/encoding_benchmark.rb
@@ -1,7 +1,5 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.setup
+require 'bundler/setup'
 
 require 'benchmark'
 require 'chunky_png'

diff --git a/benchmarks/filesize_benchmark.rb b/benchmarks/filesize_benchmark.rb
@@ -1,7 +1,5 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.setup
+require 'bundler/setup'
 
 require 'benchmark'
 require 'chunky_png'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,6 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.require(:default, :development)
+require 'bundler/setup'
+require 'chunky_png'
 
 module PNGSuite