railman-deployment 1.1.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e2c7491fb51d84d9de0b91a04abc195bf3eb2a3
-  data.tar.gz: '0392f78007317b1b7d5a2c0bc15388b83ed8a697'
+SHA256:
+  metadata.gz: 8f75058ce67a79a21f24384da8681a2a0aedea32eaef8fb0d7a7a5ada401e75d
+  data.tar.gz: 3af5c61e95ba8340191da95346a476f6437b33692df81ea6ce5135bc914e3a53
 SHA512:
-  metadata.gz: c24d68a0905af04589ca2769f69735e5763afd1f0009d9aa868b42b3cd25c96f67a334ff492a7acb558c908f0bf70deacf2add988239f7e45c1fc9bfe961c6a5
-  data.tar.gz: c904cfb7cbcdd429dcc1cc8216de71eac5bbc3feecd058f35eed0766edd164d3a3d96974d5369c111a6ad184e3d20d4ff11e2f52b6b8016db57e61ec0b148f37
+  metadata.gz: 052d41d13308677118eeef4ebadc1542613a9b541c286aa9fe7bb866bbab7ec234dc52520fa981a42bc8ae50867747825e47e3755f81ca4abacc04125aa35725
+  data.tar.gz: 18f77e9335847bca0a8fd6fff4af88a2fd5651060351b556bdb2a2ce2a499b6cbea9763a97d7d00731dd7af36af3666aeefe2a4ceb682b161bc315bd384a2d66

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.5.0

data/lib/railman-deployment/version.rb

@@ -1,3 +1,3 @@
 module RailmanDeployment
-  VERSION = '1.1.4'
+  VERSION = '2.0.0'
 end

data/lib/railman/tasks/deployment.rake

@@ -2,7 +2,6 @@ desc 'Setup rails application for the first time on a server'
 task :setup do
   on roles(:all) do
     with fetch(:environment) do
-      # setup backend application
       if test "[ -d #{fetch(:deploy_to)} ]"
         invoke :fetch_and_reset_git_repository
       else
@@ -10,79 +9,63 @@ task :setup do
         invoke :sync_local_dirs_to_server
       end
       server_conf_dir = "#{fetch(:deploy_to)}/config/server"
-      execute :cp, "#{server_conf_dir}/nginx.conf /etc/nginx/sites-available/#{fetch(:domain)}"
-      execute :ln, "-s -f /etc/nginx/sites-available/#{fetch(:domain)} /etc/nginx/sites-enabled/"
-      execute :ln, "-s -f #{server_conf_dir}/logrotate.conf /etc/logrotate.d/#{fetch(:application)}"
+      execute :su_ln, "-s -f #{server_conf_dir}/puma.service /lib/systemd/system/#{fetch(:application)}.service"
+      execute :su_ln, "-s -f #{server_conf_dir}/sidekiq.service /lib/systemd/system/#{fetch(:application)}_sidekiq.service"
+      execute :su_ln, "-s -f #{server_conf_dir}/logrotate.conf /etc/logrotate.d/#{fetch(:application)}"
       within fetch(:deploy_to) do
+        upload! './config/master.key', "#{fetch(:deploy_to)}/config/master.key"
         execute :bundle, :install, '--without development test'
