escualo 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8062beb1eb515d0f90c7b7ad838d4f2912a66a
-  data.tar.gz: 2791e2a0121d9a524623724be5abf77d75afbfa2
+  metadata.gz: 2311d5bcbd817cbed4b83e76cbf0186a48d10854
+  data.tar.gz: 51835791f32711753d833276c54c11ebc1bf700c
 SHA512:
-  metadata.gz: 892619da0ffbe9787a3a0f58ced1b8fcccd3684fda000b03afc14520ac3c46d5c2cd8d2f98044edb4e95d6ec05e02ef21169d0d689d8e386aee3c391e37751b4
-  data.tar.gz: de2dcebeabf13f51501f730dd1177ec231b45973bdec3d431f8964b2f46d533a8ccac81d2e66e47821a5555e4a5d450dcf82029b01b6f3134a9090fb0cfc784c
+  metadata.gz: 13c4f2ee302e8f8f1c61ce235d5df7e9a2661e230f07c24f527452c9c7057cce2cd7071062057ca9e66100f3eb1a9be792c80c711836bf45c60ba4d11396911e
+  data.tar.gz: b6c2495418d878d3f722316acbe8710f92ea264eb44c497fd8ed84449c1366580ae4b79d64fc07000215ce286835744978f21f8dbd700a75e3d0534741fc02db

data/lib/commands/plugin.rb

@@ -3,15 +3,18 @@ command 'plugin install' do |c|
   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 '-f', '--force', TrueClass, 'Force reinstalling even if already done'
+  c.option '--pg-version VERSION', String, 'PostgreSQL major and minor version. Default is 9.3, only for postgre 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'
+
     plugin = args.first
     say "Installing #{plugin}"
 
     installer = Escualo::Plugin.load plugin
 
-    do_unless installer.check(ssh),
+    do_unless installer.check(ssh, options),
               "Plugin #{plugin} is already installed",
               options do
 
@@ -19,10 +22,10 @@ command 'plugin install' do |c|
         log = installer.run ssh, options
       end
 
-      if installer.check ssh
+      if installer.check ssh, options
         say 'Installed successfully!'
       else
-        say "Something went wrong. Last output was: \n#{log}"
+        say "Something went wrong"
       end
     end
   end

data/lib/escualo/plugin/docker.rb

@@ -4,7 +4,7 @@ module Escualo::Plugin
       ssh.perform! 'apt-get install -y docker.io', options
     end
 
-    def check(ssh)
+    def check(ssh, _options)
       ssh.exec!('docker -v').include? 'Docker version'
     end
   end

data/lib/escualo/plugin/haskell.rb

@@ -4,7 +4,7 @@ module Escualo::Plugin
       ssh.perform! 'apt-get install -y haskell-platform', options
     end
 
-    def check(ssh)
+    def check(ssh, _options)
       ssh.exec!('ghc --version').include? 'The Glorious Glasgow Haskell Compilation System'
     end
   end

data/lib/escualo/plugin/mongo.rb

@@ -10,7 +10,7 @@ module Escualo::Plugin
       }, options
     end
 
-    def check(ssh)
+    def check(ssh, _options)
       ssh.shell.exec!('mongod --version').include? 'db version v3.2'
     end
   end

data/lib/escualo/plugin/nginx.rb

@@ -12,7 +12,7 @@ module Escualo::Plugin
       }, options
     end
 
-    def check(ssh)
+    def check(ssh, _options)
       ssh.exec!('nginx -v').include? 'nginx version: nginx/1'
     end
   end

data/lib/escualo/plugin/node.rb

@@ -8,7 +8,7 @@ module Escualo::Plugin
       }, options
     end
 
-    def check(ssh)
+    def check(ssh, _options)
       ssh.shell.exec!('nvm use node').include? 'Now using node v4.2.4'
     end
   end

data/lib/escualo/plugin/postgre.rb

@@ -1,7 +1,7 @@
 module Escualo::Plugin
   class Postgre
     def run(ssh, options)
-      pg_hba_conf = '/etc/postgresql/9.3/main/pg_hba.conf'
+      pg_hba_conf = "/etc/postgresql/#{options.pg_version}/main/pg_hba.conf"
 
       ssh.shell.perform! %Q{
         apt-get install postgresql libpq-dev -y &&
@@ -16,8 +16,8 @@ EOF
       }, options
     end
 
-    def check(ssh)
-      ssh.shell.exec!('psql --version').include? 'psql (PostgreSQL) 9.3'
+    def check(ssh, options)
+      ssh.shell.exec!('psql --version').include? "psql (PostgreSQL) #{options.pg_version}"
     end
   end
 end

data/lib/escualo/plugin/rabbit.rb

@@ -15,7 +15,7 @@ module Escualo::Plugin
       }, options
     end
 
-    def check(ssh)
+    def check(ssh, _options)
       ssh.exec!('rabbitmq-server').include? 'node with name "rabbit" already running'
     end
   end

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
   BASE_VERSION = '3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli