Skip to content

Commit f075ff9

Browse files
committed
gems updated
1 parent 93440e3 commit f075ff9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1183
-735
lines changed

.env.development

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MY_IP=
2-
RAILS_ENV=production
1+
MY_IP=127.0.0.1
2+
RAILS_ENV=development
33
PASSWORD=zaq1234
4-
PATH_TO_GITHUB_REPO=git@git.helpdocstest.com:helpiq-search/helpiq-search.git
4+
PATH_TO_GITHUB_REPO=git@github.com:dynamicguy/rails4-bp.git

.env.production

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MY_IP="162.209.48.170"
22
RAILS_ENV=production
33
PASSWORD=zaq1234
4-
PATH_TO_GITHUB_REPO="git@git.helpdocstest.com:helpiq-search/helpiq-search.git"
4+
PATH_TO_GITHUB_REPO=git@github.com:dynamicguy/rails4-bp.git

.ruby-gemset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rail4bp
1+
rail4bp

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.1
1+
2.2.2

Gemfile

Lines changed: 95 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
source 'https://rubygems.org'
1+
source 'http://rubygems.org'
22

3-
gem 'rails', :git => 'git://github.com/rails/rails.git'
4-
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
3+
gem 'rails', '4.2.3'
4+
gem 'redis-rails', :github => 'SamSaffron/redis-store'
55
gem 'rails-observers'
6-
gem 'actionpack-action_caching'
76

87
#gem 'arel', github: 'rails/arel'
98
#gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
109

1110
gem 'seed-fu', github: 'mbleigh/seed-fu'
1211

1312
gem 'hiredis'
14-
gem 'redis', :require => ["redis", "redis/connection/hiredis"]
13+
gem 'redis', :require => ['redis', 'redis/connection/hiredis']
1514

1615
ENV['DB'] ||= 'postgres'
1716

@@ -28,48 +27,51 @@ gem 'remotipart'
2827

2928
# Localization
3029
gem 'http_accept_language'
31-
gem "i18n-inflector-rails", :git => 'git://github.com/dynamicguy/i18n-inflector-rails.git'
30+
gem 'i18n-inflector-rails'#, :github => 'dynamicguy/i18n-inflector-rails'
3231
gem 'rails-i18n', '~> 4.0.0.pre'
3332

3433
# Mail
35-
gem 'markerb', '1.0.1'
36-
gem 'messagebus_ruby_api', '1.0.3'
34+
gem 'markerb', '>= 1.0.1'
35+
gem 'messagebus_ruby_api', '>= 1.0.3'
3736

3837
# Parsing
3938
gem 'multi_json'
40-
gem 'nokogiri', '1.6.0'
41-
gem 'rails_autolink', '1.1.0'
42-
gem 'redcarpet', '3.0.0'
43-
gem 'roxml', '3.1.6'
44-
gem 'ruby-oembed', '0.8.8'
45-
gem 'opengraph_parser', '0.2.3'
46-
47-
gem 'sass-rails', '~> 4.0.0'
48-
gem 'bootstrap-sass', '~> 3.0.0.0.rc'
39+
gem 'nokogiri', '>= 1.6.0'
40+
gem 'rails_autolink', '>= 1.1.0'
41+
gem 'redcarpet', '>= 3.0.0'
42+
gem 'roxml', '>= 3.1.6'
43+
gem 'ruby-oembed', '>= 0.8.8'
44+
gem 'opengraph_parser', '>= 0.2.3'
45+
46+
gem 'bootstrap-sass', '~> 3.3.6'
47+
gem 'sass-rails', '>= 3.2'
48+
4949
gem 'prettyphoto-rails'
50+
gem 'progress_bar'
5051

51-
gem "yui-compressor", "~> 0.12.0"
52+
gem 'yui-compressor'
5253
# Gems used only for assets and not required
5354
# in production environments by default.
5455
group :assets do
55-
gem "eco"
56+
gem 'eco'
5657
# Icons
57-
gem "font-awesome-rails"
58+
gem 'font-awesome-rails'
5859
#gem 'entypo-rails'
5960

6061
# CSS
6162
# Use SCSS for stylesheets
6263
#gem 'less-rails'
6364

