Merge 8589e92 into fa4b6bd

.rubocop.yml

@@ -0,0 +1,37 @@
+AllCops:
+  RunRailsCops: true
+  Include:
+    - Rakefile
+    - config.ru
+  Exclude:
+    - db/schema.rb
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+  Enabled: false
+
+# disable for now
+Lint/NestedMethodDefinition:
+  Enabled: false
+Style/ClassVars:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/RescueModifier:
+  Enabled: false
+Style/AccessorMethodName:
+  Enabled: false
+Style/PredicateName:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false

.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
-rvm:
-  - 2.1.0
+sudo: false
 
 before_script:
   - "RAILS_ENV=test bundle exec rake db:setup"

Capfile

@@ -7,6 +7,7 @@ require 'capistrano/deploy'
 require 'capistrano/rails'
 #require 'capistrano/rvm'
 require 'capistrano/rbenv'
+require 'capistrano/passenger'
 
 # Whenever recipe
 require "whenever/capistrano"

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 4.2'
 
 # We <3 New Relic
 gem 'newrelic_rpm'
@@ -39,15 +39,8 @@ gem 'simple_form'
 # Datagrid is nice
 gem 'datagrid'
 
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
-
-group :test do
-  gem 'capybara'
-  gem 'poltergeist'
-end
+# Wicked gem
+gem 'wicked'
 
 # Let's use devise for users
 gem 'devise'
@@ -58,8 +51,8 @@ gem 'omniauth-oauth2'
 # Token authentication for partners
 gem 'simple_token_authentication'
 
-# CanCan is used for authorization
-gem 'cancan'
+# CanCanCan is used for authorization
+gem 'cancancan', '~> 1.9'
 gem 'httparty'
 
 # Logging is awesome, and paper_trail even more
@@ -68,10 +61,6 @@ gem 'paper_trail', '~> 4.0.0.beta'
 # Njam njam, IBAN
 gem 'iban-tools'
 
-group :production, :deployment do
-  gem 'puma'
-end
-
 # Barcodes
 gem 'barcodes', git: "git://github.com/nudded/barcodes"
 
@@ -91,18 +80,15 @@ gem 'spreadsheet'
 
 # Run stuff in the background
 gem 'daemons'
-gem 'delayed_job', '~> 4.0'
+gem 'delayed_job', '~> 4.0.6'
 gem 'delayed_job_active_record'
-#
 
 # Whenever cronjobs
 gem 'whenever', require: false
 
 # Coveralls
 gem 'coveralls', require: false
 
-# Deployment
-
 # Stubbing http requests
 gem 'webmock', require: false
 
@@ -126,16 +112,41 @@ gem 'select2-rails'
 gem 'twitter-typeahead-rails'
 
 group :development do
+  # SQL schemes
   gem 'rails-erd'
 
+  # Static code analysis
+  gem 'rubocop', github: 'bbatsov/rubocop'
+
+  # Deployment goodies
   gem 'capistrano', '~> 3.1'
   gem 'capistrano-rails', '~> 1.1'
   gem 'capistrano-rvm'
   gem 'capistrano-rbenv'
+  gem 'capistrano-passenger'
+
+  gem 'web-console', '~> 2.0'
+end
+
+group :test do
+  gem 'capybara'
+  gem 'poltergeist'
+  gem 'single_test'
+  gem 'database_cleaner'
 end
 
 group :development, :test do
+  gem 'faker'
+  gem 'factory_girl_rails'
+
+  # Debugging goodies
   gem 'pry-byebug'
+  gem 'pry-rails'
+end
+
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
 end
 
 group :production do