mina-multideploy 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 969d4c8fccca59952aab56ffbce0dbd41c8ec0ab14d81ba3fa8258b3705e82bc
-  data.tar.gz: 8fc2f58ce2e9715f04c45cd1a17c53fd57bd3b72305b3726fcf17757ed852171
+  metadata.gz: aca7ad4690b9550048d60ca01c629d187bd788722558ec41a528b3518e662087
+  data.tar.gz: 52671874308ad8cd188ecdc2f086107b09eb7fe31483ced6b91b1fa44fcb2418
 SHA512:
-  metadata.gz: 9ddeb3a89e0bfbf602574d8fc01a7a5239fa4fa56fc03c37887b6f2ec1a42aedb6b209cf63ba9ac954a699c4fcb00c9f3b7dd248bf166952ad2d2defd5739bab
-  data.tar.gz: 6f08a685ce34814fcd65acc1a7977a8b07df883092a6fde7242f86cc3213a50b8182e38ed922ba3aa3ed9e9f1c4de5645f74c3f185899d95beb63c00d3b92efa
+  metadata.gz: a45f632fec2ac0689d50d3cc76e592966412892e8658b3feffda14a46a321f182719318a0b7e7a0c88c0f063b5b94a2ddcbe3672c75dd271365fa84462c7bc36
+  data.tar.gz: ed2f1996a3032daa0f915416f4a2c31b3dff15781ee8c2a365230071fe5ebb9d1ab0c3fb9d307fa45cf9260a5263687527465cc241014b87372b72d37292e477

data/README.md

@@ -33,6 +33,8 @@ config/initializers/multideploy.rb
 ```
 It should look something like this:
 ```ruby
+return unless defined? Mina::Multideploy
+
 Mina::Multideploy.configure do |config|
   config.servers = {}
   # Default velues
@@ -46,7 +48,7 @@ end
 *`servers`* - hash at format `domain` => `array of application_name's`.
 
 Example:
