webflow_cap 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1062fc6521705bc2b35a6e214298e3b0e8959486
-  data.tar.gz: ab642147c90f33cf298ad78c46d7679a455f5a18
+  metadata.gz: 67006ecdc85663bc7c411b169bf8671e5093dcba
+  data.tar.gz: 949091f4bfc3435466bc1921e611f7d944a9375b
 SHA512:
-  metadata.gz: b09d5888b9644935e0eb5affe27190a2806698d0781968770284cf7d1486c8824e4807ba95bad7f0b9565c23d7341f7ff79059c85509dd680bd7dce346fcfce8
-  data.tar.gz: 7a1be336446d4fb479990191bb67c4468f97b1b458a325f49f575f133df33d33aa56e2f03aa3b7222dda148a37a71c7e5ea92d320b4b1a9fd0fa005a9f4cd15c
+  metadata.gz: 9f06ec46fc1b5bcfa901fd80d41542173de2a03d57ad3fdd699c727e35ce0aadd984de729640882b75f93dfbf64116316cb1fce09908b87287e2bf82d129528e
+  data.tar.gz: 90d1dae73cab2a66268522681a9e2dae3811900eee518f33b09e9aec9e5cac78f2e1c764da72c8b3af199361738a68104740e80474edcc64ef30312e5015f0be

data/lib/capistrano/tasks/base.rake

@@ -4,6 +4,7 @@ namespace :load do
     set :application_server,    fetch(:application_server, "puma")
     set :branch,                fetch(:branch, "master")
     set :scm,                   fetch(:scm, :git)
+    set :ruby_version,          fetch(:ruby_version, "2.1")
 
     # variables without default values
     set :deploy_via, :remote_cache
@@ -14,21 +15,33 @@ namespace :load do
     set :deploy_to,             -> { "/docs/#{fetch :user}/#{fetch :domain}/#{fetch :application}" }
     set :server_port,           -> { 10000 + ((fetch :user)[3..6] + "0").to_i }
     
