From 6e7b19f8e1755a2e6b21a8d2be6eb70a238a7222 Mon Sep 17 00:00:00 2001 From: yclian Date: Fri, 25 May 2012 21:21:26 +0800 Subject: [PATCH] Update build/run instructions, .rvmrc (why are we committing it?), Gemfile and Gemfile.lock. Moving away from ruby-debugger-* but debugger. [Fixes #30181343] --- .rvmrc | 2 +- Gemfile | 16 ++++--- Gemfile.lock | 115 ++++++++++++++++++++++----------------------------- HACKING.md | 28 +++++++++++-- 4 files changed, 85 insertions(+), 76 deletions(-) diff --git a/.rvmrc b/.rvmrc index b390e5b..dcf2464 100644 --- a/.rvmrc +++ b/.rvmrc @@ -1,3 +1,3 @@ -rvm use 1.9.2-p290 +rvm use 1.9.2-p320 rvm gemset use kratos diff --git a/Gemfile b/Gemfile index 44e2f70..d4b0475 100644 --- a/Gemfile +++ b/Gemfile @@ -35,11 +35,14 @@ gem 'jquery-rails' # gem 'capistrano' group :development do - gem 'linecache19' - gem 'ruby-debug-base19' - gem 'ruby-debug19', :require => 'ruby-debug' - gem 'ruby-debug-ide' - gem 'sqlite3' + # Too many mysteries behind, use 'debugger' instead. + # See: http://stackoverflow.com/a/10024840/36397 + gem 'debugger' + # gem 'linecache19' + # gem 'ruby-debug-base19' + # gem 'ruby-debug19', :require => 'ruby-debug' + # I reckon the developer should gem install this manually. + # gem 'ruby-debug-ide' # Heroku # See: https://devcenter.heroku.com/articles/taps gem 'taps' @@ -52,6 +55,9 @@ group :development, :test do end group :test do + # Test is run locally, not on Heroku except CI + # See: http://stackoverflow.com/q/5035828/36397 + gem 'sqlite3' # Cucumber dependencies # gem 'cucumber-rails' # gem 'cucumber-api-steps' diff --git a/Gemfile.lock b/Gemfile.lock index 9a399d7..0535479 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,10 +29,8 @@ GEM activesupport (= 3.1.1) activesupport (3.1.1) multi_json (~> 1.0) - archive-tar-minitar (0.5.2) - arel (2.2.1) + arel (2.2.3) bcrypt-ruby (3.0.1) - bcrypt-ruby (3.0.1-x86-mingw32) builder (3.0.0) cancan (1.6.7) coffee-rails (3.1.1) @@ -41,50 +39,55 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.2) + coffee-script-source (1.3.3) columnize (0.3.6) composite_primary_keys (4.1.2) activerecord (~> 3.1) - database_cleaner (0.7.1) - devise (1.5.2) + database_cleaner (0.7.2) + debugger (1.1.3) + columnize (>= 0.3.1) + debugger-linecache (~> 1.1.1) + debugger-ruby_core_source (~> 1.1.2) + debugger-linecache (1.1.1) + debugger-ruby_core_source (>= 1.1.1) + debugger-ruby_core_source (1.1.2) + devise (2.1.0) bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) - warden (~> 1.1) + orm_adapter (~> 0.0.7) + railties (~> 3.1) + warden (~> 1.1.1) diff-lcs (1.1.3) enumerated_attribute (0.2.16) meta_programming (>= 0.2.1) erubis (2.7.0) - execjs (1.2.9) + execjs (1.4.0) multi_json (~> 1.0) - factory_girl (2.6.1) - activesupport (>= 2.3.9) - factory_girl_rails (1.7.0) - factory_girl (~> 2.6.0) + factory_girl (3.3.0) + activesupport (>= 3.0.0) + factory_girl_rails (3.3.0) + factory_girl (~> 3.3.0) railties (>= 3.0.0) hike (1.2.1) i18n (0.6.0) - jquery-rails (1.0.18) + jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - json (1.6.1) - json_spec (1.0.0) + json (1.7.3) + json_spec (1.0.3) multi_json (~> 1.0) rspec (~> 2.0) - linecache19 (0.5.12) - ruby_core_source (>= 0.1.4) - mail (2.3.0) + mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) meta_programming (0.2.2) - mime-types (1.17.2) - multi_json (1.0.3) - orm_adapter (0.0.5) + mime-types (1.18) + multi_json (1.3.5) + orm_adapter (0.0.7) pg (0.13.2) - pg (0.13.2-x86-mingw32) polyglot (0.3.3) - rack (1.3.5) - rack-cache (1.1) + rack (1.3.6) + rack-cache (1.2) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -108,36 +111,24 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2.2) - rdoc (3.11) + rdoc (3.12) json (~> 1.4) rest-client (1.6.7) mime-types (>= 1.16) - rspec (2.8.0) - rspec-core (~> 2.8.0) - rspec-expectations (~> 2.8.0) - rspec-mocks (~> 2.8.0) - rspec-core (2.8.0) - rspec-expectations (2.8.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.8.0) - rspec-rails (2.8.1) + rspec (2.10.0) + rspec-core (~> 2.10.0) + rspec-expectations (~> 2.10.0) + rspec-mocks (~> 2.10.0) + rspec-core (2.10.1) + rspec-expectations (2.10.0) + diff-lcs (~> 1.1.3) + rspec-mocks (2.10.1) + rspec-rails (2.10.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.8.0) - ruby-debug-base19 (0.11.25) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby_core_source (>= 0.1.4) - ruby-debug-ide (0.4.16) - rake (>= 0.8.1) - ruby-debug19 (0.11.6) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby-debug-base19 (>= 0.11.19) - ruby_core_source (0.1.5) - archive-tar-minitar (>= 0.5.2) - sass (3.1.15) + rspec (~> 2.10.0) + sass (3.1.18) sass-rails (3.1.4) actionpack (~> 3.1.0) railties (~> 3.1.0) @@ -150,64 +141,56 @@ GEM shoulda-matchers (~> 1.0.0) shoulda-context (1.0.0) shoulda-matchers (1.0.0) - simple_form (2.0.1) + simple_form (2.0.2) actionpack (~> 3.0) activemodel (~> 3.0) sinatra (1.0) rack (>= 1.0) - sprockets (2.0.3) + sprockets (2.0.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.4) - sqlite3 (1.3.4-x86-mingw32) - sqlite3-ruby (1.3.3) - sqlite3 (>= 1.3.3) - taps (0.3.23) + sqlite3 (1.3.6) + taps (0.3.24) rack (>= 1.0.1) rest-client (>= 1.4.0, < 1.7.0) sequel (~> 3.20.0) sinatra (~> 1.0.0) - sqlite3-ruby (~> 1.2) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) - uglifier (1.0.4) + tzinfo (0.3.33) + uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) uuidtools (2.1.2) validatious (0.4.0) activemodel - warden (1.1.0) + warden (1.1.1) rack (>= 1.0) - yaml_db (0.2.2) + yaml_db (0.2.3) PLATFORMS ruby - x86-mingw32 DEPENDENCIES cancan coffee-rails (~> 3.1.1) composite_primary_keys database_cleaner + debugger devise enumerated_attribute factory_girl_rails jquery-rails json_spec - linecache19 pg rack-test rails (= 3.1.1) rake rspec-rails - ruby-debug-base19 - ruby-debug-ide - ruby-debug19 sass-rails (= 3.1.4) shoulda simple_form diff --git a/HACKING.md b/HACKING.md index f77d784..5757070 100644 --- a/HACKING.md +++ b/HACKING.md @@ -11,6 +11,13 @@ Environment rvm gemset create kratos rvm gemset use kratos gem install bundler + +Then, install the gems with: + + bundle install + +Or (if you are not gonna develop but deploy): + bundle install --without development # Quick Setup (Windows) @@ -24,9 +31,10 @@ Environment gem update rails rake rails:update -# Database +Database +-------- -## Creation +# Creation The default settings use SQLite and if you are looking for a GUI tool, [SQLite Manager](http://code.google.com/p/sqlite-manager/) is the right choice. @@ -42,7 +50,7 @@ The dumps in `fixtures/dumps` are created via: rake db:seed (please check commented lines in seeds.rb) rm -rf db/fixtures/dumps && rake db:data:dump_dir dir="fixtures/dumps" -## PostgreSQL +# PostgreSQL At the point of writing, Kratos is deployed to Heroku that requires a PostgreSQL set up. @@ -51,7 +59,7 @@ At the point of writing, Kratos is deployed to Heroku that requires a PostgreSQL sudo apt-get install postgresql libpq-dev bundle install -## Changes +# Changes If the schema is changed (certainly through `rake db:migrate`), besides of creating new dumps, you also need to do a [migration for your tests](http://stackoverflow.com/q/4949319) to work: @@ -60,3 +68,15 @@ If the schema is changed (certainly through `rake db:migrate`), besides of creat This can also be achieved with: rake RAILS_ENV=test db:migrate + +Running +------- + +If you want to quickly boot up an instance, run: + + rails s + +If it fails with missing development gems, install the gems by hand or run the production mode instead: + + rails -e production s +