-```
+```ruby
 config.servers = {
   '84.155.207.209' => %w[carghana caryange cartanzania]
   '105.87.69.69'   => %w[poster]
@@ -67,7 +69,7 @@ Run this command:
 ```ruby
 bundle exec rails multideploy:prepare
 ```
-You will get two files `multideploy` and `server_deploy.rb` at working directory (tmp/deploy by default). Check them and run `./tmp/deploy/multideploy`.
+You will get file `servers_deploy.rb` at working directory (tmp/deploy by default). Check it and run `ruby ./tmp/deploy/server_deploy.rb`.
 
 ### Automatic deploy
 Run this command:
@@ -77,7 +79,7 @@ bundle exec rails multideploy:start
 It will make the same as `multideploy:prepare`, but the deployment will start automatically.
 
 ## Additional information
-* all scripts are updated before launch `multideploy:prepare` and `multideploy:start`
+* all scripts are updated according config file before launch `multideploy:prepare` and `multideploy:start`
 * add public SSH key, so you can login to server without password. Run `ssh-copy-id user@$host`
 
 ## License

data/lib/mina/multideploy/create_scripts.rb

@@ -10,7 +10,6 @@ module Multideploy
 
     def call
       create_dir
-      write_bash_script
       write_ruby_script
     end
 
@@ -25,26 +24,7 @@ module Multideploy
     end
 
     def deploy_file
-      'server_deploy.rb'
-    end
-
-    def bash_script
-      script = '#!/bin/bash'
-      script << "\n\n"
-      script << "echo 'Deploy started!'"
-      script << "\n\n"
-      script << c.servers.keys.map { |ip| "ruby \"$PWD/#{working_dir}/#{deploy_file}\" --ip #{ip} &\n" }.join('')
-      script << "\n"
-      script << 'wait'
-      script << "\n"
-      script << "echo 'Deploy finished!'"
-    end
-
-    def write_bash_script
-      File.open("#{working_dir}/multideploy", 'w+') do |f|
-        f.write(bash_script)
-      end
-      FileUtils.chmod 0755, "#{working_dir}/multideploy"
+      'servers_deploy.rb'
     end
 
     def ruby_script
@@ -59,7 +39,7 @@ module Multideploy
       File.open("#{working_dir}/#{deploy_file}", 'w+') do |f|
         f.write(ruby_script)
       end
-      FileUtils.chmod 0755, "#{working_dir}/#{deploy_file}"
+      FileUtils.chmod 0o755, "#{working_dir}/#{deploy_file}"
     end
   end
 end

data/lib/mina/multideploy/init.rb

@@ -12,6 +12,8 @@ module Multideploy
 
     def content
       <<-EOS
+return unless defined? Mina::Multideploy
+
 Mina::Multideploy.configure do |config|
   config.servers = {}
   # Default velues

data/lib/mina/multideploy/templates/servers_deploy.rb

@@ -0,0 +1,48 @@
+require 'fileutils'
+require 'logger'
+require 'parallel'
+require 'tty-progressbar'
+# require 'byebug'
+
+# Servers list
+SERVERS = SERVERS_TO_REPLACE
+
+w_dir = Dir.pwd
+c_dir = "#{w_dir}/CUSTOM_W_DIR_TO_REPLACE/config"
+l_dir = "#{w_dir}/CUSTOM_W_DIR_TO_REPLACE/log"
+
+original_deploy_config = File.read("#{w_dir}/ORIGINAL_DEPLOY_FILE_TO_REPLACE")
+max_ip_length = SERVERS.keys.map(&:length).max + 1
+multibar = TTY::ProgressBar::Multi.new
+
+FileUtils.mkdir_p c_dir unless File.exist?(c_dir)
+FileUtils.mkdir_p l_dir unless File.exist?(l_dir)
+
+# Deploy script
+Parallel.each(SERVERS, in_threads: SERVERS.length) do |ip, names|
+  bar = multibar.register("#{ip.ljust(max_ip_length)} [:current/:total] :report", total: names.size)
+  bar.start
+
+  report = ''
+  bar.advance(0, report: report)
+
+  names.each do |site|
+    c_file_name = "#{ip}-#{site}.rb"
+    l_file_name = "#{ip}-#{site}.log"
+
+    custom_deploy_config = original_deploy_config.gsub(/^set :application_name(.*)/, "set :application_name, :#{site}")
+    custom_deploy_config = custom_deploy_config.gsub(/^set :domain(.*)/, "set :domain, '#{ip}'")
+
+    FileUtils.rm "#{l_dir}/#{l_file_name}" if File.exist?("#{l_dir}/#{l_file_name}")
+    File.write("#{c_dir}/#{c_file_name}", custom_deploy_config)
+
+    cmd = "mina deploy -f #{c_dir}/#{c_file_name}"
+    cmd = `#{cmd}`
+
+    logger = Logger.new("#{l_dir}/#{l_file_name}")
+    logger.info(cmd)
+
+    report += "#{site} ✗ " if cmd.include?('ERROR: Deploy failed.')
+    bar.advance(report: report)
+  end
+end

data/lib/mina/multideploy/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Multideploy
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/lib/mina/tasks/multideploy_tasks.rake

@@ -11,13 +11,13 @@ namespace :multideploy do
   task prepare: :environment do
     c = Mina::Multideploy.configuration
     Multideploy::CreateScripts.call
-    puts "Run './#{c.w_dir}/multideploy' to start deploy"
+    puts "Run 'ruby ./#{c.w_dir}/servers_deploy.rb' to start deploy"
   end
 
   desc 'Prepare deploy scripts and start deploying'
   task start: :environment do
     c = Mina::Multideploy.configuration
     Multideploy::CreateScripts.call
-    exec "./#{c.w_dir}/multideploy"
+    exec "ruby ./#{c.w_dir}/servers_deploy.rb"
   end
 end

data/mina-multideploy.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_runtime_dependency 'parallel'
+  spec.add_runtime_dependency 'tty-progressbar'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-multideploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sergey Volkov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem will help you deploy the application on multiple servers in
   parallel. It takes original mina deploy.rb file, changes application_name, domain
   and starts deploying process.
@@ -75,7 +103,7 @@ files:
 - lib/mina/multideploy/create_scripts.rb
 - lib/mina/multideploy/init.rb
 - lib/mina/multideploy/railtie.rb
-- lib/mina/multideploy/templates/server_deploy.rb
+- lib/mina/multideploy/templates/servers_deploy.rb
 - lib/mina/multideploy/version.rb
 - lib/mina/tasks/multideploy_tasks.rake
 - mina-multideploy.gemspec

data/lib/mina/multideploy/templates/server_deploy.rb

@@ -1,74 +0,0 @@
-require 'fileutils'
-require 'logger'
-require 'optparse'
-# require 'byebug'
-
-# Servers list
-SERVERS = SERVERS_TO_REPLACE
-
-# Read entered options
-options = {}
-OptionParser.new do |parser|
-  parser.banner = 'Usage: hello.rb [options]'
-
-  parser.on('-h', '--help', 'Show this help message') do
-    puts parser
-  end
-
-  parser.on('--ip IP', 'The ip address server to deploy.') do |v|
-    options[:ip] = v
-  end
-end.parse!
-
-ip    = options[:ip]
-w_dir = Dir.pwd
-c_dir = "#{w_dir}/CUSTOM_W_DIR_TO_REPLACE/config"
-l_dir = "#{w_dir}/CUSTOM_W_DIR_TO_REPLACE/log"
-original_deploy_config = File.read("#{w_dir}/ORIGINAL_DEPLOY_FILE_TO_REPLACE")
-
-FileUtils.mkdir_p c_dir unless File.exist?(c_dir)
-FileUtils.mkdir_p l_dir unless File.exist?(l_dir)
-
-# Deploy report to console
-class SiteDeployReport
-
-  attr_reader :ip, :site, :status
-
-  def initialize(ipaddress, site, status)
-    @ip     = ipaddress
-    @site   = site
-    @status = status
-  end
-
-  def call
-    puts "#{ip} - #{site} - #{status}"
-  end
-
-end
-
-# Deploy script
-SERVERS[ip].each do |site|
-  c_file_name = "#{ip}-#{site}.rb"
-  l_file_name = "#{ip}-#{site}.log"
-
-  FileUtils.rm "#{l_dir}/#{l_file_name}" if File.exist?("#{l_dir}/#{l_file_name}")
-  logger = Logger.new("#{l_dir}/#{l_file_name}")
-
-  custom_deploy_config = original_deploy_config.gsub(/^set :application_name(.*)/, "set :application_name, :#{site}")
-  custom_deploy_config = custom_deploy_config.gsub(/^set :domain(.*)/, "set :domain, '#{ip}'")
-
-  File.write("#{c_dir}/#{c_file_name}", custom_deploy_config)
-
-  cmd = "mina deploy -f #{c_dir}/#{c_file_name}"
-  cmd = `#{cmd}`
-
-  logger.info(cmd)
-
-  raise 'ERROR: Deploy failed.' if cmd.include?('ERROR: Deploy failed.')
-
-rescue StandardError => e
-  SiteDeployReport.new(ip, site, '✗').call
-  logger.error(e)
-else
-  SiteDeployReport.new(ip, site, '✓').call
-end