-        execute :mkdir, "-p #{fetch(:deploy_to)}/tmp/pids"
-        if test "[ -f #{fetch(:deploy_to)}/.env ]"
-          invoke :create_database_from_sql_file
-          execute :eye, :load, 'Eyefile'
-          execute :eye, :start, fetch(:application)
-          execute :service, 'nginx restart'
-          warn "TODO: Run certbot--nginx -d #{fetch(:domain)} on the server as root to create a certificate"
-        else
-          execute "cp #{fetch(:deploy_to)}/.env.example.production #{fetch(:deploy_to)}/.env"
-          execute "sed -i -e 's/TODO: generate with: rake secret/#{SecureRandom.hex(64)}/g' #{fetch(:deploy_to)}/.env"
-          warn 'TODO: Edit .env and modify your database and smtp settings.'
-          warn 'TODO: Run \'cap ENV setup\' again!'
-        end
-      end
-    end
-  end
-end
-
-desc 'Setup spa application for the first time on a server'
-task :setup_spa do
-  on roles(:all) do
-    server_conf_dir = "#{fetch(:deploy_to)}/config/server"
-    if fetch(:spa_application)
-      if test "[ -d #{fetch(:deploy_spa_to)} ]"
-        invoke :fetch_and_reset_spa_git_repository
-      else
-        execute :git, :clone, fetch(:spa_repo_url), fetch(:deploy_spa_to)
-      end
-
-      within fetch(:deploy_spa_to) do
-        execute :mkdir, "-p #{fetch(:deploy_spa_to)}/public"
-        execute :yarn
-        execute :yarn, 'run build'
-        execute "rsync -avz --delete #{fetch(:deploy_spa_to)}/dist/ #{fetch(:deploy_spa_to)}/public/"
-        execute :cp, "#{server_conf_dir}/nginx_spa.conf /etc/nginx/sites-available/#{fetch(:spa_domain)}"
-        execute :ln, "-s -f /etc/nginx/sites-available/#{fetch(:spa_domain)} /etc/nginx/sites-enabled/"
-        execute :service, 'nginx restart'
-        warn "TODO: Run certbot--nginx -d #{fetch(:spa_domain)} on the server as root to create a certificate"
+        invoke :create_database_from_sql_file
+        execute :rake, 'assets:precompile'
+        execute :systemctl, :start, fetch(:application)
+        execute :systemctl, :start, "#{fetch(:application)}_sidekiq"
+        execute :systemctl, :enable, fetch(:application)
+        execute :systemctl, :enable, "#{fetch(:application)}_sidekiq"
+        # copy temporary simple nginx.conf only for getting letsencrypt certificate
+        nginx_conf = File.read(File.join(File.dirname(__FILE__), 'nginx.conf'))
+        nginx_conf.gsub!('DOMAINS', fetch(:domains).join(' '))
+        nginx_conf.gsub!('APPLICATION', fetch(:application))
+        upload! StringIO.new(nginx_conf), "/etc/nginx/conf.d/#{fetch(:application)}.conf"
+        execute :systemctl, :restart, :nginx
+        execute :certbot, "certonly --webroot -w /home/deploy/apps/#{fetch(:application)}/public #{fetch(:domains).collect { |d| '-d ' + d }.join(' ')} -n --agree-tos -m #{fetch(:certbot_email)} --deploy-hook 'systemctl reload nginx'"
+        # remove temporary nginx.conf and link config/server/nginx.conf to /etc/nginx/conf.d
+        execute :su_rm, "/etc/nginx/conf.d/#{fetch(:application)}.conf"
+        execute :su_ln, "-s -f #{server_conf_dir}/nginx.conf /etc/nginx/conf.d/#{fetch(:application)}.conf"
+        execute :systemctl, :restart, :nginx
       end
     end
   end
 end
 
+# todo
 desc 'Remove the application completely from the server'
 task :remove do
   on roles(:all) do
     with fetch(:environment) do
+      # dropt the database and remove the application directory from /home/deploy/apps
       within fetch(:deploy_to) do
-        execute :eye, :load, 'Eyefile'
-        execute :eye, :stop, fetch(:application)
         execute :rake, 'db:drop'
         execute :su_rm, "-rf #{fetch(:deploy_to)}"
       end if test "[ -d #{fetch(:deploy_to)} ]"
-      execute :su_rm, "-f /etc/nginx/sites-enabled/#{fetch(:domain)}"
-      execute :su_rm, "-f /etc/nginx/sites-available/#{fetch(:domain)}"
+      # stop, disable and remove systemd service files
+      execute :systemctl, :stop, fetch(:application)
+      execute :systemctl, :stop, "#{fetch(:application)}_sidekiq"
+      execute :systemctl, :disable, fetch(:application)
+      execute :systemctl, :disable, "#{fetch(:application)}_sidekiq"
+      execute :su_rm, "-f /lib/systemd/system/#{fetch(:application)}.service"
+      execute :su_rm, "-f /lib/systemd/system/#{fetch(:application)}_sidekiq.service"
+      # remove application nginx configuration
+      execute :su_rm, "-f /etc/nginx/conf.d/#{fetch(:application)}"
+      execute :systemctl, :restart, :nginx
+      # remove logrotate configuration
       execute :su_rm, "-f /etc/logrotate.d/#{fetch(:application)}"
