harmonized deployment with lagotto lagotto#157

mfenner · Jul 20, 2015 · b62bf46 · b62bf46
1 parent 2bf0ecc
commit b62bf46
Show file tree

Hide file tree

Showing 10 changed files with 231 additions and 171 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,7 @@
 # Example configuration settings for this application
 
 APPLICATION=alm-report
+GITHUB_URL=https://github.com/lagotto/alm-report.git
 
 RAILS_ENV=development
 STAGE=production

diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,11 @@ capybara-*.html
 /config/data_bags/*
 /vendor/cookbooks/*/.git
 /vendor/assets/bower_components
-/node_modules
+/frontend/node_modules/*
+/frontend/bower_components/*
+/vendor/assets/bower_components
+/frontend/npm-debug.log
+/frontend/vendor/
 **.orig
 rerun.txt
 pickle-email-*.html

diff --git a/Cheffile b/Cheffile
@@ -4,19 +4,19 @@
 site 'http://community.opscode.com/api/v1'
 
 cookbook "alm_report",
-  :git => "[email protected]:articlemetrics/alm_report-cookbook.git"
+  :git => "[email protected]:lagotto/alm_report-cookbook.git"
 cookbook "ruby",
-  :git => "[email protected]:articlemetrics/ruby-cookbook.git"
+  :git => "[email protected]:lagotto/ruby-cookbook.git"
 cookbook "passenger_nginx",
-  :git => "[email protected]:articlemetrics/passenger_nginx-cookbook.git"
+  :git => "[email protected]:lagotto/passenger_nginx-cookbook.git"
 cookbook "mysql_rails",
-  :git => "[email protected]:articlemetrics/mysql_rails-cookbook.git"
+  :git => "[email protected]:lagotto/mysql_rails-cookbook.git"
 cookbook "capistrano",
-  :git => "[email protected]:articlemetrics/capistrano-cookbook.git"
+  :git => "[email protected]:lagotto/capistrano-cookbook.git"
 cookbook "dotenv",
-  :git => "[email protected]:articlemetrics/dotenv-cookbook.git"
+  :git => "[email protected]:lagotto/dotenv-cookbook.git"
 cookbook "mysql",
-  :git => "[email protected]:articlemetrics/mysql.git"
-cookbook "database", "~> 2.3.0"
+  :git => "[email protected]:lagotto/mysql.git"
+cookbook "database", "~> 2.3.1"
 cookbook "memcached"
-cookbook "phantomjs"
+cookbook "nodejs"
diff --git a/Cheffile.lock b/Cheffile.lock
@@ -3,133 +3,145 @@ SITE
   specs:
     7-zip (1.0.2)
       windows (>= 1.2.2)
-    apt (2.6.1)
+    apt (2.7.0)
     ark (0.9.0)
       7-zip (>= 0.0.0)
       windows (>= 0.0.0)
-    aws (2.5.0)
-    build-essential (2.1.3)
-    chef-sugar (2.5.0)
-    chef_handler (1.1.6)
-    chocolatey (0.2.0)
-      windows (~> 1.31)
+    aws (2.7.2)
+    build-essential (2.2.3)
+    chef-sugar (3.1.1)
+    chef_handler (1.2.0)
+    consul (0.10.1)
+      golang (~> 1.4)
+      libarchive (~> 0.4.0)
+      packagecloud (>= 0.0.0)
+      runit (>= 0.0.0)
+      yum-repoforge (>= 0.0.0)
     database (2.3.1)
       aws (>= 0.0.0)
       mysql (~> 5.0)
       mysql-chef_gem (~> 0.0)
       postgresql (>= 1.0.0)
       xfs (>= 0.0.0)
+    golang (1.5.1)
+    homebrew (1.13.0)
+      build-essential (>= 2.1.2)
+    libarchive (0.4.4)
+      apt (~> 2.5)
+      build-essential (~> 2.0)
     memcached (1.7.2)
       runit (~> 1.0)
       yum (~> 3.0)
       yum-epel (>= 0.0.0)
     mysql-chef_gem (0.0.5)
       build-essential (>= 0.0.0)
       mysql (>= 0.0.0)
-    nodejs (2.2.0)
+    nodejs (2.4.0)
       apt (>= 0.0.0)
       ark (>= 0.0.0)
       build-essential (>= 0.0.0)
+      homebrew (>= 0.0.0)
       yum-epel (>= 0.0.0)
-    openssl (2.0.2)
+    openssl (4.0.0)
       chef-sugar (>= 0.0.0)
-    phantomjs (1.0.3)
-      build-essential (>= 0.0.0)
-      chocolatey (>= 0.0.0)
-    postgresql (3.4.14)
+    packagecloud (0.0.19)
+    postgresql (3.4.20)
       apt (>= 1.9.0)
       build-essential (>= 0.0.0)
-      openssl (>= 0.0.0)
-    runit (1.5.14)
-      build-essential (>= 0.0.0)
-      yum (~> 3.0)
-      yum-epel (>= 0.0.0)
-    windows (1.36.1)
+      openssl (~> 4.0.0)
+    runit (1.7.2)
+      packagecloud (>= 0.0.0)
+    windows (1.37.0)
       chef_handler (>= 0.0.0)
     xfs (1.1.0)
-    yum (3.5.2)
-    yum-epel (0.6.0)
-      yum (~> 3.0)
-    yum-mysql-community (0.1.12)
+    yum (3.6.3)
+    yum-epel (0.6.2)
+      yum (~> 3.2)
+    yum-mysql-community (0.1.17)
       yum (>= 3.0)
+    yum-repoforge (0.5.3)
+      yum (~> 3.2)
+      yum-epel (>= 0.0.0)
 
 GIT
-  remote: [email protected]:articlemetrics/alm_report-cookbook.git
+  remote: [email protected]:lagotto/alm_report-cookbook.git
   ref: master
-  sha: 0919455ba355dd6d8ebf14cb96d04b2e89367a55
+  sha: 9184e494df001f70cda80d86bf0822b82089664d
   specs:
-    alm_report (1.0.9)
+    alm_report (1.1.1)
       apt (>= 0.0.0)
-      capistrano (~> 0.8.0)
+      capistrano (~> 0.10.0)
+      consul (>= 0.0.0)
       database (~> 2.3.1)
       dotenv (~> 0.2.0)
       memcached (>= 0.0.0)
       mysql (>= 0.0.0)
       mysql_rails (~> 0.3.0)
       nodejs (>= 0.0.0)
       passenger_nginx (~> 0.5.0)
-      phantomjs (>= 0.0.0)
-      ruby (~> 0.6.0)
+      ruby (~> 0.7.0)
 
 GIT
-  remote: [email protected]:articlemetrics/capistrano-cookbook.git
+  remote: [email protected]:lagotto/capistrano-cookbook.git
   ref: master
-  sha: d22a965760b62ed2634ea6ab8488e5ca61694c23
+  sha: d2f3df1923384745067c2a5b66ec1b8e8fa1d4f2
   specs:
-    capistrano (0.8.14)
-      ruby (~> 0.6.0)
+    capistrano (0.10.4)
+      consul (>= 0.0.0)
+      nodejs (>= 0.0.0)
+      ruby (~> 0.7.0)
 
 GIT
-  remote: [email protected]:articlemetrics/dotenv-cookbook.git
+  remote: [email protected]:lagotto/dotenv-cookbook.git
   ref: master
-  sha: 6af99d90f302ba74a460a5337bcdd5a5b7505ff5
+  sha: 3818435f4506f80a45f5a924ef880a3b371e0798
   specs:
-    dotenv (0.2.0)
+    dotenv (0.2.2)
 
 GIT
-  remote: [email protected]:articlemetrics/mysql.git
+  remote: [email protected]:lagotto/mysql.git
   ref: master
   sha: e306cddd572ca4c1906aa533c70092528bb77532
   specs:
     mysql (5.6.1)
       yum-mysql-community (>= 0.0.0)
 
 GIT
-  remote: [email protected]:articlemetrics/mysql_rails-cookbook.git
+  remote: [email protected]:lagotto/mysql_rails-cookbook.git
   ref: master
-  sha: 30c6ea6346f4a86df1b95b4756299189911695a8
+  sha: 25ddc5987bf5aa10cc3aacfe8482cacf8ac26a64
   specs:
-    mysql_rails (0.3.30)
+    mysql_rails (0.3.31)
       database (~> 2.3.1)
       mysql (~> 5.6.1)
-      ruby (~> 0.6.0)
+      ruby (~> 0.7.0)
 
 GIT
-  remote: [email protected]:articlemetrics/passenger_nginx-cookbook.git
+  remote: [email protected]:lagotto/passenger_nginx-cookbook.git
   ref: master
-  sha: 982440c212cfc6f7e282efe1377df5890f57f5c2
+  sha: 23ca6144a67a949ef98932f7cfd6561ec1045703
   specs:
-    passenger_nginx (0.5.0)
+    passenger_nginx (0.5.4)
       apt (>= 0.0.0)
-      ruby (~> 0.6.0)
+      ruby (~> 0.7.0)
 
 GIT
-  remote: [email protected]:articlemetrics/ruby-cookbook.git
+  remote: [email protected]:lagotto/ruby-cookbook.git
   ref: master
-  sha: 323293afd36ede76c8906a1b432d528b77c6df63
+  sha: 0a52e4d402ce77cc31d9f50e6a82bb8eb472f9e6
   specs:
-    ruby (0.6.3)
+    ruby (0.7.0)
       apt (>= 0.0.0)
 
 DEPENDENCIES
   alm_report (>= 0)
   capistrano (>= 0)
-  database (~> 2.3.0)
+  database (~> 2.3.1)
   dotenv (>= 0)
   memcached (>= 0)
   mysql (>= 0)
   mysql_rails (>= 0)
+  nodejs (>= 0)
   passenger_nginx (>= 0)
-  phantomjs (>= 0)
   ruby (>= 0)
 
diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,6 @@ gem "uglifier"
 gem "jquery-rails"
 gem "jquery-ui-rails"
 gem "slim-rails"
-gem "httparty"
 gem "faraday"
 gem "faraday_middleware"
 gem 'bugsnag', '~> 2.8.6'
@@ -24,7 +23,7 @@ gem 'omniauth-github', '~> 1.1.2'
 gem "omniauth-orcid", "~> 0.6", :git => "https://github.com/mfenner/omniauth-orcid.git"
 gem 'omniauth', '~> 1.2.2'
 
-gem "ember-rails"
+gem "ember-rails", "0.16.2"
 gem "ember-source", "1.8.1"
 
 group :development do