Browse files

stuff

  • Loading branch information...
1 parent 6237359 commit d04cbd0ed8a1e75dd9634479ef39546568e18bd3 @kirel committed May 20, 2011
Showing with 10 additions and 25 deletions.
  1. +3 −6 Gemfile
  2. +7 −11 Gemfile.lock
  3. +0 −8 Rakefile
View
9 Gemfile
@@ -1,22 +1,19 @@
-# A sample Gemfile
-source :gemcutter
-#
gem "json"
gem "sinatra"
gem "rest-client", :require => 'rest_client'
gem "httparty"
gem "armchair"
-# gem "couchrest"
+gem "couchrest"
gem "threadify"
gem "thin" # for deployment on heroku
group :test do
- gem "rspec"
+ gem "rspec", '<2'
gem "fakeweb"
gem "rack-test"
end
group :rake do
gem "rake"
gem "aws-s3"
-end
+end
View
18 Gemfile.lock
@@ -1,5 +1,4 @@
GEM
- remote: http://rubygems.org/
specs:
armchair (0.0.2)
json
@@ -9,9 +8,12 @@ GEM
mime-types
xml-simple
builder (3.0.0)
+ couchrest (1.0.2)
+ json (~> 1.5.1)
+ mime-types (~> 1.15)
+ rest-client (~> 1.6.1)
crack (0.1.8)
daemons (1.1.0)
- diff-lcs (1.1.2)
eventmachine (0.12.10)
fakeweb (1.3.0)
httparty (0.7.4)
@@ -24,14 +26,7 @@ GEM
rake (0.8.7)
rest-client (1.6.1)
mime-types (>= 1.16)
- rspec (2.5.0)
- rspec-core (~> 2.5.0)
- rspec-expectations (~> 2.5.0)
- rspec-mocks (~> 2.5.0)
- rspec-core (2.5.1)
- rspec-expectations (2.5.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.5.0)
+ rspec (1.3.2)
sinatra (1.1.3)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
@@ -49,13 +44,14 @@ PLATFORMS
DEPENDENCIES
armchair
aws-s3
+ couchrest
fakeweb
httparty
json
rack-test
rake
rest-client
- rspec
+ rspec (< 2)
sinatra
thin
threadify
View
8 Rakefile
@@ -1,5 +1,4 @@
require 'rubygems'
-require 'spec/rake/spectask'
$LOAD_PATH << ::File.join(::File.dirname(__FILE__), 'lib')
@@ -8,13 +7,6 @@ require 'rake/populate_task'
require 'rake/benchmark_task'
require 'rake/setup_task'
-task :default => [:spec]
-
-Spec::Rake::SpecTask.new do |t|
- t.warning = true
- #t.rcov = false
-end
-
SymbolTask.new
PopulateTask.new
BenchmarkTask.new

0 comments on commit d04cbd0

Please sign in to comment.