Permalink
Browse files

bundle update && add hsm_tools to Gemfile

  • Loading branch information...
1 parent 60efa62 commit 832d82353380483c0ab14c56b7f78b034718bd25 @rrix rrix committed Mar 16, 2012
Showing with 89 additions and 79 deletions.
  1. +5 −4 Gemfile
  2. +84 −75 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.3'
+gem 'hsm_tools', :path => '../hsm_tools'
gem 'bluecloth'
gem 'cancan'
@@ -10,19 +10,20 @@ gem 'jquery-rails'
gem 'paperclip', "~> 2.4"
gem 'pg'
gem 'rack-ssl-enforcer'
-gem 'rails-settings-cached', :require => 'rails-settings'
+gem 'rails-settings-cached'
+gem 'rails-settings'
gem 'will_paginate', '~> 3.0'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', " ~> 3.1.0"
+ gem 'sass-rails', " ~> 3.2.0"
end
group :development, :test do
gem 'cover_me', '>= 1.2.0'
- gem 'guard-rspec'
gem 'guard-livereload'
+ gem 'guard-rspec'
gem 'pry'
gem 'pry-doc'
gem 'rspec-rails'
View
@@ -1,36 +1,41 @@
+PATH
+ remote: ../hsm_tools
+ specs:
+ hsm_tools (0.0.1)
+ rails (~> 3.2.2)
+
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
+ mail (~> 2.4.0)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- arel (2.2.1)
+ addressable (2.2.7)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
bluecloth (2.2.0)
builder (3.0.0)
@@ -53,88 +58,88 @@ GEM
hashie
daemons (1.1.8)
database_cleaner (0.7.1)
- devise (2.0.0)
+ devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
railties (~> 3.1)
- warden (~> 1.1)
+ warden (~> 1.1.1)
diff-lcs (1.1.3)
dynamic_form (1.1.4)
em-websocket (0.3.6)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (0.12.10)
- factory_girl (2.5.1)
- activesupport
- factory_girl_rails (1.6.0)
- factory_girl (~> 2.5.0)
+ factory_girl (2.6.3)
+ activesupport (>= 2.3.9)
+ factory_girl_rails (1.7.0)
+ factory_girl (~> 2.6.0)
railties (>= 3.0.0)
ffi (1.0.11)
- guard (1.0.0)
+ guard (1.0.1)
ffi (>= 0.5.0)
thor (~> 0.14.6)
- guard-livereload (0.4.0)
+ guard-livereload (0.4.2)
em-websocket (>= 0.2.0)
guard (>= 0.10.0)
- multi_json (~> 1.0.3)
+ multi_json (~> 1.0)
guard-rspec (0.6.0)
guard (>= 0.10.0)
hashie (1.2.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.19)
- railties (~> 3.0)
+ journey (1.0.3)
+ jquery-rails (2.0.1)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
- mail (2.3.0)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- method_source (0.7.0)
+ method_source (0.7.1)
mime-types (1.17.2)
- multi_json (1.0.4)
- nokogiri (1.5.0)
+ multi_json (1.1.0)
+ nokogiri (1.5.2)
orm_adapter (0.0.6)
- paperclip (2.5.2)
+ paperclip (2.7.0)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
- pg (0.12.2)
+ pg (0.13.2)
polyglot (0.3.3)
- pry (0.9.8.1)
+ pry (0.9.8.4)
coderay (~> 1.0.5)
- method_source (~> 0.7)
- slop (>= 2.4.3, < 3)
- pry-doc (0.4.0)
+ method_source (~> 0.7.1)
+ slop (>= 2.4.4, < 3)
+ pry-doc (0.4.1)
pry (>= 0.9.0)
yard (~> 0.7.4)
- rack (1.3.6)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-ssl-enforcer (0.2.4)
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
bundler (~> 1.0)
- railties (= 3.1.3)
- rails-settings-cached (0.1.2)
+ railties (= 3.2.2)
+ rails-settings (1.0.0)
+ rails-settings-cached (0.2.1)
rails (>= 3.0.0)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -155,21 +160,24 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
- rubyzip (0.9.5)
- sass (3.1.14)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
- selenium-webdriver (2.18.0)
+ rubyzip (0.9.6.1)
+ sass (3.1.15)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ selenium-webdriver (2.20.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ ffi (~> 1.0)
+ multi_json (~> 1.0)
rubyzip
- shoulda (2.11.3)
+ shoulda (3.0.1)
+ shoulda-context (~> 1.0.0)
+ shoulda-matchers (~> 1.0.0)
+ shoulda-context (1.0.0)
+ shoulda-matchers (1.0.0)
slop (2.4.4)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -182,8 +190,8 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- warden (1.1.0)
+ tzinfo (0.3.32)
+ warden (1.1.1)
rack (>= 1.0)
will_paginate (3.0.3)
xpath (0.1.4)
@@ -205,17 +213,18 @@ DEPENDENCIES
factory_girl_rails
guard-livereload
guard-rspec
+ hsm_tools!
jquery-rails
launchy
paperclip (~> 2.4)
pg
pry
pry-doc
rack-ssl-enforcer
- rails (= 3.1.3)
+ rails-settings
rails-settings-cached
rspec-rails
- sass-rails (~> 3.1.0)
+ sass-rails (~> 3.2.0)
shoulda
thin
will_paginate (~> 3.0)

0 comments on commit 832d823

Please sign in to comment.