-      if test "[ -d #{fetch(:deploy_spa_to)} ]"
-        execute :su_rm, "-rf #{fetch(:deploy_spa_to)}"
-        execute :su_rm, "-f /etc/nginx/sites-enabled/#{fetch(:spa_domain)}"
-        execute :su_rm, "-f /etc/nginx/sites-available/#{fetch(:spa_domain)}"
-      end
-      execute :service, 'nginx restart'
-      warn 'TODO: Run certbot--nginx remove on the server as root to remove the certificate'
+      # todo remove letsencrypt certificates and renew cron job
     end
   end
 end
 
-desc 'Deploy rails application (and spa if configured)'
+# OK!
+desc 'Deploy rails application'
 task :deploy do
   on roles(:all) do
     with fetch(:environment) do
@@ -90,35 +73,16 @@ task :deploy do
         invoke :fetch_and_reset_git_repository
         execute :bundle, :install
         execute :rake, 'db:migrate'
-        execute :eye, :load, 'Eyefile'
-        execute :eye, :restart, fetch(:application)
-        execute :service, 'nginx restart'
+        execute :rake, 'assets:precompile'
+        execute :systemctl, :restart, fetch(:application)
+        execute :systemctl, :restart, "#{fetch(:application)}_sidekiq"
+        execute :systemctl, :restart, :nginx
       end
     end
   end
 end
 
-desc 'Deploy SPA application'
-task :deploy_spa do
-  on roles(:all) do
-    with fetch(:environment) do
-      within fetch(:deploy_spa_to) do
-        invoke :fetch_and_reset_spa_git_repository
-        execute :yarn
-        execute :yarn, 'run build'
-        execute "rsync -avz --delete #{fetch(:deploy_spa_to)}/dist/ #{fetch(:deploy_spa_to)}/public/"
-        execute :service, 'nginx restart'
-      end
-    end
-  end
-end
-
-desc 'Deploy both the rails application and the spa application'
-task :deploy_all do
-  invoke :deploy
-  invoke :deploy_spa
-end
-
+# OK!
 desc 'Copy database from the server to the local machine'
 task :update do
   on roles(:all) do
@@ -133,25 +97,27 @@ task :update do
   end
 end
 
+# OK!
 desc "Recreate server database from db/#{fetch(:application)}.sql and sync local dirs if any"
 task :reset_server do
   on roles(:all) do
     with fetch(:environment) do
       within fetch(:deploy_to) do
-        execute :eye, :load, 'Eyefile'
-        execute :eye, :stop, fetch(:application)
-        sleep 6 # seconds
+        execute :systemctl, :stop, fetch(:application)
+        execute :systemctl, :stop, "#{fetch(:application)}_sidekiq"
         invoke :fetch_and_reset_git_repository
         execute :rake, 'db:drop'
         invoke :create_database_from_sql_file
         invoke :sync_local_dirs_to_server
-        execute :eye, :start, fetch(:application)
-        execute :service, 'nginx restart'
+        execute :systemctl, :restart, fetch(:application)
+        execute :systemctl, :restart, "#{fetch(:application)}_sidekiq"
+        execute :systemctl, :restart, :nginx
       end
     end
   end
 end
 
+# OK!
 task :sync_local_dirs_to_server do
   on roles(:all) do
     fetch(:sync_dirs, []).each do |sync_dir|
@@ -162,6 +128,7 @@ task :sync_local_dirs_to_server do
   end
 end
 
+# OK!
 task :sync_local_dirs_from_server do
   on roles(:all) do
     fetch(:sync_dirs, []).each do |sync_dir|
@@ -172,6 +139,7 @@ task :sync_local_dirs_from_server do
   end
 end
 
+# OK!
 task :fetch_and_reset_git_repository do
   on roles(:all) do
     with fetch(:environment) do
@@ -183,26 +151,18 @@ task :fetch_and_reset_git_repository do
   end
 end
 
-task :fetch_and_reset_spa_git_repository do
-  on roles(:all) do
-    with fetch(:environment) do
-      within fetch(:deploy_spa_to) do
-        execute :git, :fetch, 'origin'
-        execute :git, :reset, "--hard origin/#{fetch(:spa_deploy_branch, 'master')}"
-      end
-    end
-  end
-end
-
+# OK!
 task :create_database_from_sql_file do
   on roles(:all) do
     with fetch(:environment) do
       within fetch(:deploy_to) do
         execute :rake, 'db:create'
+        execute :rake, 'db:migrate'
+        execute :rake, 'db:seed'
         if test "[ -f #{fetch(:deploy_to)}/db/#{fetch(:application)}.sql ]"
           execute :psql, "-d #{fetch(:application)}_production", "-f db/#{fetch(:application)}.sql"
