Merge pull request #22 from CLOSER-Cohorts/release

Release

.gitignore

@@ -17,3 +17,5 @@
 /tmp
 
 *.swp
+.idea/
+*.xml

.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.1
+  - 2.2.3
 services:
   - postgresql
+before_install:
+  - rm -f Gemfile.lock
 before_script:
   - psql -c 'create database archivist_test;' -U postgres
-  - cp config/database.yml.travis config/database.yml
+  - cp config/database.yml.travis config/database.yml

Bowerfile

@@ -0,0 +1,11 @@
+asset 'angular'
+asset 'angular-route'
+asset 'angular-resource'
+asset 'angular-messages'
+asset 'angular-animate'
+asset 'bootstrap-sass-official'
+asset 'angular-bootstrap'
+asset 'angular-ui-sortable'
+asset 'jquery-ui'
+asset 'socket.io-client'
+# vim: ft=ruby

Gemfile

@@ -1,9 +1,10 @@
 source 'https://rubygems.org'
 
-ruby '2.2.1'
+ruby '2.2.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.4'
+gem 'rails', '4.2.5.1'
+gem 'json', '1.8.2'
 
 # Use Puma as the web server
 gem 'puma'
@@ -32,7 +33,7 @@ gem 'coffee-rails', '~> 4.1.0'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+#gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
@@ -50,13 +51,13 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 gem "genericons-rails"
 gem "devise"
 gem "pundit"
-gem "simple-navigation"
-gem "jquery-ui-rails"
-gem "rails-backbone"
+gem 'bower-rails'
+gem 'angular-rails-templates', '0.2.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 end
 
 group :development do

Gemfile.lock

@@ -1,146 +1,145 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    angular-rails-templates (0.2.0)
+      railties (>= 3.1)
+      sprockets (~> 2)
+      tilt
     arel (6.0.3)
-    bcrypt (3.1.10)
+    bcrypt (3.1.10-x64-mingw32)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bower-rails (0.10.0)
     builder (3.2.2)
-    byebug (8.2.1)
+    byebug (8.2.2)
     choice (0.2.0)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
     debug_inspector (0.0.2)
-    devise (3.5.2)
+    devise (3.5.6)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    ejs (1.1.1)
     erubis (2.7.0)
     execjs (2.6.0)
     genericons-rails (0.5.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    hike (1.2.3)
     i18n (0.7.0)
-    jbuilder (2.3.2)
-      activesupport (>= 3.0.0, < 5)
+    jbuilder (2.4.0)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.0.5)
+    jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
-      railties (>= 3.2.16)
-    json (1.8.3)
+    json (1.8.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
     multi_json (1.11.2)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2-x64-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    pg (0.18.4)
-    puma (2.15.3)
-    pundit (1.0.1)
+    pg (0.18.4-x64-mingw32)
+    puma (2.16.0)
+    pundit (1.1.0)
       activesupport (>= 3.0.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
+      railties (= 4.2.5.1)
       sprockets-rails
-    rails-backbone (1.2.0)
-      coffee-rails
-      ejs
-      jquery-rails
-      railties
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-erd (1.4.4)
+    rails-erd (1.4.5)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-perftest (0.0.6)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.4)
+    rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.4)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
+    rake (10.5.0)
+    rdoc (4.2.1)
+      json (~> 1.4)
     redis (3.2.2)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
     ruby-graphviz (1.2.2)
-    ruby-prof (0.15.8)
-    sass (3.4.19)
+    ruby-prof (0.15.9)
+    sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -150,58 +149,62 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    simple-navigation (4.0.3)
-      activesupport (>= 2.3.2)
-    spring (1.4.4)
-    sprockets (3.4.1)
-      rack (> 1, < 3)
+    spring (1.6.3)
+    sprockets (2.12.4)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
-    turbolinks (2.5.3)
-      coffee-rails
+    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2016.1)
+      tzinfo (>= 1.0.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
-    web-console (2.2.1)
+    web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
 
 PLATFORMS
-  ruby
+  x64-mingw32
 
 DEPENDENCIES
+  angular-rails-templates (= 0.2.0)
+  bower-rails
   byebug
   coffee-rails (~> 4.1.0)
   devise
   genericons-rails
   jbuilder (~> 2.0)
   jquery-rails
-  jquery-ui-rails
+  json (= 1.8.2)
   pg
   puma
   pundit
-  rails (= 4.2.4)
-  rails-backbone
+  rails (= 4.2.5.1)
   rails-erd
   rails-perftest
   rails_12factor
   redis
   ruby-prof
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
-  simple-navigation
   spring
-  turbolinks
+  tzinfo-data
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.11.2

README.md

@@ -43,9 +43,9 @@ Run `rake generate_erd` to regenerate (must have graphvis).
 ![](/app/assets/images/diagrams/erd.png)
 
 ## Configuation
-* Ruby: 2.2.1
-* Rails: 4.2.4
-* Postgres: 9.4
+* Ruby: 2.2.3
+* Rails: 4.2.5.1
+* Postgres: 9.5
 * Redis: coming soon
 
 ## Testing

app.json

@@ -1,10 +1,12 @@
 {
   "name": "archivist",
   "description": "",
-  "scripts": {},
+  "scripts": {
+    "postdeploy": "rake db:setup"
+  },
   "env": {},
   "addons": [
     "heroku-postgresql",
     "heroku-redis"
   ]
-}
+}