escualo 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bf366a2ccdefdd9c7d0763c4c3dcee51957e733
-  data.tar.gz: f0359ce5d57083e5322fdd6c5176a3ba85c54f36
+  metadata.gz: 9ca67b509144fad6dbaf8a507cb5caeb31dc07dc
+  data.tar.gz: 22bd4bb34946705c6a8e285ff831e374a1283337
 SHA512:
-  metadata.gz: cf1e12413710310f5645da34bdd221755c70895c5f1b41d5309f2f2d6c42c6b3f848fbe044000f48a8c9e817c2af66cab5ff710e74f62284312e279ea187a162
-  data.tar.gz: 367a8ef0bc7a27840a904693da66aa56ab5273e3a5d8f3faf9cfd6da730eb3633566a2cc4a7e9caa0d3c0c054cc4737a34d96fb00fa2a440b27e7c992c0d31c1
+  metadata.gz: 5dd59f3fe505e7d01b68fccf8a2ed86013fdf88df85673f55367504f4918558a48521a3676e0f95a7b854d29e0de9565d2369b2b6734c7796495ef87bd2937e2
+  data.tar.gz: f9d999c5a5245c8935b3607b566791e151d01c3f52de8ef0f594be1dfa53eedad2fa4b3fbc529625c4c948d8b126c300cc693e39fa08b29fbbb98732562ae391

data/lib/commands/artifact.rb

@@ -15,7 +15,12 @@ command 'artifact destroy' do |c|
     name = args.first
 
     Escualo::Artifact.destroy(ssh, name)
-    say "#{name} destroyed successfully"
+
+    if !Escualo::Artifact.present? ssh, name
+      say "#{name} destroyed successfully"
+    else
+      abort "Could not destroy artifact #{name}"
+    end
   end
 end
 

data/lib/commands/bootstrap.rb

@@ -1,28 +1,15 @@
-def ask_monit_password(options)
-  password = ask('Monit Password: ') { |q| q.echo = '*' }
-  options.default monit_password: password
-end
-
 command 'bootstrap' do |c|
   c.syntax = 'escualo bootstrap'
   c.description = 'Prepare environment to be an escualo host'
   c.option '--swap', TrueClass, 'Setup swap?'
-  c.option '--monit-version VERSION', String, 'Monit version'
-  c.option '--monit-password PASSWORD', String, 'Monit password. Will be prompted otherwise'
-  c.option '--no-monit', TrueClass, 'Skip monit installation'
   c.option '--env ENVIRONMENT', String, 'Environment. Valid options are development and production. default is production'
   c.option '--with-rbenv', TrueClass, 'Use rbenv instead of native ruby installation'
-
   c.option '-f', '--force', TrueClass, 'Force bootstrap even if already done?'
 
   c.ssh_action do |_args, options, ssh|
-    ask_monit_password(options) unless  options.monit_password || options.no_monit
-    options.default monit_version: '5.16',
-                    env: 'production'
+    options.default env: 'production'
 
-    do_unless Escualo::Env.present?(ssh, :ESCUALO_BASE_VERSION),
-              'This host has already been bootstrapped',
-              options do
+    do_unless Escualo::Bootstrap.check(ssh), 'This host has already been bootstrapped', options do
       step 'Configuring variables...' do
         Escualo::Env.setup ssh
         Escualo::Env.set_builtins ssh, options
@@ -33,23 +20,19 @@ command 'bootstrap' do |c|
         Escualo::Bootstrap.install_ruby ssh, options
       end
 
-      step 'Installing and configuring monit...' do
-        Escualo::Bootstrap.setup_monit ssh, options
-      end unless options.no_monit
-
       step 'Enabling swap...' do
         Escualo::Bootstrap.enable_swap ssh
       end if options.swap
 
       step 'Installing gems...' do
-        Escualo::Bootstrap.install_gems ssh, options
+        Escualo::Gems.install ssh, options
       end
 
       step 'Setup artifact directories...' do
         Escualo::Artifact.setup ssh
       end
 
-      if Escualo::Env.present?(ssh, :ESCUALO_BASE_VERSION)
+      if Escualo::Bootstrap.check ssh
         say 'Host bootstrapped successfully '
       else
         abort 'bootstrapping failed'

data/lib/commands/plugin.rb

@@ -2,12 +2,18 @@ command 'plugin install' do |c|
   c.syntax = 'escualo plugin install <plugin>'
   c.description = "Install plugin on host. Valid plugins are #{Escualo::Plugin::PLUGINS.join(', ')}"
   c.option '--nginx-conf FILENAME', String, 'ningix config file, only for nginx plugin'
+
   c.option '--rabbit-admin-password PASSWORD', String, 'rabbitmq admin password, only for rabbit plugin'
+
   c.option '--pg-version VERSION', String, 'PostgreSQL major and minor version. Default is 9.3, only for postgre plugin'
 
+  c.option '--monit-version VERSION', String, 'Monit version. Default is 5.16'
+  c.option '--monit-password PASSWORD', String, 'Monit password. Required with monit plugin'
+
   c.option '-f', '--force', TrueClass, 'Force reinstalling even if already done'
   c.ssh_action do |args, options, ssh|
-    options.default pg_version: '9.3'
+    options.default pg_version: '9.3',
+                    monit_version: '5.16'
 
     plugin = args.first
     say "Installing #{plugin}"

data/lib/commands/script.rb

@@ -16,13 +16,13 @@ command 'script' do |c|
     mode.start! options
 
     file = YAML.load_file args.first
