Skip to content
This repository has been archived by the owner on Dec 5, 2018. It is now read-only.

Commit

Permalink
bundler update stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
darkhelmet committed Aug 15, 2010
1 parent 731db41 commit 369079b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Expand Up @@ -29,4 +29,8 @@ if 'darkhelmet' == ENV['USER']
gem 'memcached', :path => '~/dev/github/fauna/memcached' gem 'memcached', :path => '~/dev/github/fauna/memcached'
else else
gem 'memcached-northscale', '0.19.5.3', :require => 'memcached' gem 'memcached-northscale', '0.19.5.3', :require => 'memcached'
end

group :development do
gem 'ruby-debug19'
end end
15 changes: 15 additions & 0 deletions Gemfile.lock
Expand Up @@ -11,11 +11,15 @@ GEM
activesupport (= 2.3.8) activesupport (= 2.3.8)
activesupport (2.3.8) activesupport (2.3.8)
acts_as_taggable_on_steroids (1.2) acts_as_taggable_on_steroids (1.2)
archive-tar-minitar (0.5.2)
builder (2.1.2) builder (2.1.2)
columnize (0.3.1)
crack (0.1.6) crack (0.1.6)
haml (3.0.13) haml (3.0.13)
hashie (0.1.8) hashie (0.1.8)
hpricot (0.8.2) hpricot (0.8.2)
linecache19 (0.5.11)
ruby_core_source (>= 0.1.4)
mime-types (1.16) mime-types (1.16)
newrelic_rpm (2.10.5) newrelic_rpm (2.10.5)
nokogiri (1.4.3.1) nokogiri (1.4.3.1)
Expand All @@ -30,6 +34,16 @@ GEM
rainpress (1.0) rainpress (1.0)
rest-client (1.6.0) rest-client (1.6.0)
mime-types (>= 1.16) mime-types (>= 1.16)
ruby-debug-base19 (0.11.23)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
ruby-debug19 (0.11.6)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.4)
archive-tar-minitar (>= 0.5.2)
sanitize (1.2.0) sanitize (1.2.0)
nokogiri (~> 1.4.1) nokogiri (~> 1.4.1)
sinatra (1.0) sinatra (1.0)
Expand Down Expand Up @@ -67,6 +81,7 @@ DEPENDENCIES
rack-gist (= 1.0.6) rack-gist (= 1.0.6)
rainpress (= 1.0.0) rainpress (= 1.0.0)
rest-client (= 1.6.0) rest-client (= 1.6.0)
ruby-debug19
sanitize (= 1.2.0) sanitize (= 1.2.0)
sinatra (= 1.0) sinatra (= 1.0)
sinatra-bundles (= 0.4.0) sinatra-bundles (= 0.4.0)
Expand Down
15 changes: 1 addition & 14 deletions darkblog.rb
Expand Up @@ -6,20 +6,7 @@


$: << File.expand_path(File.join('.', 'lib')) $: << File.expand_path(File.join('.', 'lib'))


begin require 'bundler/setup'
# Require the preresolved locked set of gems.
require File.expand_path('../.bundle/environment', __FILE__)
rescue LoadError
# Fallback on doing the resolve at runtime.
require 'rubygems'
begin
require 'ruby-debug'
rescue LoadError
end
require 'bundler'
Bundler.setup
end

require 'sinatra' require 'sinatra'
Bundler.require Bundler.require


Expand Down

0 comments on commit 369079b

Please sign in to comment.