escualo 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5a4cd7987f7f538d8d6dbb31efe78bdda4e58a
-  data.tar.gz: ac12b60c463fbb7cc2412b740367f6277f19f915
+  metadata.gz: c809f160a9a7a6ada7701ad6ff2caa6aebe94738
+  data.tar.gz: 2782155da8b03c01acf3f79291b406f62cfcb92c
 SHA512:
-  metadata.gz: c454b54e8282ba622911aa03bc5176ce1b355b89828005c8099b4749029498e24852557a02cdc42e04196eed07b9797cbc53acec76b81338ec51d75d920de877
-  data.tar.gz: 31f36d47f87e163b3996f90180de12c2b5e1fdb28e036bcae25ff125f89f9ce8dd43e3b7141bf90a254dde2d9bcc4f7221fcb383d64362a94517c1c5cba2eaae
+  metadata.gz: 9b613bec310b5a1e7f723a17c861b845f98ee18e8b2ca721df7cb214a5972f642559656fb6102cfcc2eb867e5627082919a5140e1109f5f82f6bb4491c78053e
+  data.tar.gz: 5303602c1b75568956a8883607118d23596cbe2192c39e2e0d876d0fb6828cc87a5a231bad5bc8850ac4e0e1376b3ab77f084df0d7d832e633666dc57e8d6854

data/lib/commands/bootstrap.rb

@@ -17,6 +17,7 @@ command 'bootstrap' do |c|
 
       step 'Configuring variables...' do
         Escualo::Env.setup ssh
+        Escualo::Env.set_locale ssh, options
         Escualo::Env.set_builtins ssh, options
       end
 

data/lib/commands/script.rb

@@ -2,6 +2,7 @@ command 'script' do |c|
   c.syntax = 'escualo script <FILE>'
   c.description = 'Runs a escualo configuration'
   c.option '--dockerized', TrueClass, 'Create a Dockerfile instead of running commands'
+  c.option '--development', TrueClass, 'Use local escualo gemspec instead of fetching from internet'
   c.option '--base-image BASE_IMAGE', String, 'Default base image. Only for dockerized runs'
 
   c.action do |args, options|

data/lib/escualo/artifact.rb

@@ -2,7 +2,7 @@ module Escualo
   module Artifact
     def self.setup(ssh)
       ssh.exec! %q{
-        mkdir -p/var/repo/ && \
+        mkdir -p /var/repo/ && \
         mkdir -p /var/scripts/
     }
     end

data/lib/escualo/env.rb

@@ -10,6 +10,10 @@ module Escualo
       }
     end
 
+    def self.set_locale(ssh, options)
+      ssh.perform! "locale-gen #{locale} && update-locale LANG=#{locale}", options
+    end
+
     def self.set_builtins(ssh, options)
       set ssh, ESCUALO_BASE_VERSION: Escualo::BASE_VERSION
       set ssh, Escualo::Env.locale_variables
@@ -55,10 +59,14 @@ module Escualo
 
     def self.locale_variables
       %w{LANG LC_ALL LC_NAME LC_IDENTIFICATION LC_PAPER LC_ADDRESS LC_TIME LC_NUMERIC LC_MONETARY LC_TELEPHONE LC_MEASUREMENT}.map do |it|
-        [it, 'en_US.UTF-8']
+        [it, locale]
       end.to_h
     end
 
+    def self.locale
+      'en_US.UTF-8'
+    end
+
     def self.environment_variables(environment)
       %w{RAILS_ENV NODE_ENV RACK_ENV}.map do |it|
         [it, environment]

data/lib/escualo/plugin/docker.rb

@@ -5,7 +5,7 @@ module Escualo::Plugin
     end
 
     def check(ssh, _options)
-      ssh.exec!('docker -v').include? 'Docker version'
+      ssh.exec!('docker -v').include? 'Docker version' rescue false
     end
   end
 end

data/lib/escualo/plugin/haskell.rb

@@ -5,7 +5,7 @@ module Escualo::Plugin
     end
 
     def check(ssh, _options)
-      ssh.exec!('ghc --version').include? 'The Glorious Glasgow Haskell Compilation System'
+      ssh.exec!('ghc --version').include? 'The Glorious Glasgow Haskell Compilation System' rescue false
     end
   end
 end

data/lib/escualo/plugin/mongo.rb

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

data/lib/escualo/plugin/monit.rb

@@ -18,7 +18,7 @@ module Escualo::Plugin
     end
 
     def check(ssh, options)
-      ssh.shell.exec!('monit --version').include? 'This is Monit version 5'
+      ssh.shell.exec!('monit --version').include? 'This is Monit version 5' rescue false
     end
   end
 end

data/lib/escualo/plugin/nginx.rb

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

data/lib/escualo/plugin/node.rb

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

data/lib/escualo/plugin/postgre.rb

@@ -17,7 +17,7 @@ EOF
     end
 
     def check(ssh, options)
-      ssh.shell.exec!('psql --version').include? "psql (PostgreSQL) #{options.pg_version}"
+      ssh.shell.exec!('psql --version').include? "psql (PostgreSQL) #{options.pg_version}" rescue false
     end
   end
 end

data/lib/escualo/plugin/rabbit.rb

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

data/lib/escualo/script.rb

@@ -43,8 +43,17 @@ module Escualo
 FROM #{base_image options}
 MAINTAINER #{ENV['USER']}
 RUN apt-get update && apt-get install ruby ruby-dev build-essential -y
-RUN gem install escualo -v #{Escualo::VERSION}
-"
+#{escualo_install options}"
+      end
+
+      def escualo_install(options)
+        if options.development
+          "
+COPY escualo-#{Escualo::VERSION}.gem escualo-#{Escualo::VERSION}.gem
+RUN gem install escualo-#{Escualo::VERSION}.gem\n"
+        else
+          "RUN gem install escualo -v #{Escualo::VERSION}\n"
+        end
       end
 
       def base_image(options)

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   BASE_VERSION = '3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
@@ -112,16 +112,16 @@ dependencies:
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.22'
 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