Merge pull request #205 from themarshallproject/develop

Version 0.3.0

.circleci/config.yml

@@ -0,0 +1,77 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/themarshallproject/klaxon
+    parallelism: 1
+    docker:
+    # Includes ruby, node, and chrome/phantomjs
+    # TODO: Go back to the non-legacy version of this image, when our test
+    # infrastructure no longer depends on phantomjs
+    - image: circleci/ruby:2.4 # ...with this image as the primary container; this is where all `steps` will run
+      environment: # environment variables for primary container
+        BUNDLE_JOBS: 3
+        BUNDLE_RETRY: 3
+        BUNDLE_PATH: vendor/bundle
+        PGHOST: 127.0.0.1
+        PGUSER: klaxon-test-user
+        RAILS_ENV: test
+        RACK_ENV: test
+        NODE_ENV: test
+    - image: circleci/postgres:9.5-alpine # database image
+      environment: # environment variables for database
+        POSTGRES_USER: klaxon-test-user
+        POSTGRES_DB: klaxon_test
+        POSTGRES_PASSWORD: ""
+    steps:
+    # Check out the repo
+    - checkout
+
+    # Dependencies
+    # Which version of bundler?
+    - run:
+        name: Which bundler?
+        command: bundle -v
+
+    # Restore the dependency cache
+    - restore_cache:
+        keys:
+        - klaxon-v2-{{ checksum "Gemfile.lock" }}-
+        - klaxon-v2-
+
+    - run:
+        name: Bundle Install
+        command: bundle check || bundle install
+
+    # Store bundle cache
+    - save_cache:
+        key: klaxon-v2-{{ checksum "Gemfile.lock" }}-
+        paths:
+          - vendor/bundle
+
+    - run:
+        name: Compile assets
+        command: bundle exec rake assets:precompile assets:clean
+        environment:
+          RAILS_GROUPS: assets
+
+    - run:
+        name: Wait for DB
+        command: dockerize -wait tcp://localhost:5432 -timeout 1m
+
+    - run:
+        command: bundle exec rake db:create db:schema:load --trace
+        environment:
+          RAILS_ENV: test
+          RACK_ENV: test
+
+    - run:
+        name: Make results directory
+        command: mkdir -p test-results/rspec/
+
+    - run:
+        name: Run the tests
+        command: bundle exec rspec -r rspec_junit_formatter --format RspecJunitFormatter -o test-results/rspec/rspec.xml
+
+    # Save test results for reporting in the UI
+    - store_test_results:
+        path: test-results

.ruby-version

@@ -1 +1 @@
-2.3.4
+2.4.4

Gemfile

@@ -1,23 +1,25 @@
 source 'https://rubygems.org'
-ruby '2.3.4'
+ruby '2.4.4'
 
-gem 'rails', '~> 4.2'
-gem 'pg', '~> 0.15'
+gem 'rails', '~> 5.2.1'
+gem 'pg', '~> 0.21'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'therubyracer'
 
 gem 'dotenv'
 gem 'jquery-rails'
 gem 'turbolinks'
-gem 'sdoc', '~> 0.4.0', group: :doc
+gem 'bootsnap', require: false
+gem 'coffee-rails'
+gem 'sdoc', '~> 1.0.0', group: :doc
 
 gem 'rack-cache'
-gem 'bcrypt', '~> 3.1.7'
-gem 'puma', '~> 3.2'
+gem 'bcrypt', '~> 3.1.12'
+gem 'puma', '~> 3.12'
 gem 'rails_12factor'
 
-gem 'simple_form', '~> 3.2'
+gem 'simple_form', '~> 4.0'
 
 gem 'jwt'
 gem 'premailer-rails'
@@ -26,25 +28,26 @@ gem 'httparty'
 gem 'diffy'
 gem 'kramdown'
 
-# only used for alerting SQS.
-gem 'aws-sdk', '~> 2.0'
+gem 'aws-sdk-sqs', '~> 1.6'
 
 group :development, :test do
   gem 'byebug'
-  gem 'rspec-rails', '~> 3.0'
+  gem 'rspec-rails', '~> 3.8'
   gem 'guard-rspec', require: false
-  gem 'factory_girl_rails', '~> 4.0'
+  gem 'factory_bot_rails', '~> 4.11'
   gem 'database_cleaner'
   gem 'sinatra'
 end
 
 group :test do
   gem 'webmock'
+  gem 'rails-controller-testing'
+  gem 'rspec_junit_formatter'
   gem 'codeclimate-test-reporter', require: nil
 end
 
 group :development do
   gem 'letter_opener'
-  gem 'web-console', '~> 2.0'
+  gem 'web-console', '~> 3.7'
   gem 'spring'
 end