Permalink
Browse files

Added bootstrap-sass and tabulous, updated irbtools

  • Loading branch information...
1 parent 5dc14ec commit 962b8823ba17eee443103eb6a4875cbf545c2395 @mhinton committed Jan 23, 2012
Showing with 75 additions and 66 deletions.
  1. +3 −1 Gemfile
  2. +72 −65 Gemfile.lock
View
@@ -4,6 +4,8 @@ gem 'rails', '3.1.3'
gem 'pg'
gem 'rein' # foreign keys for mysql/postgres https://github.com/nullobject/rein
gem 'jquery-rails', '~> 1.0.19'
+gem 'bootstrap-sass', '~> 1.4.2'
+gem 'tabulous'
gem 'client_side_validations'
gem 'devise', '~> 1.4.9'
# gem 'map_by_method'
@@ -35,7 +37,7 @@ group :development, :test do
gem 'shoulda'
gem 'capybara'
- gem 'irbtools', :require => 'irbtools/configure'
+ gem 'irbtools', :require => false
gem 'itslog' # colorize log output
gem 'silent-postgres' # remove postgres cruft from logs
end
View
@@ -32,104 +32,105 @@ GEM
alias (0.2.2)
archive-tar-minitar (0.5.2)
arel (2.2.1)
- awesome_print (0.4.0)
+ awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
+ bootstrap-sass (1.4.3)
+ sass-rails (~> 3.1)
boson (0.3.4)
alias (>= 0.2.2)
hirb (>= 0.5.0)
builder (3.0.0)
bullet (2.1.0)
uniform_notifier (~> 1.0.0)
- capybara (1.1.1)
+ capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.2)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
- client_side_validations (3.1.1)
- clipboard (0.9.9)
- coderay (1.0.3)
+ client_side_validations (3.1.4)
+ clipboard (1.0.0)
+ coderay (1.0.5)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
- columnize (0.3.4)
- database_cleaner (0.6.7)
+ coffee-script-source (1.2.0)
+ colored (1.2)
+ columnize (0.3.6)
+ database_cleaner (0.7.1)
devise (1.4.9)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
diff-lcs (1.1.3)
erubis (2.7.0)
- every_day_irb (1.1.0.pre.3)
- execjs (1.2.9)
+ every_day_irb (1.2.0)
+ execjs (1.2.13)
multi_json (~> 1.0)
- factory_girl (2.2.0)
+ factory_girl (2.4.0)
activesupport
- factory_girl_rails (1.3.0)
- factory_girl (~> 2.2.0)
+ factory_girl_rails (1.5.0)
+ factory_girl (~> 2.4.0)
railties (>= 3.0.0)
- fancy_irb (0.7.1)
+ fancy_irb (0.7.2)
paint (>= 0.8.1)
unicode-display_width (>= 0.1.1)
- ffi (1.0.9)
- g (1.4.0)
- ruby-growl (>= 1.0.1)
+ ffi (1.0.11)
+ g (1.6.0)
+ ruby_gntp
hike (1.2.1)
- hirb (0.5.0)
+ hirb (0.6.0)
i18n (0.6.0)
interactive_editor (0.0.10)
spoon (>= 0.0.1)
- irbtools (1.1.0.pre.3)
- awesome_print (~> 0.4.0)
+ irbtools (1.2.0)
+ awesome_print (~> 1.0.2)
boson (>= 0.3.4)
- clipboard (>= 0.9.9)
- coderay (~> 1.0.0)
- every_day_irb (>= 1.1.0.pre.3)
- fancy_irb (>= 0.7.1)
- g (>= 1.4.0)
- hirb (~> 0.5.0)
+ clipboard (~> 1.0.0)
+ coderay (~> 1.0.5)
+ every_day_irb (>= 1.2.0)
+ fancy_irb (>= 0.7.2)
+ g (>= 1.5.0)
+ hirb (~> 0.6.0)
interactive_editor (>= 0.0.10)
- looksee (~> 1.0.3)
method_locator (>= 0.0.4)
- methodfinder (>= 1.2.3)
+ method_source (>= 0.7.0)
+ methodfinder (>= 1.2.5)
ori (~> 0.1.0)
- paint (>= 0.8.3)
- rvm_loader (>= 1.0.0)
+ paint (>= 0.8.4)
sketches (>= 0.1.1)
wirb (>= 0.4.1)
zucker (>= 11)
itslog (0.6.1)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.2)
- json_pure (1.6.1)
- kgio (2.6.0)
+ json (1.6.5)
+ kgio (2.7.2)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
- looksee (1.0.3)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_locator (0.0.4)
- methodfinder (1.2.4)
+ method_source (0.7.0)
+ methodfinder (1.2.5)
mime-types (1.17.2)
multi_json (1.0.4)
nokogiri (1.5.0)
ori (0.1.0)
- orm_adapter (0.0.5)
- paint (0.8.3)
- pg (0.11.0)
+ orm_adapter (0.0.6)
+ paint (0.8.4)
+ pg (0.12.2)
polyglot (0.3.3)
- rack (1.3.5)
+ rack (1.3.6)
rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
@@ -157,21 +158,23 @@ GEM
thor (~> 0.14.6)
raindrops (0.8.0)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rein (0.8.1)
+ activerecord
+ 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.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.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)
@@ -180,22 +183,20 @@ GEM
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
- ruby-growl (3.0)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- rubyzip (0.9.4)
- rvm_loader (1.0.0)
- sass (3.1.10)
- sass-rails (3.1.4)
+ ruby_gntp (0.3.4)
+ rubyzip (0.9.5)
+ sass (3.1.12)
+ sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.4)
- sprockets (~> 2.0.0)
+ sass (~> 3.1.10)
tilt (~> 1.3.2)
- selenium-webdriver (2.10.0)
- childprocess (>= 0.2.1)
- ffi (= 1.0.9)
- json_pure
+ selenium-webdriver (2.16.0)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0.9)
+ multi_json (~> 1.0.4)
rubyzip
shoulda (2.11.3)
silent-postgres (0.1.1)
@@ -205,13 +206,16 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
+ tabulous (1.1.0)
+ colored (~> 1.2.0)
+ rails (~> 3.0)
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)
+ uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
unicode-display_width (0.1.1)
@@ -231,6 +235,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ bootstrap-sass (~> 1.4.2)
bullet
capybara
client_side_validations
@@ -244,10 +249,12 @@ DEPENDENCIES
pg
rails (= 3.1.3)
rails-footnotes
+ rein
rspec-rails
ruby-debug19
sass-rails (~> 3.1.0)
shoulda
silent-postgres
+ tabulous
uglifier
unicorn

0 comments on commit 962b882

Please sign in to comment.