6465
gem 'uglifier', '>= 1.3.0'
65-
gem 'coffee-rails', '~> 4.0.0'
66+
gem 'coffee-rails', '~> 4.1.0'
6667

6768
#gem 'bootstrap-sass'
68-
#gem "compass-rails", "~> 2.0.alpha.0"
69+
#gem 'compass-rails', '~> 2.0.alpha.0'
70+
6971

7072
# JavaScript
7173
#gem 'handlebars_assets', '>= 0.12.0'
72-
gem 'jquery-rails', '~> 3.0'
74+
gem 'jquery-rails'
7375

7476
# Windows and OSX have an execjs compatible runtime built-in, Linux users should
7577
# install Node.js or use 'therubyracer'.
@@ -78,6 +80,11 @@ group :assets do
7880
gem 'therubyracer', :platform => :ruby
7981
end
8082

83+
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
84+
gem 'jbuilder', '~> 2.0'
85+
# bundle exec rake doc:rails generates the API under doc/api.
86+
gem 'sdoc', '~> 0.4.0', group: :doc
87+
8188
# Build JSON APIs with ease. Read more: git://github.com/rails/jbuilder
8289
#gem 'jbuilder', '~> 1.2'
8390

@@ -98,7 +105,7 @@ gem 'slim'
98105
# this is an optional gem, it provides a high performance replacement
99106
# to String#blank? a method that is called quite frequently in current
100107
# ActiveRecord, this may change in the future
101-
gem 'fast_blank' #, github: "SamSaffron/fast_blank"
108+
gem 'fast_blank' #, github: 'SamSaffron/fast_blank'
102109

103110
# this provides a very efficient lru cache
104111
gem 'lru_redux'
@@ -107,26 +114,26 @@ gem 'lru_redux'
107114
# If you want to amend mini profiler to do the monkey patches in the railstie
108115
# we are open to it. by deferring require to the initializer we can configure disourse installs without it
109116

110-
gem 'flamegraph', git: 'git://github.com/SamSaffron/flamegraph.git', require: false
111-
gem 'rack-mini-profiler', git: 'git://github.com/MiniProfiler/rack-mini-profiler.git', require: false
117+
gem 'flamegraph', :github => 'SamSaffron/flamegraph', require: false
118+
gem 'rack-mini-profiler', :github => 'MiniProfiler/rack-mini-profiler', require: false
112119

113120
# used for caching, optional
114121
gem 'rack-cors', require: false
115122
gem 'unicorn'
116123
gem 'puma'
117-
gem "rake", '10.1.0'
124+
gem 'rake', '>= 10.1.0'
118125
gem 'bluepill'
119126

120127

121128
# Configurations
122129
gem 'configurate'
123130

124131

125-
#gem 'friendly_id', :git => "git://github.com/FriendlyId/friendly_id.git" #, :branch => 'rails4'
126-
gem "friendly_id" # Note: You MUST use 5.0.0 or greater for Rails 4.0+
132+
#gem 'friendly_id', :git => 'git://github.com/FriendlyId/friendly_id.git' #, :branch => 'rails4'
133+
gem 'friendly_id' # Note: You MUST use 5.0.0 or greater for Rails 4.0+
127134

128135
# Authentication
129-
gem "devise", github: "plataformatec/devise"
136+
gem 'devise', github: 'plataformatec/devise'
130137
gem 'cancan'
131138
gem 'rolify'
132139

@@ -138,41 +145,41 @@ gem 'omniauth-facebook'
138145
gem 'omniauth-twitter'
139146
gem 'omniauth-github'
140147
gem 'omniauth-oauth2', require: false
141-
gem 'omniauth-browserid', git: 'git://github.com/callahad/omniauth-browserid.git', branch: 'observer_api'
148+
gem 'omniauth-browserid', :github => 'callahad/omniauth-browserid', branch: 'observer_api'
142149
gem 'omniauth-cas'
143150
gem 'omniauth-tumblr'
144151
gem 'omniauth-wordpress'
145152

146153
# Tags
147-
gem 'acts-as-taggable-on', '2.4.1'
154+
gem 'acts-as-taggable-on', '>= 2.4.1'
148155