-    set :default_env, {
-      'PATH' => "PATH=/docs/#{fetch :user}/.gem/ruby/2.1.5/bin:/opt/ruby/2.1.5/bin:$PATH"
+    set :default_env, -> {
+      {'PATH' => "/docs/#{fetch :user}/.gem/ruby/#{fetch :ruby_version}/bin:/opt/ruby/#{fetch :ruby_version}/bin:$PATH"}
     }
+
+    set :runit_service_dir, -> {"#{fetch :home}/etc/service/rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"}
   end
 end
 
 namespace :runit do
   task :setup_application_server do
     on roles :all do
+      daemon_name = "rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"
+      runit_dir = "#{fetch :home}/etc/sv/#{daemon_name}"
+
+      if test("[ -e #{runit_dir} ]")
+        info("runit ready @ #{runit_dir}")
+        next
+      end
+
       daemon_script = <<-EOF
 #!/bin/bash -e
+exec 2>&1
 export HOME=#{fetch :home}
+export PATH=#{fetch(:default_env)['PATH']}
 source $HOME/.bashrc
 cd #{fetch :deploy_to}/current
-exec bundle exec #{fetch :application_server} start -p #{fetch :server_port} -e production -d 2>&1
+exec bundle exec #{fetch :application_server} -p #{fetch :server_port} -e production 2>&1
     EOF
     
       log_script = <<-EOF
@@ -36,13 +49,13 @@ exec bundle exec #{fetch :application_server} start -p #{fetch :server_port} -e
 exec svlogd -tt ./main
     EOF
     
-      execute                 "mkdir -p #{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"
-      execute                 "mkdir -p #{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}/log/main"
-      upload! StringIO.new(daemon_script),  "#{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}/run"
-      upload! StringIO.new(log_script),     "#{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}/log/run"
-      execute                 "chmod +x #{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}/run"
-      execute                 "chmod +x #{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}/log/run"
-      execute                 "ln -nfs #{fetch :home}/etc/sv/run-rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application} ~/etc/service/rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"
+      execute                 "mkdir -p #{runit_dir}"
+      execute                 "mkdir -p #{runit_dir}/log/main"
+      upload! StringIO.new(daemon_script),  "#{runit_dir}/run"
+      upload! StringIO.new(log_script),     "#{runit_dir}/log/run"
+      execute                 "chmod +x #{runit_dir}/run"
+      execute                 "chmod +x #{runit_dir}/log/run"
+      execute                 "ln -nfs #{runit_dir} #{fetch :runit_service_dir}"
     end
   end
   
@@ -53,7 +66,7 @@ namespace :htaccess do
   task :create do
     on roles :all do
       if test("[ -e #{shared_path}/.htaccess ]")
-        warn "[skip] .htaccess already exists"
+        info "[skip] .htaccess already exists"
       elsif fetch(:password_protected)
         ask(:htaccess_user, fetch(:user))
         ask(:htaccess_pass, nil)
@@ -72,7 +85,7 @@ Require valid-user
   
   task :remove do
     on roles :all do
-      if ("[ -e #{shared_path}/.htaccess ]")
+      if test("[ -e #{shared_path}/.htaccess ]")
         execute "rm -f #{shared_path}/.htaccess"
         execute "rm -f #{shared_path}/.htpasswd"
         execute "rm -f #{current_path}/.htaccess"
@@ -86,11 +99,17 @@ end
 namespace :apache do
   task :setup_reverse_proxy do
     on roles :all do
+      path = "#{fetch :home}/#{fetch :domain}/htdocs"
+
+      if test("[ -e #{path} ]")
+        info "reverse proxy configured @ #{path}/.htaccess"
+        next
+      end
+
       htaccess = <<-EOF
 RewriteEngine On
 RewriteRule ^(.*)$ http://localhost:#{fetch :server_port}/$1 [P]
     EOF
-      path =              "#{fetch :home}/#{fetch :domain}"
       execute                 "mkdir -p #{path}"
       upload! StringIO.new(htaccess),       "#{path}/.htaccess"
       execute                 "chmod +r #{path}/.htaccess"
@@ -103,17 +122,23 @@ end
 namespace :deploy do
   task :start do
     on roles :all do
-      execute "sv start #{fetch :home}/etc/service/rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"
+      execute "sv start #{fetch :runit_service_dir}"
     end
   end
   task :stop do
     on roles :all do
-      execute "sv stop #{fetch :home}/service/rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"
+      execute "sv stop #{fetch :runit_service_dir}"
     end
   end
   task :restart do
     on roles :all do
-      execute "sv restart #{fetch :home}/service/rails-#{fetch :server_port}-#{fetch :domain}-#{fetch :application}"
+      execute "sv restart #{fetch :runit_service_dir}"
+    end
+  end
+
+  task :status do
+    on roles :all do
+      execute "sv status #{fetch :runit_service_dir}"
     end
   end
 

data/lib/capistrano/tasks/mysql.rake

@@ -24,8 +24,8 @@ namespace :mysql do
         execute "mysql -e 'CREATE DATABASE IF NOT EXISTS #{config[env]['database']} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
       end
 
-      execute "mkdir -p #{:shared_path}/config"
-      upload! StringIO.new(config.to_yaml), "#{:shared_path}/config/database.yml"
+      execute "mkdir -p #{shared_path}/config"
+      upload! StringIO.new(config.to_yaml), "#{shared_path}/config/database.yml"
     end
   end
   

data/lib/capistrano/webflow.rb

@@ -0,0 +1,2 @@
+load File.expand_path("../tasks/base.rake", __FILE__)
+load File.expand_path("../tasks/mysql.rake", __FILE__)

data/webflow_cap.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "webflow_cap"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.4"
   
   # dependencies
   gem.add_dependency 'capistrano',         '~>3.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webflow_cap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Florian Aman
@@ -37,7 +37,7 @@ files:
 - Rakefile
 - lib/capistrano/tasks/base.rake
 - lib/capistrano/tasks/mysql.rake
-- lib/webflow_cap.rb
+- lib/capistrano/webflow.rb
 - webflow_cap.gemspec
 homepage: https://rubygems.org/gems/webflow_cap
 licenses:

data/lib/webflow_cap.rb

@@ -1,2 +0,0 @@
-load File.expand_path("../capistrano/tasks/base.rake", __FILE__)
-load File.expand_path("../capistrano/tasks/mysql.rake", __FILE__)