+          execute :rake, 'db:migrate'
         end
-        execute :rake, 'db:migrate'
       end
     end
   end

data/lib/railman/tasks/nginx.conf

@@ -0,0 +1,12 @@
+server {
+  listen 80;
+  listen [::]:80;
+  server_name DOMAINS;
+
+  root /home/deploy/apps/APPLICATION/public;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ =404;
+  }
+}

data/lib/railman/tasks/set_railman_env.rake

@@ -1,24 +1,20 @@
 task :set_railman_env do
   set :deploy_to, "/home/deploy/apps/#{fetch(:application)}"
-  if fetch(:spa_application)
-    set :deploy_spa_to, "/home/deploy/sites/#{fetch(:spa_application)}"
-  end
-  set :rbenv_home, '/home/deploy/.rbenv'
-  set :environment, {path: "#{fetch(:rbenv_home)}/shims:#{fetch(:rbenv_home)}/bin:$PATH", rails_env: 'production'}
+  set :environment, { rails_env: 'production'}
+  set :chruby_prefix, "/usr/local/bin/chruby-exec #{fetch(:chruby_ruby)} -- RAILS_ENV=production "
 
-  SSHKit.config.command_map[:rake] = "#{fetch(:deploy_to)}/bin/rake"
-  %w(ln cp service start restart stop status certbot).each do |cmd|
+  SSHKit.config.command_map[:rake] = "#{fetch(:chruby_prefix)} #{fetch(:deploy_to)}/bin/rake"
+  SSHKit.config.command_map[:bundle] = "#{fetch(:chruby_prefix)} #{fetch(:deploy_to)}/bin/bundle"
+  %w(systemctl certbot).each do |cmd|
     SSHKit.config.command_map[cmd.to_sym] = "sudo #{cmd}"
   end
-  SSHKit.config.command_map[:eye] = "#{fetch(:rbenv_home)}/shims/eye"
   SSHKit.config.command_map[:su_rm] = 'sudo rm'
+  SSHKit.config.command_map[:su_ln] = 'sudo ln'
+  SSHKit.config.command_map[:su_cp] = 'sudo cp'
 end
 
 before :setup, :set_railman_env
-before :setup_spa, :set_railman_env
 before :deploy, :set_railman_env
-before :deploy_spa, :set_railman_env
-before :deploy_all, :set_railman_env
 before :update, :set_railman_env
 before :reset_server, :set_railman_env
 before :remove, :set_railman_env

data/lib/railman/tasks/test.rb

@@ -0,0 +1,4 @@
+s = File.read(File.join(File.dirname(__FILE__), 'nginx.conf'))
+s.gsub!('DOMAINS', 'faluninfo.ba www.faluninfo.ba')
+s.gsub!('APPLICATION', 'faluninfo')
+puts s

data/railman-deployment.gemspec

@@ -15,14 +15,13 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^test/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.8"
-  spec.add_development_dependency "minitest-reporters", "~> 1.1"
+  spec.add_development_dependency "bundler", "~> 1.16.1"
+  spec.add_development_dependency "rake", "~> 12.3.0"
+  spec.add_development_dependency "minitest", "~> 5.11.3"
+  spec.add_development_dependency "minitest-reporters", "~> 1.1.19"
   spec.add_development_dependency "gem-release", "~> 0.7"
-  spec.add_development_dependency "geminabox", "~> 0.13"
+  spec.add_development_dependency "geminabox", "~> 0.13.15"
   spec.add_development_dependency "coveralls"
 
   spec.add_dependency "capistrano", "~> 3.6.1"
-  spec.add_dependency "eye", "~> 0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railman-deployment
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Igor Jancev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: 5.11.3
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.19
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.15
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.1
-- !ruby/object:Gem::Dependency
-  name: eye
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 description: railman-deployment gem adds capistrano tasks for automated deployment
   of rails applications generated by railman
 email:
@@ -162,7 +148,9 @@ files:
 - lib/railman/deployment/set_railman_env.rb
 - lib/railman/deployment/tasks.rb
 - lib/railman/tasks/deployment.rake
+- lib/railman/tasks/nginx.conf
 - lib/railman/tasks/set_railman_env.rake
+- lib/railman/tasks/test.rb
 - railman-deployment.gemspec
 homepage: https://github.com/igorj/railman-deployment
 licenses:
@@ -184,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Capistrano tasks for railman-generated rails applications