capun 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d6b9cc66696570bb87a7cecd0aab5219440a38c
-  data.tar.gz: 98ae084f9a1bfb4690f3fbb86ca41bdd506ee759
+  metadata.gz: 7550bf4a718eae76383022f37c3418bc34f9a4d5
+  data.tar.gz: 6e2bc4558ce4dc659eb9462c06c2bf3165db4612
 SHA512:
-  metadata.gz: 3e308ecc6673e7727b329ec10e156067db68dd5b11e59fa3436ebb98254886629059314415095cd439c7a58a581723e897b07a45b852542748b30bed4c3e3632
-  data.tar.gz: 87c27e9b546b2c8d99a7ea5156988bb1b467af60d540e2fd08f38be4e177b1d347a098a98d8186758de580f57d817d3751335fb03f6e221709bc84dd7fb0e674
+  metadata.gz: 967782850fc2f2ace0e1e8715ca61f419a8357cc9ec92e36d6f2da982625480a14f9a53955764ea6cea0ee48c5060ec97c808302753e75a9a6ce1ff23347686c
+  data.tar.gz: 85d9e244b2ec6e71dd371792e4f364c60f2042beeaf07470700af5f59ae88301ae6f08bbde734915ad92b97ed415625aaca63f27220797f7417c8d93e2d5a3ee

data/lib/capun/setup.rb

