Merge pull request #93 from johnmcdowall/clean_up_gemfile

Consistent use of Ruby 1.9 hash syntax, consistent use of apostrophe style

Gemfile

@@ -1,36 +1,51 @@
 source 'https://rubygems.org'
 
-gem 'slim'  # required for sidekiq-web
+gem 'active_model_serializers', git: 'git://github.com/rails-api/active_model_serializers.git'
+gem 'ember-rails', git: 'git://github.com/emberjs/ember-rails.git' # so we get the pre version
+gem 'rack-mini-profiler', git: 'git://github.com/SamSaffron/MiniProfiler'
+gem 'vestal_versions', git: 'git://github.com/zhangyuan/vestal_versions'
+
+gem 'message_bus', path: 'vendor/gems/message_bus'
+gem 'rails_multisite', path: 'vendor/gems/rails_multisite'
+gem 'simple_handlebars_rails', path: 'vendor/gems/simple_handlebars_rails'
+
+gem 'activerecord-postgres-hstore'
+gem 'acts_as_paranoid'
+gem 'airbrake', '3.1.2' # errbit is broken with 3.1.3 for now
+gem 'clockwork', require: false
+gem 'em-redis'
+gem 'eventmachine'
+gem 'fast_xs'
+gem 'fastimage'
+gem 'fog', require: false
+gem 'has_ip_address'
+gem 'hiredis'
+gem 'hpricot'
+gem 'i18n-js'
+gem 'jquery-rails'
+gem 'koala', require: false
+gem 'multi_json'
+gem 'mustache'
+gem 'nokogiri'
+gem 'oauth', require: false
+gem 'oj'
+gem 'pbkdf2'
+gem 'pg'
+gem 'rails'
+gem 'rake'
 gem 'redis'
 gem 'redis-rails'
-gem 'hiredis'
-gem 'em-redis'
-gem 'rails'
-gem 'pg'
-gem 'sass'
-gem 'rake'
-# errbit is broken with 3.1.3 for now
-gem 'airbrake', "3.1.2"
 gem 'rest-client'
-gem 'acts_as_paranoid'
+gem 'rinku'
-gem 'activerecord-postgres-hstore'
+gem 'ruby-openid', require: 'openid'
-gem 'sidekiq'
-gem 'fastimage'
-gem 'nokogiri'
-gem 'seed-fu'
 gem 'sanitize'
-
+gem 'sass'
-gem 'sinatra', :require => nil
+gem 'seed-fu'
-gem 'clockwork', :require => false
+gem 'sidekiq'
-
+gem 'sinatra', require: nil
-gem 'i18n-js'
+gem 'slim'  # required for sidekiq-web
-# gem 'rack-mini-profiler', '0.1.21'
+gem 'therubyracer', require: 'v8'
-# gem 'rack-mini-profiler', :path => '/home/sam/Source/MiniProfiler'
+gem 'thin'
-gem 'rack-mini-profiler', :git => 'git://github.com/SamSaffron/MiniProfiler'
-gem 'oauth', :require => false
-gem 'fast_xs'
-gem 'pbkdf2'
-gem 'simple_handlebars_rails', path: 'vendor/gems/simple_handlebars_rails'
 
 # Gem that enables support for plugins. It is required
 gem 'discourse_plugin', path: 'vendor/gems/discourse_plugin'
@@ -42,70 +57,37 @@ gem 'discourse_plugin', path: 'vendor/gems/discourse_plugin'
 gem 'discourse_emoji', path: 'vendor/gems/discourse_emoji'
 # gem 'discourse_task', path: 'vendor/gems/discourse_task'
 
-gem 'rails_multisite', path: 'vendor/gems/rails_multisite'
-gem 'message_bus', path: 'vendor/gems/message_bus'
-
-gem 'koala', :require => false
-gem 'multi_json'
-gem 'oj'
-gem 'eventmachine'
-gem 'thin'
-
-gem "active_model_serializers", :git => "git://github.com/rails-api/active_model_serializers.git"
-gem 'has_ip_address'
-
-gem 'vestal_versions', :git => 'git://github.com/zhangyuan/vestal_versions'
-
-gem 'fog', :require => false
-
 # Gems used only for assets and not required
 # in production environments by default.
 # allow everywhere for now cause we are allowing asset debugging in prd
 group :assets do
+  gem 'coffee-rails'
+  gem 'coffee-script'  # need this to compile coffee on the fly 
   gem 'sass'
   gem 'sass-rails'
-  gem 'coffee-rails'
-  gem 'uglifier'
-  # gem "asset_sync"
   gem 'turbo-sprockets-rails3'
-  # need this to compile coffee on the fly 
+  gem 'uglifier'
-  gem 'coffee-script'
 end
 
-gem 'hpricot'
-gem 'jquery-rails'
-
-gem "ember-rails", :git => 'git://github.com/emberjs/ember-rails.git' # so we get the pre version
-gem 'mustache'
-gem 'therubyracer', :require => 'v8'
-gem 'rinku'
-
-
-gem 'ruby-openid', :require => 'openid'
-
 group :test, :development do
-  # Pretty printed test output
+  gem 'certified'
-  gem 'rspec-rails'
-  gem 'shoulda'
-  #gem 'turn', :require => false
-  gem 'jasminerice'
   gem 'fabrication'
   gem 'guard-jasmine'
   gem 'guard-rspec' 
   gem 'guard-spork'
-  gem 'mocha', :require => false
-  gem 'simplecov', :require => false
   gem 'image_optim'
-  gem 'certified'
+  gem 'jasminerice'
+  gem 'mocha', require: false
   gem 'rb-fsevent'
-  gem 'rb-inotify', '~> 0.8.8', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  gem 'rb-inotify', '~> 0.8.8', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
-  gem 'terminal-notifier-guard', :require => RUBY_PLATFORM.include?('darwin') && 'terminal-notifier-guard'
+  gem 'rspec-rails'
+  gem 'shoulda'
+  gem 'simplecov', require: false
+  gem 'terminal-notifier-guard', require: RUBY_PLATFORM.include?('darwin') && 'terminal-notifier-guard'
 end
 
 group :development do 
-  gem 'pry-rails'
   gem 'better_errors'
   gem 'binding_of_caller' # I tried adding this and got an occational crash
+  gem 'pry-rails'
 end
-
-# gem 'stacktrace', :require => false