149156
# URIs and HTTP
150-
gem 'addressable', '2.3.5', :require => 'addressable/uri'
151-
gem 'faraday', '0.8.8'
152-
gem 'faraday_middleware', '0.9.0'
153-
gem 'typhoeus', '0.6.3'
157+
gem 'addressable', '>= 2.3.5', :require => 'addressable/uri'
158+
gem 'faraday'
159+
gem 'faraday_middleware'
160+
gem 'typhoeus'
154161

155162
# Views
156-
gem "country_select"
157-
gem 'awesome_nested_set', :git => 'git://github.com/collectiveidea/awesome_nested_set.git', :branch => 'master' # or any similar gem (gem 'nested_set')
158-
gem "the_sortable_tree", :git => "git://github.com/the-teacher/the_sortable_tree.git"
159-
#gem 'bootstrap-wysihtml5-rails', :require => 'bootstrap-wysihtml5-rails', :git => 'git://github.com/Nerian/bootstrap-wysihtml5-rails.git'
160-
gem 'jquery-datatables-rails', git: 'git://github.com/rweng/jquery-datatables-rails.git'
161-
gem "simple_form", git: 'git://github.com/plataformatec/simple_form.git'
163+
gem 'country_select'
164+
gem 'awesome_nested_set', :github => 'collectiveidea/awesome_nested_set', :branch => 'master' # or any similar gem (gem 'nested_set')
165+
gem 'the_sortable_tree', :github => 'the-teacher/the_sortable_tree'
166+
#gem 'bootstrap-wysihtml5-rails', :require => 'bootstrap-wysihtml5-rails', :github => 'Nerian/bootstrap-wysihtml5-rails'
167+
gem 'jquery-datatables-rails', :github => 'rweng/jquery-datatables-rails'
168+
gem 'simple_form', :github => 'plataformatec/simple_form'
162169
gem 'turbolinks', github: 'rails/turbolinks'
163170
#gem 'jquery-turbolinks'
164171
#gem 'kaminari'
165172
gem 'will_paginate', '~> 3.0.5'
166173
gem 'paper_trail', '>= 3.0.0.beta1'
167-
gem "haml-rails", github: 'indirect/haml-rails'
174+
gem 'haml-rails', github: 'indirect/haml-rails'
168175
gem 'mobile-fu'
169176

170177

171-
gem "rabl"
172-
gem 'yajl-ruby', :require => "yajl"
173-
gem "gon"
174-
#gem "rabl-rails"
175-
gem "js-routes"
178+
gem 'rabl'
179+
gem 'yajl-ruby', :require => 'yajl'
180+
gem 'gon'
181+
#gem 'rabl-rails'
182+
gem 'js-routes'
176183
gem 'responders'
177184
gem 'paginate-responder'
178185

@@ -182,26 +189,27 @@ group :production do
182189
#gem 'rails_admin', '0.4.9'
183190

184191
# Analytics
185-
gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
186-
gem 'rack-piwik', '0.2.2', :require => 'rack/piwik'
192+
gem 'rack-google-analytics', '>= 0.11.0', :require => 'rack/google-analytics'
193+
gem 'rack-piwik', '>= 0.2.2', :require => 'rack/piwik'
187194

188-
# Click-jacking protection
189-
gem 'rack-protection', '1.5.0'
195+
# Click-jacking
196+
# tion
197+
gem 'rack-protection', '>= 1.5.0'
190198

191199
# Process management
192-
gem 'foreman', '0.62'
200+
gem 'foreman', '>= 0.62'
193201

194202
# Redirects
195-
gem 'rack-rewrite', '1.3.3', :require => false
196-
gem 'rack-ssl', '1.3.3', :require => 'rack/ssl'
203+
gem 'rack-rewrite', '>= 1.3.3', :require => false
204+
gem 'rack-ssl', '>= 1.3.3', :require => 'rack/ssl'
197205

198206
# Third party asset hosting
199207
#gem 'asset_sync', '1.0.0', :require => false
200208
end
201209

202210
group :development do
203-
gem "annotate", github: "ctran/annotate_models"
204-
gem "letter_opener"
211+
gem 'annotate', github: 'ctran/annotate_models'
212+
gem 'letter_opener'
205213
#gem 'rack-mini-profiler'
206214
# Better errors handler
207215
gem 'better_errors'
@@ -218,15 +226,15 @@ group :development do
218226
#gem 'growl', require: darwin_only('growl')
219227
#gem 'rb-inotify', require: linux_only('rb-inotify')
220228

