Merge branch 'herbert'

Capfile

@@ -4,6 +4,10 @@ require 'capistrano/setup'
 # Includes default deployment tasks
 require 'capistrano/deploy'
 
+# Stop Capistrano from complaining
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
+
 require 'capistrano/rails'
 require 'capistrano/rbenv'
 

Gemfile

@@ -87,10 +87,10 @@ group :test do
 end
 
 group :production do
-  gem 'mysql2', '~> 0.3.0'
+  gem 'mysql2', '< 0.6.0', '>= 0.4.4'
 end
 
-gem 'high_voltage', '~> 2.4.0'
+gem 'high_voltage', '~> 3.1'
 
 # Errors on errbit
 gem 'airbrake'

Gemfile.lock

@@ -133,7 +133,7 @@ GEM
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashie (3.5.7)
-    high_voltage (2.4.0)
+    high_voltage (3.1.0)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -174,7 +174,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mysql2 (0.3.21)
+    mysql2 (0.5.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (5.0.1)
@@ -339,12 +339,12 @@ DEPENDENCIES
   faker
   friendly_id (~> 5.1.0)
   haml-rails
-  high_voltage (~> 2.4.0)
+  high_voltage (~> 3.1)
   jbuilder (~> 2.0)
   jquery-datatables-rails
   jquery-rails
   listen
-  mysql2 (~> 0.3.0)
+  mysql2 (>= 0.4.4, < 0.6.0)
   omniauth-oauth2 (~> 1.3.1)
   purecss-rails
   rails (= 5.2.0)
@@ -361,4 +361,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

README.md

@@ -1 +1,16 @@
 # [Tab](https://zeus.ugent.be/tab) [![Analytics](https://ga-beacon.appspot.com/UA-25444917-6/ZeusWPI/Tab/README.md?pixel)](https://github.com/igrigorik/ga-beacon) [![Code Climate](https://codeclimate.com/github/ZeusWPI/Tab/badges/gpa.svg)](https://codeclimate.com/github/ZeusWPI/Tab) [![Coverage Status](https://coveralls.io/repos/ZeusWPI/Tab/badge.svg?branch=master&service=github)](https://coveralls.io/github/ZeusWPI/Tab?branch=master) [![Build Status](https://travis-ci.org/ZeusWPI/Tab.png?branch=master)](https://travis-ci.org/ZeusWPI/Tab)
+
+## Deploy
+
+Just run `cap production deploy`. You might need to edit some config files
+on the server.
+
+## Adding clients
+
+A client can see and modify balances of other users.
+
+To add a client, connect
+to the server, `cd production/current`, then run `RAILS_ENV=production bundle exec rails console`.
+Then you can add clients with `client = Client.create name: "Tap"`.
+
+If you want the client to be able to make transactions, run: `client.add_role :create_transactions` in the console.

config/deploy.rb

@@ -2,9 +2,9 @@
 # lock '3.1.0'
 
 set :application, 'Tab'
-set :repo_url, 'git@github.com:ZeusWPI/Tab.git'
+set :repo_url, 'https://github.com/ZeusWPI/Tab.git'
 
-set :branch, 'master'
+set :branch, 'herbert'
 set :deploy_to, '/home/tab/production'
 
 # Default branch is :master

config/deploy/production.rb

@@ -1,4 +1,4 @@
-server 'zeus.ugent.be', user: 'tab', roles: %w{web app db}, ssh_options: {
+server 'tab.zeus.gent', user: 'tab', roles: %w{web app db}, ssh_options: {
   forward_agent: true,
   auth_methods: ['publickey'],
   port: 2222