+
     local_ssh = Net::SSH::Connection::LocalSession.new
     delegated_options = Escualo::Script.delegated_options options
 
     step 'Running local commands...' do
       mode.run_commands_for! file['local'], delegated_options, local_ssh, options
     end
-
     step 'Running remote commands...' do
       Net::SSH.with_session(ssh_session_options) do |ssh|
         mode.run_commands_for! file['remote'], ssh, options

data/lib/escualo/bootstrap.rb

@@ -11,7 +11,6 @@ module Escualo
                  libreadline6-dev \
                  curl \
                  git \
-                 monit \
                  libssl-dev \
                  zlib1g \
                  zlib1g-dev \
@@ -48,24 +47,8 @@ module Escualo
         echo '/swapfile   none    swap    sw    0   0' >> /etc/fstab}
     end
 
-    def self.setup_monit(ssh, options)
-      ssh.perform! %Q{
-        service monit stop
-        cd /tmp &&
-        wget https://mmonit.com/monit/dist/binary/5.16/monit-#{options.monit_version}-linux-x64.tar.gz &&
-        tar -xzf monit-#{options.monit_version}-linux-x64.tar.gz &&
-        cp monit-#{options.monit_version}/bin/monit /usr/bin/monit
-        ln -s /etc/monit/monitrc /etc/monitrc
-        service monit start
-        echo 'set httpd port 2812 and' > /etc/monit/conf.d/web-server
-        echo '  allow 0.0.0.0/0.0.0.0' >> /etc/monit/conf.d/web-server
-        echo '  allow admin:#{options.monit_password}' >> /etc/monit/conf.d/web-server
-        monit reload
-    }, options
-    end
-
-    def self.install_gems(ssh, options)
-      ssh.shell.perform! 'gem install bundler && gem install escualo', options
+    def self.check(ssh)
+      Escualo::Env.present?(ssh, :ESCUALO_BASE_VERSION) && Escualo::Gems.present?(ssh)
     end
   end
 end

data/lib/escualo/env.rb

@@ -28,7 +28,9 @@ module Escualo
 
     def self.present?(ssh, variable)
       value = get(ssh, variable)
-      value.present? && !value.include?('No such file or directory')
+      value.present?
+    rescue
+      false
     end
 
     def self.get(ssh, variable)

data/lib/escualo/gems.rb

@@ -0,0 +1,9 @@
+module Escualo::Gems
+  def self.install(ssh, options)
+    ssh.shell.perform! 'gem install bundler && gem install escualo', options
+  end
+
+  def self.present?(ssh)
+    ssh.shell.exec!('escualo --version').include? "escualo #{Escualo::VERSION}"
+  end
+end

data/lib/escualo/plugin/monit.rb

@@ -0,0 +1,24 @@
+module Escualo::Plugin
+  class Monit
+    def run(ssh, options)
+      ssh.perform! %Q{
+        apt-get install monit
+        service monit stop
+        cd /tmp &&
+        wget https://mmonit.com/monit/dist/binary/5.16/monit-#{options.monit_version}-linux-x64.tar.gz &&
+        tar -xzf monit-#{options.monit_version}-linux-x64.tar.gz &&
+        cp monit-#{options.monit_version}/bin/monit /usr/bin/monit
+        ln -s /etc/monit/monitrc /etc/monitrc
+        service monit start
+        echo 'set httpd port 2812 and' > /etc/monit/conf.d/web-server
+        echo '  allow 0.0.0.0/0.0.0.0' >> /etc/monit/conf.d/web-server
+        echo '  allow admin:#{options.monit_password}' >> /etc/monit/conf.d/web-server
+        monit reload
+    }, options
+    end
+
+    def check(ssh, options)
+      ssh.shell.exec!('monit --version').include? 'This is Monit version 5'
+    end
+  end
+end

data/lib/escualo/plugin.rb

@@ -1,6 +1,6 @@
 module Escualo
   module Plugin
-    PLUGINS = %w(node haskell docker postgre nginx rabbit mongo)
+    PLUGINS = %w(node haskell docker postgre nginx rabbit mongo monit)
 
     def self.load(name)
       "Escualo::Plugin::#{name.capitalize}".constantize.new
@@ -14,6 +14,7 @@ module Escualo
 end
 
 require_relative './plugin/docker'
+require_relative './plugin/monit'
 require_relative './plugin/haskell'
 require_relative './plugin/mongo'
 require_relative './plugin/nginx'

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.9.1'
+  VERSION = '1.0.0'
   BASE_VERSION = '3.2'
 end

data/lib/escualo.rb

@@ -19,6 +19,7 @@ require_relative './ssh'
 require_relative './escualo/version'
 require_relative './escualo/env'
 require_relative './escualo/ppa'
+require_relative './escualo/gems'
 require_relative './escualo/bootstrap'
 require_relative './escualo/script'
 require_relative './escualo/plugin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   escualo.rb is command-line tools that implements of the escualo provisioning format used by Mumuki Platform.
                           It allows to deploy mumuki artifacts to any host
@@ -134,10 +148,12 @@ files:
 - lib/escualo/artifact.rb
 - lib/escualo/bootstrap.rb
 - lib/escualo/env.rb
+- lib/escualo/gems.rb
 - lib/escualo/plugin.rb
 - lib/escualo/plugin/docker.rb
 - lib/escualo/plugin/haskell.rb
 - lib/escualo/plugin/mongo.rb
+- lib/escualo/plugin/monit.rb
 - lib/escualo/plugin/nginx.rb
 - lib/escualo/plugin/node.rb
 - lib/escualo/plugin/postgre.rb