Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Gem updates

  • Loading branch information...
commit 06f14a52cb6818fa143fad49a203d5e173fe67ac 1 parent d67f18a
Andrew Wei authored

Showing 2 changed files with 92 additions and 21 deletions. Show diff stats Hide diff stats

  1. +13 4 Gemfile
  2. +79 17 Gemfile.lock
17 Gemfile
@@ -2,13 +2,11 @@ source 'https://rubygems.org'
2 2
3 3 gem 'rails', '3.2.11'
4 4 gem 'pg'
5   -#gem 'sqlite3'
6 5 gem 'thin'
7 6 gem 'jquery-rails'
8 7 gem 'authlogic'
9 8 gem 'will_paginate'
10 9 gem 'bootstrap-will_paginate'
11   -gem 'wikipedia-client'
12 10 gem 'high_voltage'
13 11 gem 'acts-as-taggable-on'
14 12 gem 'htmlentities'
@@ -16,12 +14,23 @@ gem 'awesome_print'
16 14 gem 'sitemap_generator', '~> 3.4'
17 15 gem 'carrierwave'
18 16 gem 'fog'
19   -gem 'newrelic_rpm'
20 17 gem 'paperclip', '~> 3.0'
21 18 gem 'aws-sdk'
22 19 gem 'paper_trail', '~> 2'
23 20 gem 'awesome_nested_fields'
24   -gem 'iron_cache_rails'
  21 +
  22 +group :production do
  23 + gem 'newrelic_rpm'
  24 + gem 'iron_cache_rails'
  25 +end
  26 +
  27 +gem 'rspec-rails', :group => [:test, :development]
  28 +group :test do
  29 + gem 'factory_girl_rails'
  30 + gem 'capybara'
  31 + gem 'guard-rspec'
  32 + gem 'rb-inotify', '~> 0.8.8'
  33 +end
25 34
26 35 group :assets do
27 36 gem 'sass-rails', '~> 3.2.3'
96 Gemfile.lock
@@ -45,10 +45,20 @@ GEM
45 45 bootstrap-will_paginate (0.0.9)
46 46 will_paginate
47 47 builder (3.0.4)
48   - carrierwave (0.7.1)
  48 + capybara (2.0.2)
  49 + mime-types (>= 1.16)
  50 + nokogiri (>= 1.3.3)
  51 + rack (>= 1.0.0)
  52 + rack-test (>= 0.5.4)
  53 + selenium-webdriver (~> 2.0)
  54 + xpath (~> 1.0.0)
  55 + carrierwave (0.8.0)
49 56 activemodel (>= 3.2.0)
50 57 activesupport (>= 3.2.0)
  58 + childprocess (0.3.7)
  59 + ffi (~> 1.0, >= 1.0.6)
51 60 cocaine (0.4.2)
  61 + coderay (1.0.8)
52 62 coffee-rails (3.2.2)
53 63 coffee-script (>= 2.2.0)
54 64 railties (~> 3.2.0)
@@ -57,12 +67,19 @@ GEM
57 67 execjs
58 68 coffee-script-source (1.4.0)
59 69 daemons (1.1.9)
  70 + diff-lcs (1.1.3)
60 71 erubis (2.7.0)
61 72 eventmachine (1.0.0)
62 73 excon (0.16.10)
63 74 execjs (1.4.0)
64 75 multi_json (~> 1.0)
65   - fog (1.8.0)
  76 + factory_girl (4.2.0)
  77 + activesupport (>= 3.0.0)
  78 + factory_girl_rails (4.2.0)
  79 + factory_girl (~> 4.2.0)
  80 + railties (>= 3.0.0)
  81 + ffi (1.3.1)
  82 + fog (1.9.0)
66 83 builder
67 84 excon (~> 0.14)
68 85 formatador (~> 0.2.0)
@@ -73,36 +90,47 @@ GEM
73 90 nokogiri (~> 1.5.0)
74 91 ruby-hmac
75 92 formatador (0.2.4)
  93 + guard (1.6.1)
  94 + listen (>= 0.6.0)
  95 + lumberjack (>= 1.0.2)
  96 + pry (>= 0.9.10)
  97 + thor (>= 0.14.6)
  98 + guard-rspec (2.4.0)
  99 + guard (>= 1.1)
  100 + rspec (~> 2.11)
76 101 high_voltage (1.2.1)
77 102 hike (1.2.1)
78 103 htmlentities (4.3.1)
79   - httparty (0.9.0)
  104 + httparty (0.10.2)
80 105 multi_json (~> 1.0)
81   - multi_xml
  106 + multi_xml (>= 0.5.2)
82 107 i18n (0.6.1)
83   - iron_cache (1.3.0)
84   - iron_core (>= 0.4.2)
  108 + iron_cache (1.4.0)
  109 + iron_core (>= 0.5.1)
85 110 iron_cache_rails (0.1.4)
86 111 iron_cache (>= 1)
87 112 iron_core (0.5.1)
88 113 rest (>= 2.2.0)
89 114 journey (1.0.4)
90   - jquery-rails (2.1.4)
  115 + jquery-rails (2.2.0)
91 116 railties (>= 3.0, < 5.0)
92 117 thor (>= 0.14, < 2.0)
93 118 json (1.7.6)
  119 + listen (0.7.2)
  120 + lumberjack (1.0.2)
94 121 mail (2.4.4)
95 122 i18n (>= 0.4.0)
96 123 mime-types (~> 1.16)
97 124 treetop (~> 1.4.8)
  125 + method_source (0.8.1)
98 126 mime-types (1.19)
99 127 multi_json (1.5.0)
100   - multi_xml (0.5.1)
  128 + multi_xml (0.5.2)
101 129 net-http-persistent (2.8)
102 130 net-scp (1.0.4)
103 131 net-ssh (>= 1.99.1)
104   - net-ssh (2.6.2)
105   - newrelic_rpm (3.5.4.34)
  132 + net-ssh (2.6.3)
  133 + newrelic_rpm (3.5.6.46)
106 134 nokogiri (1.5.6)
107 135 paper_trail (2.7.0)
108 136 activerecord (~> 3.0)
@@ -115,7 +143,11 @@ GEM
115 143 mime-types
116 144 pg (0.14.1)
117 145 polyglot (0.3.3)
118   - rack (1.4.3)
  146 + pry (0.9.11.4)
  147 + coderay (~> 1.0.5)
  148 + method_source (~> 0.8)
  149 + slop (~> 3.4)
  150 + rack (1.4.4)
119 151 rack-cache (1.2)
120 152 rack (>= 0.4)
121 153 rack-ssl (1.3.2)
@@ -138,6 +170,8 @@ GEM
138 170 rdoc (~> 3.4)
139 171 thor (>= 0.14.6, < 2.0)
140 172 rake (10.0.3)
  173 + rb-inotify (0.8.8)
  174 + ffi (>= 0.5.0)
141 175 rdoc (3.12)
142 176 json (~> 1.4)
143 177 rest (2.2.0)
@@ -145,14 +179,36 @@ GEM
145 179 rest-client (>= 0.3.0)
146 180 rest-client (1.6.7)
147 181 mime-types (>= 1.16)
  182 + rspec (2.12.0)
  183 + rspec-core (~> 2.12.0)
  184 + rspec-expectations (~> 2.12.0)
  185 + rspec-mocks (~> 2.12.0)
  186 + rspec-core (2.12.2)
  187 + rspec-expectations (2.12.1)
  188 + diff-lcs (~> 1.1.3)
  189 + rspec-mocks (2.12.1)
  190 + rspec-rails (2.12.2)
  191 + actionpack (>= 3.0)
  192 + activesupport (>= 3.0)
  193 + railties (>= 3.0)
  194 + rspec-core (~> 2.12.0)
  195 + rspec-expectations (~> 2.12.0)
  196 + rspec-mocks (~> 2.12.0)
148 197 ruby-hmac (0.4.0)
149   - sass (3.2.3)
150   - sass-rails (3.2.5)
  198 + rubyzip (0.9.9)
  199 + sass (3.2.5)
  200 + sass-rails (3.2.6)
151 201 railties (~> 3.2.0)
152 202 sass (>= 3.1.10)
153 203 tilt (~> 1.3)
  204 + selenium-webdriver (2.29.0)
  205 + childprocess (>= 0.2.5)
  206 + multi_json (~> 1.0)
  207 + rubyzip
  208 + websocket (~> 1.0.4)
154 209 sitemap_generator (3.4)
155 210 builder
  211 + slop (3.4.3)
156 212 sprockets (2.2.2)
157 213 hike (~> 1.2)
158 214 multi_json (~> 1.0)
@@ -162,7 +218,7 @@ GEM
162 218 daemons (>= 1.0.9)
163 219 eventmachine (>= 0.12.6)
164 220 rack (>= 1.0.0)
165   - thor (0.16.0)
  221 + thor (0.17.0)
166 222 tilt (1.3.3)
167 223 treetop (1.4.12)
168 224 polyglot
@@ -172,8 +228,10 @@ GEM
172 228 execjs (>= 0.3.0)
173 229 multi_json (~> 1.0, >= 1.0.2)
174 230 uuidtools (2.1.3)
175   - wikipedia-client (1.0.0)
176   - will_paginate (3.0.3)
  231 + websocket (1.0.7)
  232 + will_paginate (3.0.4)
  233 + xpath (1.0.0)
  234 + nokogiri (~> 1.3)
177 235
178 236 PLATFORMS
179 237 ruby
@@ -185,9 +243,12 @@ DEPENDENCIES
185 243 awesome_print
186 244 aws-sdk
187 245 bootstrap-will_paginate
  246 + capybara
188 247 carrierwave
189 248 coffee-rails (~> 3.2.1)
  249 + factory_girl_rails
190 250 fog
  251 + guard-rspec
191 252 high_voltage
192 253 htmlentities
193 254 iron_cache_rails
@@ -197,9 +258,10 @@ DEPENDENCIES
197 258 paperclip (~> 3.0)
198 259 pg
199 260 rails (= 3.2.11)
  261 + rb-inotify (~> 0.8.8)
  262 + rspec-rails
200 263 sass-rails (~> 3.2.3)
201 264 sitemap_generator (~> 3.4)
202 265 thin
203 266 uglifier (>= 1.0.3)
204   - wikipedia-client
205 267 will_paginate

0 comments on commit 06f14a5

Please sign in to comment.
Something went wrong with that request. Please try again.