Merge branch 'master' of github.com:rll/cs_comments_service
This commit is contained in:
Rocky Duan
Коммит
3c5aee7dfd
|
|
@ -17,7 +17,6 @@ tmp
|
|||
_yardoc
|
||||
doc/
|
||||
|
||||
Gemfile.lock
|
||||
*.sqlite3
|
||||
.*.swp
|
||||
.*.swo
|
||||
|
|
|
|||
15
Gemfile
15
Gemfile
|
|
@ -1,4 +1,5 @@
|
|||
source :rubygems
|
||||
ruby "1.9.3"
|
||||
|
||||
gem 'pry'
|
||||
gem 'pry-nav'
|
||||
|
|
@ -12,7 +13,6 @@ gem 'sinatra'
|
|||
|
||||
gem 'yajl-ruby'
|
||||
|
||||
gem 'sqlite3'
|
||||
|
||||
gem 'ampex'
|
||||
|
||||
|
|
@ -22,14 +22,14 @@ gem 'mongoid', "~> 3.0"
|
|||
gem 'bson_ext'
|
||||
|
||||
gem 'delayed_job'
|
||||
gem 'delayed_job_mongoid', :git => 'git@github.com:dementrock/delayed_job_mongoid.git'
|
||||
gem 'delayed_job_mongoid', :git => 'https://github.com/dementrock/delayed_job_mongoid.git'
|
||||
|
||||
gem 'mongoid-tree', :git => 'git@github.com:dementrock/mongoid-tree.git'
|
||||
gem 'voteable_mongo', :git => 'git@github.com:dementrock/voteable_mongo.git'
|
||||
gem 'mongoid_taggable_with_context', :git => 'git@github.com:dementrock/mongoid_taggable_with_context.git'
|
||||
gem 'mongoid_magic_counter_cache', :git => 'git@github.com:dementrock/mongoid-magic-counter-cache.git'
|
||||
gem 'mongoid-tree', :git => 'https://github.com/dementrock/mongoid-tree.git'
|
||||
gem 'voteable_mongo', :git => 'https://github.com/dementrock/voteable_mongo.git'
|
||||
gem 'mongoid_taggable_with_context', :git => 'https://github.com/dementrock/mongoid_taggable_with_context.git'
|
||||
gem 'mongoid_magic_counter_cache', :git => 'https://github.com/dementrock/mongoid-magic-counter-cache.git'
|
||||
|
||||
gem 'kaminari', :require => 'kaminari/sinatra', :git => 'git@github.com:dementrock/kaminari.git'
|
||||
gem 'kaminari', :require => 'kaminari/sinatra', :git => 'https://github.com/dementrock/kaminari.git'
|
||||
|
||||
gem 'faker'
|
||||
|
||||
|
|
@ -47,3 +47,4 @@ group :test do
|
|||
gem 'rspec'
|
||||
gem 'rack-test', :require => "rack/test"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,179 @@
|
|||
GIT
|
||||
remote: https://github.com/dementrock/delayed_job_mongoid.git
|
||||
revision: 48b1420d59bc01e0b1aba1c2ad66bda4a5e04b9a
|
||||
specs:
|
||||
delayed_job_mongoid (1.0.8)
|
||||
delayed_job (~> 3.0.0)
|
||||
mongoid (>= 3.0.0.rc)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/dementrock/kaminari.git
|
||||
revision: 82a38e07db1ca1598c8daf073a8f6be22ae714d6
|
||||
specs:
|
||||
kaminari (0.13.0)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/dementrock/mongoid-magic-counter-cache.git
|
||||
revision: 28bc5e617cab19187b323e7d97d49fe73a7de68a
|
||||
specs:
|
||||
mongoid_magic_counter_cache (0.1.1)
|
||||
mongoid (>= 3.0)
|
||||
rake
|
||||
|
||||
GIT
|
||||
remote: https://github.com/dementrock/mongoid-tree.git
|
||||
revision: 5aa7a4ee16cd90dbbcac3ad702446d2119e971df
|
||||
specs:
|
||||
mongoid-tree (1.0.0)
|
||||
mongoid (>= 3.0, <= 4.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/dementrock/mongoid_taggable_with_context.git
|
||||
revision: 7cf165bd828f969cdd386102eed04ac35431a920
|
||||
specs:
|
||||
mongoid_taggable_with_context (0.8.1.1)
|
||||
mongoid (>= 3.0.1)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/dementrock/voteable_mongo.git
|
||||
revision: 538e86856daa1c180ba80b7c6f2805e531ba420c
|
||||
specs:
|
||||
voteable_mongo (0.9.3)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionpack (3.2.8)
|
||||
activemodel (= 3.2.8)
|
||||
activesupport (= 3.2.8)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.4)
|
||||
rack (~> 1.4.0)
|
||||
rack-cache (~> 1.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.1.3)
|
||||
activemodel (3.2.8)
|
||||
activesupport (= 3.2.8)
|
||||
builder (~> 3.0.0)
|
||||
activesupport (3.2.8)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
ampex (2.0.0)
|
||||
blankslate
|
||||
blankslate (2.1.2.4)
|
||||
bson (1.6.4)
|
||||
bson_ext (1.6.4)
|
||||
bson (~> 1.6.4)
|
||||
builder (3.0.0)
|
||||
coderay (1.0.7)
|
||||
columnize (0.3.6)
|
||||
debugger (1.2.0)
|
||||
columnize (>= 0.3.1)
|
||||
debugger-linecache (~> 1.1.1)
|
||||
debugger-ruby_core_source (~> 1.1.3)
|
||||
debugger-linecache (1.1.2)
|
||||
debugger-ruby_core_source (>= 1.1.1)
|
||||
debugger-ruby_core_source (1.1.3)
|
||||
delayed_job (3.0.3)
|
||||
activesupport (~> 3.0)
|
||||
diff-lcs (1.1.3)
|
||||
erubis (2.7.0)
|
||||
faker (1.0.1)
|
||||
i18n (~> 0.4)
|
||||
hashr (0.0.21)
|
||||
hike (1.2.1)
|
||||
i18n (0.6.0)
|
||||
journey (1.0.4)
|
||||
method_source (0.8)
|
||||
mime-types (1.19)
|
||||
mongo (1.6.4)
|
||||
bson (~> 1.6.4)
|
||||
mongoid (3.0.4)
|
||||
activemodel (~> 3.1)
|
||||
moped (~> 1.1)
|
||||
origin (~> 1.0)
|
||||
tzinfo (~> 0.3.22)
|
||||
moped (1.2.0)
|
||||
multi_json (1.3.6)
|
||||
nokogiri (1.5.5)
|
||||
origin (1.0.6)
|
||||
pry (0.9.10)
|
||||
coderay (~> 1.0.5)
|
||||
method_source (~> 0.8)
|
||||
slop (~> 3.3.1)
|
||||
pry-nav (0.2.2)
|
||||
pry (~> 0.9.10)
|
||||
rack (1.4.1)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
rack-protection (1.2.0)
|
||||
rack
|
||||
rack-test (0.6.1)
|
||||
rack (>= 1.0)
|
||||
rake (0.9.2.2)
|
||||
rdiscount (1.6.8)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
rspec (2.11.0)
|
||||
rspec-core (~> 2.11.0)
|
||||
rspec-expectations (~> 2.11.0)
|
||||
rspec-mocks (~> 2.11.0)
|
||||
rspec-core (2.11.1)
|
||||
rspec-expectations (2.11.2)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-mocks (2.11.2)
|
||||
sinatra (1.3.3)
|
||||
rack (~> 1.3, >= 1.3.6)
|
||||
rack-protection (~> 1.2)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
slop (3.3.2)
|
||||
sprockets (2.1.3)
|
||||
hike (~> 1.2)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
tilt (1.3.3)
|
||||
tire (0.4.2)
|
||||
activemodel (>= 3.0)
|
||||
hashr (~> 0.0.19)
|
||||
multi_json (~> 1.0)
|
||||
rake
|
||||
rest-client (~> 1.6)
|
||||
tire-contrib (0.1.1)
|
||||
tire
|
||||
tzinfo (0.3.33)
|
||||
yajl-ruby (1.1.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
ampex
|
||||
bson_ext
|
||||
bundler
|
||||
debugger
|
||||
delayed_job
|
||||
delayed_job_mongoid!
|
||||
faker
|
||||
kaminari!
|
||||
mongo
|
||||
mongoid (~> 3.0)
|
||||
mongoid-tree!
|
||||
mongoid_magic_counter_cache!
|
||||
mongoid_taggable_with_context!
|
||||
moped
|
||||
nokogiri
|
||||
pry
|
||||
pry-nav
|
||||
rack-test
|
||||
rake
|
||||
rdiscount
|
||||
rest-client
|
||||
rspec
|
||||
sinatra
|
||||
tire
|
||||
tire-contrib
|
||||
voteable_mongo!
|
||||
yajl-ruby
|
||||
|
|
@ -0,0 +1 @@
|
|||
web: bundle exec ruby app.rb -e staging2 -p $PORT
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
require './app'
|
||||
run Sinatra::Application
|
||||
|
||||
|
|
@ -12,6 +12,24 @@ test:
|
|||
hosts:
|
||||
- localhost:27017
|
||||
|
||||
staging2:
|
||||
sessions:
|
||||
default:
|
||||
database: cs_comments_service_staging
|
||||
hosts:
|
||||
- alex.mongohq.com:10079
|
||||
username: forum
|
||||
password: forum
|
||||
|
||||
staging:
|
||||
sessions:
|
||||
default:
|
||||
database: cs_comments_service_staging
|
||||
hosts:
|
||||
- ds037047.mongolab.com:37047
|
||||
username: forum
|
||||
password: forum
|
||||
|
||||
defaults: &defaults
|
||||
use_utc: false
|
||||
use_activesupport_time_zone: true
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче