Merge pull request #93 from sanger/develop

Merge develop into master

.travis.yml

@@ -11,12 +11,15 @@ script:
 - bundle exec rspec
 before_deploy: "./compile-build"
 deploy:
+  provider: releases
+  api_key:
+    secure: a8c2BCVF8JT328qV9rJAD2ytPmffeO+zOoCvsY2XFSg51eTMCi/mITFwGT/6Le+tNYxPJfwyYgktUZ0VGCjDaJ2D3YDG+VVShQqHxkzjN3dFLBp4KkgkH9QC/HqnudefnMugm/uGh8i9uuzBT33fvuOqVB9OyEkFBvdoYeqBi3s=
   file: release.tar.gz
-  file_glob: true
-  skip_cleanup: true
   on:
     repo: sanger/unified_warehouse
     tags: true
-  provider: releases
-  api_key:
-    secure: ZliaLdfkU3OUFeMU3B3DlcIb7lLPSIYBjOHNbDmGE5NVxyof66H24mRq1aRqhH9OrVs1AY16nQ4E4ri9FT6JQPf0GzggNQ7b543YKMp7R8Omg7vZRiCxb1YG58EFRMf9vbATBNkvEHB+r2HhvV3F/rEpr4iuzvg9U+5it6gHp+Q=
+  file_glob: true
+  skip_cleanup: true
+notifications:
+  slack:
+    secure: WOTWRYxxesHC3dBKSOmN6PO4hXrspjUA6Pnd/Z1H0AKUZO+pWPZExt3crnD1SdEq1FbNF7TYevJaXRURb9flG3cirvpm/uM4pRB3nMgWSjA3SQrl9JJeVGybAPuUNrrNc4LqyvFz6g3m96OzaQAE9hkkUclsVud6aYQ00jArBEw=

Gemfile.lock

@@ -49,7 +49,7 @@ GEM
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     daemons (1.2.4)
     diff-lcs (1.3)
     erubis (2.7.0)
@@ -84,7 +84,7 @@ GEM
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
@@ -100,7 +100,7 @@ GEM
       sinatra (~> 1.3)
       webmock (~> 1.8)
     mysql2 (0.4.10)
-    nokogiri (1.10.3)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
     parser (2.5.3.0)

README.md

@@ -1,18 +1,19 @@
-Unified Warehouse Builder
-=========================
-[![Build Status](https://travis-ci.org/radome/unified_warehouse.svg?branch=test_openstack)](https://travis-ci.org/radome/unified_warehouse)
+# Unified Warehouse Builder
 
-Description
------------
+[![Build Status](https://travis-ci.org/sanger/unified_warehouse.svg?branch=develop)](https://travis-ci.org/sanger/unified_warehouse)
 
 This application is a denormalised warehouse for multiple LIMS.
 
-Usage (Development)
-----------------------
+## Usage (Development)
 
 1. Clone the git repository
-2. Ensure ruby-2.5.1 is installed
-3. Install the relevant gems through bundler:
-    `bundle install`
-4. Ensure the test suite is running:
-    `bundle exec rspec`
+1. Install the relevant ruby is installed - have a look in the `.ruby-version` file
+1. Install bundler the version of bundler used to create the `Gemfile.lock`:
+
+        gem install bundler -v $(tail -1 Gemfile.lock)
+1. Install the relevant gems using bundler:
+
+        bundle install
+1. Ensure the test suite is running and passing:
+
+        bundle exec rspec

bin/amqp_client

@@ -9,7 +9,7 @@ APP_PATH = File.expand_path('../config/application', __dir__)
 
 class AmqpClient
   APP_NAME = 'unified_warehouse'.freeze
-  DEFAULT_WORKERS = 2
+  DEFAULT_WORKERS = 1
   DEFAULT_PID_DIR = './tmp/pids'.freeze
 
   NotImplimented = Class.new(StandardError)