Skip to content
Browse files

straighten up the place

  • Loading branch information...
1 parent a1e6d69 commit cc3bbf4f33dc884601789b3d82699c09e4d0de36 @mislav committed Feb 21, 2011
Showing with 81 additions and 119 deletions.
  1. +9 −5 Gemfile
  2. +59 −105 Gemfile.lock
  3. +4 −0 Rakefile
  4. +1 −0 app_spec.rb
  5. +8 −9 config.ru
View
14 Gemfile
@@ -1,14 +1,18 @@
-source :gemcutter
+source :rubygems
gem 'sinatra', '~> 1.0.0'
-gem 'shotgun', '0.6'
gem 'dm-core', '~> 0.10.1'
gem 'dm-timestamps', '~> 0.10.1'
-gem 'do_postgres', '~> 0.10.0'
-gem 'do_sqlite3', '~> 0.10.0'
gem 'haml', '~> 3.0.0.beta1'
gem 'twitter-login', '~> 0.2.0', :require => 'twitter/login'
gem 'actionpack', '~> 2.3.4'
gem 'builder', '~> 2.1.2'
gem 'nokogiri', '~> 1.4.0'
-gem 'rspec', '~> 1.2.9', :require => 'spec', :group => :test
+
+gem 'shotgun', '0.6', :group => :development
+gem 'do_postgres', '~> 0.10.0', :group => :production
+
+group :test do
+ gem 'do_sqlite3', '~> 0.10.0'
+ gem 'rspec', '~> 1.3.1', :require => 'spec'
+end
View
164 Gemfile.lock
@@ -1,105 +1,59 @@
----
-dependencies:
- twitter-login:
- group:
- - :default
- version: ~> 0.2.0
- require:
- - twitter/login
- do_postgres:
- group:
- - :default
- version: ~> 0.10.0
- haml:
- group:
- - :default
- version: ~> 3.0.0.beta1
- rspec:
- group:
- - :test
- version: ~> 1.2.9
- require:
- - spec
- dm-timestamps:
- group:
- - :default
- version: ~> 0.10.1
- dm-core:
- group:
- - :default
- version: ~> 0.10.1
- sinatra:
- group:
- - :default
- version: ~> 1.0.0
- actionpack:
- group:
- - :default
- version: ~> 2.3.4
- builder:
- group:
- - :default
- version: ~> 2.1.2
- do_sqlite3:
- group:
- - :default
- version: ~> 0.10.0
- shotgun:
- group:
- - :default
- version: = 0.6
- nokogiri:
- group:
- - :default
- version: ~> 1.4.0
-specs:
-- activesupport:
- version: 2.3.5
-- rack:
- version: 1.0.1
-- actionpack:
- version: 2.3.5
-- addressable:
- version: 2.1.1
-- builder:
- version: 2.1.2
-- crack:
- version: 0.1.6
-- data_objects:
- version: 0.10.1
-- extlib:
- version: 0.9.14
-- dm-core:
- version: 0.10.2
-- dm-timestamps:
- version: 0.10.2
-- do_postgres:
- version: 0.10.1
-- do_sqlite3:
- version: 0.10.1.1
-- haml:
- version: 3.0.0.beta.1
-- hashie:
- version: 0.1.8
-- httparty:
- version: 0.5.2
-- nokogiri:
- version: 1.4.1
-- ruby-hmac:
- version: 0.4.0
-- oauth:
- version: 0.3.6
-- rspec:
- version: 1.2.9
-- shotgun:
- version: "0.6"
-- sinatra:
- version: "1.0"
-- twitter:
- version: 0.8.6
-- twitter-login:
- version: 0.2.1
-hash: f7e4fae9d5080954bda05213696947b902e03104
-sources:
-- Rubygems:
- uri: http://gemcutter.org
+GEM
+ remote: http://rubygems.org/
+ specs:
+ actionpack (2.3.11)
+ activesupport (= 2.3.11)
+ rack (~> 1.1.0)
+ activesupport (2.3.11)
+ addressable (2.2.4)
+ builder (2.1.2)
+ crack (0.1.8)
+ data_objects (0.10.3)
+ addressable (~> 2.1)
+ dm-core (0.10.2)
+ addressable (~> 2.1)
+ extlib (~> 0.9.14)
+ dm-timestamps (0.10.2)
+ dm-core (~> 0.10.2)
+ do_postgres (0.10.3)
+ data_objects (= 0.10.3)
+ do_sqlite3 (0.10.3)
+ data_objects (= 0.10.3)
+ extlib (0.9.15)
+ haml (3.0.25)
+ hashie (0.4.0)
+ httparty (0.6.1)
+ crack (= 0.1.8)
+ multi_json (0.0.5)
+ nokogiri (1.4.4)
+ oauth (0.4.4)
+ rack (1.1.0)
+ rspec (1.3.1)
+ shotgun (0.6)
+ rack (>= 0.9.1)
+ sinatra (1.0)
+ rack (>= 1.0)
+ twitter (0.9.12)
+ hashie (~> 0.4.0)
+ httparty (~> 0.6.1)
+ multi_json (~> 0.0.4)
+ oauth (~> 0.4.3)
+ twitter-login (0.2.3)
+ twitter (~> 0.9.5)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ actionpack (~> 2.3.4)
+ builder (~> 2.1.2)
+ dm-core (~> 0.10.1)
+ dm-timestamps (~> 0.10.1)
+ do_postgres (~> 0.10.0)
+ do_sqlite3 (~> 0.10.0)
+ haml (~> 3.0.0.beta1)
+ nokogiri (~> 1.4.0)
+ rspec (~> 1.3.1)
+ shotgun (= 0.6)
+ sinatra (~> 1.0.0)
+ twitter-login (~> 0.2.0)
View
4 Rakefile
@@ -1,3 +1,7 @@
+task :spec do
+ exec(*%w[bundle exec ruby app_spec.rb --color])
+end
+
task :environment do
require 'app'
end
View
1 app_spec.rb
@@ -1,6 +1,7 @@
ENV['RACK_ENV'] = 'test'
require 'app'
require 'rack/mock'
+require 'spec/autorun'
describe "application" do
before(:each) do
View
17 config.ru
@@ -1,12 +1,11 @@
-begin
- # Try to require the preresolved locked set of gems.
- require File.expand_path('../.bundle/environment', __FILE__)
-rescue LoadError
- # Fall back on doing an unlocked resolve at runtime.
- require 'rubygems'
- require 'bundler'
- Bundler.setup
-end
+require 'rubygems'
+require 'bundler'
+
+Bundler.setup
+$LOAD_PATH.unshift ENV['APP_ROOT'] || File.expand_path('..', __FILE__)
+# $LOAD_PATH.unshift File.join($LOAD_PATH.first, 'lib')
+
+Encoding.default_external = 'utf-8'
if ENV['RACK_ENV'] == 'production'
log = File.new('log/sinatra.log', 'a')

0 comments on commit cc3bbf4

Please sign in to comment.
Something went wrong with that request. Please try again.