221-
gem 'capistrano', '2.15.5'
222-
gem 'capistrano-ext', '1.2.1'
229+
gem 'capistrano', '>= 2.15.5'
230+
gem 'capistrano-ext', '>= 1.2.1'
223231
gem 'meta_request'
224232

225233
# Guard
226234
gem 'guard-rspec'
227235
#gem 'spork', '> 0.9.0.rc'
228236
#gem 'guard-spork'
229-
gem 'guard-livereload', github: "guard/guard-livereload"
237+
gem 'guard-livereload', github: 'guard/guard-livereload'
230238
gem 'guard-rails'
231239

232240
gem 'berkshelf', :github => 'RiotGames/berkshelf'
@@ -243,17 +251,17 @@ end
243251

244252

245253
# solr and friends
246-
#gem "ransack", :git => "git://github.com/ernie/ransack.git"
247-
gem 'sunspot_rails' #, :git => 'git://github.com/sunspot/sunspot'
254+
#gem 'ransack', :git => 'git://github.com/ernie/ransack.git'
255+
gem 'sunspot_rails' #, :github => 'sunspot/sunspot'
248256
gem 'sunspot_solr'
249257

250258
group :test do
251259
# RSpec (unit tests, some integration tests)
252260

253-
gem 'fixture_builder', '0.3.6'
254-
gem 'fuubar', '1.1.1'
255-
gem 'rspec-instafail', '0.2.4', :require => false
256-
gem 'test_after_commit', '0.2.0'
261+
gem 'fixture_builder', '>= 0.3.6'
262+
gem 'fuubar', '>= 1.1.1'
263+
gem 'rspec-instafail', '>= 0.2.4', :require => false
264+
gem 'test_after_commit', '>= 0.2.0'
257265

258266
# Cucumber (integration tests)
259267

@@ -267,12 +275,12 @@ group :test do
267275
#gem 'timecop'
268276
gem 'webmock', :require => false
269277
gem 'email_spec'
270-
gem "sunspot_test"
278+
gem 'sunspot_test'
271279
end
272280

273281

274282
group :development, :test do
275-
gem "awesome_print"
283+
gem 'awesome_print'
276284

277285
# Generate Fake data
278286
gem 'ffaker'
@@ -284,16 +292,16 @@ group :development, :test do
284292
gem 'cucumber-rails', :require => false
285293

286294
gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
287-
gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false
295+
gem 'rb-inotify', '>= 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false
288296
gem 'terminal-notifier-guard', require: false
289297

290298
gem 'commands'
291299

292300
# Jasmine (client side application tests (JS))
293-
gem 'jasmine', '1.3.2'
294-
gem 'sinon-rails', '1.7.3'
301+
gem 'jasmine', '>= 1.3.2'
302+
gem 'sinon-rails', '>= 1.7.3'
295303

296-
#gem "rails_best_practices"
304+
#gem 'rails_best_practices'
297305

298306
gem 'mock_redis'
299307
gem 'listen', require: false
@@ -311,9 +319,18 @@ group :development, :test do
311319
gem 'pry-nav'
312320
gem 'spork-rails', :github => 'sporkrb/spork-rails'
313321

322+
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
323+
gem 'byebug'
324+
325+
# Access an IRB console on exception pages or by using <%= console %> in views
326+
gem 'web-console', '~> 2.0'
327+
328+
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
329+
gem 'spring'
330+
314331
end
315332

316-
#gem 'rails_admin', git: 'git://github.com/sferik/rails_admin.git', :branch => 'master'
333+
#gem 'rails_admin', :github => 'sferik/rails_admin', :branch => 'master'
317334
#gem 'rails_admin_tag_list'
318335

319336
# perftools only works on 1.9 atm
@@ -326,3 +343,8 @@ end
326343

327344
#gem 'active_model_serializers'
328345
#gem 'dotenv-rails', :groups => [:development, :test]
346+
# add these gems to help with the transition:
347+
gem 'protected_attributes'
348+
gem 'actionpack-page_caching'
349+
gem 'actionpack-action_caching'
350+
gem 'pace-rails'

0 commit comments

Comments
 (0)