Continued setup of Capistrano

Author: edomora97

.gitignore

@@ -15,4 +15,6 @@
 /log/*.log
 /tmp
 
+public/assets
+
 .idea/

Capfile

@@ -23,11 +23,12 @@ require 'capistrano/deploy'
 # require 'capistrano/rails/migrations'
 # require 'capistrano/passenger'
 
-require 'capistrano/bundler'
+# require 'capistrano/bundler'
 require 'capistrano/rails/migrations'
 require 'capistrano/rails/assets'
-require 'capistrano/rbenv'
-require 'capistrano/rbenv_install'
+# require 'capistrano/rvm'
+require 'rvm1/capistrano3'
+# require 'bundler/capistrano'
 
 # Load custom tasks from `lib/capistrano/tasks' if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '2.1.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.1.1'
@@ -12,7 +13,7 @@ gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.0'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer',  platforms: :ruby
+gem 'therubyracer',  platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
@@ -35,8 +36,8 @@ gem 'spring', group: :development
 # Use Capistrano for deployment
 gem 'capistrano-rails', group: :development
 gem 'capistrano-bundler', '~> 1.1.2'
-gem 'capistrano-rbenv', '~> 2.0'
-gem 'capistrano-rbenv-install', '~> 1.2.0'
+# gem 'capistrano-rvm'
+gem 'rvm1-capistrano3', require: false
 
 # Use debugger
 # gem 'debugger', group: [:development, :test]
@@ -49,4 +50,5 @@ gem 'net-ping'
 gem 'ruby-nmap'
 
 gem 'rack-mini-profiler'
-gem 'flamegraph'
+gem 'flamegraph'
+gem 'stackprof'

Gemfile.lock

@@ -40,12 +40,6 @@ GEM
     capistrano-rails (1.1.2)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.0.3)
-      capistrano (~> 3.1)
-      sshkit (~> 1.3)
-    capistrano-rbenv-install (1.2.0)
-      capistrano (>= 3.0)
-      capistrano-rbenv (>= 2.0)
     capistrano-stats (1.1.1)
     chronic (0.10.2)
     coffee-rails (4.0.1)
@@ -72,6 +66,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.2)
+    libv8 (3.16.14.7)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -112,10 +107,14 @@ GEM
     rb-readline (0.5.2)
     rdoc (4.2.0)
       json (~> 1.4)
+    ref (1.0.5)
     rprogram (0.3.2)
     ruby-nmap (0.7.0)
       nokogiri (~> 1.3)
       rprogram (~> 0.3)
+    rvm1-capistrano3 (1.3.2.2)
+      capistrano (~> 3.0)
+      sshkit (>= 1.2)
     sass (3.2.19)
     sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
@@ -140,6 +139,10 @@ GEM
       colorize (>= 0.7.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    stackprof (0.2.7)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -162,8 +165,6 @@ PLATFORMS
 DEPENDENCIES
   capistrano-bundler (~> 1.1.2)
   capistrano-rails
-  capistrano-rbenv (~> 2.0)
-  capistrano-rbenv-install (~> 1.2.0)
   coffee-rails (~> 4.0.0)
   flamegraph
   jbuilder (~> 2.0)
@@ -173,10 +174,13 @@ DEPENDENCIES
   rails (= 4.1.1)
   rb-readline
   ruby-nmap
+  rvm1-capistrano3
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   spring
   sqlite3
+  stackprof
+  therubyracer
   turbolinks
   uglifier (>= 1.3.0)
   whenever

app/controllers/index_controller.rb

@@ -7,7 +7,7 @@ class IndexController < ApplicationController
 	def index
 		@sys_info = SysInfo.last
 		@status = Ping.current_status
-		@uptime = @sys_info.uptime
+		@uptime = @sys_info.try(:uptime, Time.now)
 		@availability = Ping.availability
 		@logs = Log.all
 		@services = services

app/views/index/index.html.erb

@@ -2,14 +2,14 @@
 
 <div class="row">
     <div class="col-xs-2">
-        <div id="cpu-perc" data-cpu="<%= @sys_info.cpu %>"></div>
+        <div id="cpu-perc" data-cpu="<%= @sys_info.try(:cpu, 'undefined') %>"></div>
     </div>
     <div id="cpu-graph" class="col-md-6 graph" data-cpu="<%= @cpu_history.to_json %>"></div>
 </div>
 
 <div class="row">
     <div class="col-xs-2">
-        <div id="ram-perc" data-ram="<%= @sys_info.ram %>"></div>
+        <div id="ram-perc" data-ram="<%= @sys_info.try(:ram, 'undefined') %>"></div>
     </div>
     <div id="ram-graph" class="col-md-6 graph" data-ram="<%= @ram_history.to_json %>"></div>
 </div>

config/deploy.rb

@@ -4,7 +4,7 @@
 set :application, 'serben-status'
 set :repo_url, 'https://github.com/edomora97/serben-status-new'
 
-set :rbenv_ruby, '2.1.3'
+set :rvm1_ruby_version, '2.1.3'
 
 # Default branch is :master
 # ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call

config/deploy/production.rb

@@ -4,42 +4,25 @@
 # is considered to be the first unless any hosts have the primary
 # property set.  Don't declare `role :all`, it's a meta role.
 
-role :app, %w{[email protected]}
-role :web, %w{[email protected]}
-role :db,  %w{[email protected]}
-
 
 # Extended Server Syntax
 # ======================
 # This can be used to drop a more detailed server definition into the
 # server list. The second argument is a, or duck-types, Hash and is
 # used to set extended properties on the server.
 
-server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
+server 'vps.edo', user: 'deploy', roles: %w{web app db}
 
+namespace :app do
+	task :update_rvm_key do
+		on roles(:all) do
+			execute :gpg, '--keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3'
+		end
+	end
+end
+before 'rvm1:install:rvm', 'app:update_rvm_key'
 
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult[net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start).
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# And/or per server (overrides global)
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }
+before 'deploy', 'rvm1:install:rvm'
+before 'deploy', 'rvm1:install:ruby'
+before 'deploy', 'rvm1:install:gems'
+# after 'rvm1:install:ruby', 'deploy:install_bundler'

config/deploy/staging.rb

@@ -12,3 +12,25 @@
 # used to set extended properties on the server.
 
 server 'vps.edo', user: 'deploy', roles: %w{web app db}
+
+namespace :app do
+	task :update_rvm_key do
+		on roles(:all) do
+			execute :gpg, '--keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3'
+		end
+	end
+end
+before 'rvm1:install:rvm', 'app:update_rvm_key'
+
+namespace :deploy do
+	task :install_bundler do
+		on roles(:all) do
+			gem 'bundler'
+		end
+	end
+end
+
+before 'deploy', 'rvm1:install:rvm'
+before 'deploy', 'rvm1:install:ruby'
+before 'deploy', 'rvm1:install:gems'
+# after 'rvm1:install:ruby', 'deploy:install_bundler'

test/controllers/index_controller_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class IndexControllerTest < ActionController::TestCase
-	test "should get index" do
+	test 'should get index' do
 		get :index
 		assert_response :success
 	end