@@ -38,6 +38,8 @@ set :std_uploads, [
   {what: "config/deploy/drivesink.py", where: '#{shared_path}/drivesink.py', upload: true, overwrite: true},
   # backup.sh.erb
   {what: "config/deploy/database.yml.erb", where: '#{shared_path}/config/database.yml', upload: true, overwrite: true},
+  # restart script
+  {what: "config/deploy/start.erb", where: '#{release_path}/bin/start', upload: true, overwrite: true},
   # jenkins' config.xml
   {what: "config/deploy/jenkins.config.xml.erb", where: '/var/lib/jenkins/jobs/#{fetch(:application)}/config.xml', upload: -> { !!fetch(:addJenkins) }, overwrite: false},
   # newrelic.yml
@@ -64,6 +66,16 @@ namespace :backup do
   end
 end
 
+desc "Start server"
+task :start do
+  invoke 'deploy:kill_me'
+  invoke 'unicorn:start'
+  invoke 'delayed_job:restart' if fetch(:delayed_job)
+  invoke 'clockwork:restart' if fetch(:clockwork)
+end
+
+
+
 namespace :predeploy do
   namespace :install do
     desc 'Install RVM & Ruby'
@@ -201,6 +213,17 @@ namespace :deploy do
     end
   end
 
+  desc 'Setting up autorestart'
+  task :autorestart do
+    if fetch(:autorestart)
+      on roles(:app) do
+        execute :chmod, "+x #{release_path}/bin/start"
+        info "making start executable"
+        execute :sudo, :ln, "-nfs", "#{release_path}/bin/start /etc/init.d/autorestart-#{fetch(:application).gsub(/\./, '-')}"
+        info "Create symbolic link for autorestart"
+      end
+    end
+  end
 end
 
 before "deploy:updating", "deploy:make_dirs"
@@ -209,6 +232,7 @@ after "deploy:symlink:linked_dirs", "deploy:upload"
 after "deploy:symlink:linked_dirs", "deploy:add_symlinks"
 after "deploy:publishing", "deploy:set_up_jenkins"
 after "deploy:publishing", "deploy:prepare_logrotate"
+after "deploy:publishing", "deploy:autorestart"
 after "deploy:publishing", "deploy:restart_nginx"
 after "deploy:publishing", "deploy:restart_logstash"
 after "deploy:publishing", "deploy:update_cron"

data/lib/capun/version.rb

@@ -1,3 +1,3 @@
 module Capun
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/lib/generators/capun/install_generator.rb

@@ -15,6 +15,7 @@ module Capun
 
       def copy_files
         empty_directory "config/deploy"
+        copy_file "start.erb", "config/deploy/start.erb"
         copy_file "database.yml.erb", "config/deploy/database.yml.erb"
         copy_file "unicorn.config.rb.erb", "config/deploy/unicorn.config.rb.erb"
         copy_file "nginx.conf.erb", "config/deploy/nginx.conf.erb"

data/lib/generators/capun/stage_generator.rb

@@ -23,6 +23,9 @@ module Capun
         @addELK = ask("Would you like to add ELK-compatible logging? [Y/n]").capitalize == 'Y'
         @addlogrotate = ask("Would you like to add logrotate configuration to stage? [Y/n]").capitalize == 'Y'
         @useBackups = ask("Would you like to add amazon backup system? [Y/n]").capitalize == 'Y'
+        @addDelayedJob = ask("Would you like to add delayed job worker? [Y/n]").capitalize == 'Y'
+        @addClockwork = ask("Would you like to add clockwork worker? [Y/n]").capitalize == 'Y'
+        @autorestart = ask("Would you like to start application after server restart? [Y/n]").capitalize == 'Y'
       end
 
       def add_stage
@@ -100,6 +103,26 @@ module Capun
         end
       end
 
+      def addDelayedJob
+        if @addDelayedJob
+          append_to_file "config/deploy.rb","set :delayed_job, true\n"
+          append_to_file "Gemfile","gem 'delayed_job'\n"
+          append_to_file "Gemfile","gem 'delayed_job_active_record'\n"
+          append_to_file "Gemfile","gem 'capistrano3-delayed-job', '~> 1.0'\n"
+        end
+      end
+      def addClockwork
+        if @addClockwork
+          append_to_file "config/deploy.rb","set :clockwork, true\n"
+          append_to_file "Gemfile","gem 'clockwork'\n"
+          append_to_file "Gemfile","gem 'capistrano-clockwork'\n"
+        end
+      end
+      def addAutorestart
+        if @autorestart
+          append_to_file "config/deploy/#{singular_name}.rb", "set :autorestart, true\n"
+        end
+      end
       def add_jenkins
         if @addJenkins
           copy_file "jenkins.config.xml.erb", "config/deploy/jenkins.config.xml.erb"

data/lib/generators/capun/templates/backup.sh.erb

@@ -19,7 +19,17 @@ database=$(cat config/database.yml | grep database | sed s/database://g | xargs)
 mysqldump --user="$username" --password="$password" $database > "backuping/version-$curdate/<%=fetch(:stage)%>.sql"
 fi
 
-python drivesink.py upload "backuping" <%= fetch(:backupDestinationFolder) || "backups/firstdedic-server/" + fetch(:application)  %>
+COUNTER=5
+until [  $COUNTER -lt 1 ]; do
+    echo COUNTER $COUNTER
+    let COUNTER-=1
+    python drivesink.py upload "backuping" <%= fetch(:backupDestinationFolder) || "backups/firstdedic-server/" + fetch(:application)  %> >> log/backup.log
+    if [ $? -eq 0 ]; then
+      let COUNTER=0
+    else
+      let COUNTER-=1
+    fi
+done
 
 if [ $? -eq 0 ]; then
 SIZE=$(du -sh backuping | awk '{print $1}')

data/lib/generators/capun/templates/deploy.rb.erb

@@ -12,3 +12,4 @@ set :repo_url, '<%= @repo %>'
 set :rvm1_ruby_version, "ruby-2.3.0"
 
 # set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets public/system}
+# after 'start', 'your_task'  # you can set additional capistrano tasks to start server properly

data/lib/generators/capun/templates/start.erb

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd ..
+bundle exec cap <%= fetch(:stage) %> start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capun
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Ivan Zamylin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - lib/generators/capun/templates/newrelic.yml.erb
 - lib/generators/capun/templates/nginx.conf.erb
 - lib/generators/capun/templates/stage.rb.erb
+- lib/generators/capun/templates/start.erb
 - lib/generators/capun/templates/unicorn.config.rb.erb
 homepage: https://github.com/zamylin/capun
 licenses: