escualo 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6417e0fb1dfd74df4ef3b7e5233315a16caa1544
-  data.tar.gz: c51650e52e78d735151e6babe0f1c7e0184a605c
+  metadata.gz: cb5a4cd7987f7f538d8d6dbb31efe78bdda4e58a
+  data.tar.gz: ac12b60c463fbb7cc2412b740367f6277f19f915
 SHA512:
-  metadata.gz: 078af849118e0ad2ebfa9434694d6b97eab7eec4ba82a6324d83a071d55adb5b81acf4c5a18bcad35c160bf5494804c3f4e6e3b4403772226710e520ce4408d1
-  data.tar.gz: 27ec0752d8bea6e3cea4fd15a64b9ea2f53a56359032b7bfcf8f732383089dc51bb1cf73bbb5e395eb6715c45a7528866b29e3f054527d21784ab4f0d2ef9d32
+  metadata.gz: c454b54e8282ba622911aa03bc5176ce1b355b89828005c8099b4749029498e24852557a02cdc42e04196eed07b9797cbc53acec76b81338ec51d75d920de877
+  data.tar.gz: 31f36d47f87e163b3996f90180de12c2b5e1fdb28e036bcae25ff125f89f9ce8dd43e3b7141bf90a254dde2d9bcc4f7221fcb383d64362a94517c1c5cba2eaae

data/bin/escualo

@@ -26,6 +26,7 @@ end
 
 require_relative '../lib/commands/globals'
 
+require_relative '../lib/commands/base'
 require_relative '../lib/commands/bootstrap'
 require_relative '../lib/commands/deploy'
 require_relative '../lib/commands/script'

data/lib/commands/base.rb

@@ -0,0 +1,8 @@
+command 'base' do |c|
+  c.syntax = 'escualo base'
+  c.description = 'Install essential libraries'
+
+  c.ssh_action do |_args, options, ssh|
+    Escualo::Base.install_base ssh, options
+  end
+end

data/lib/commands/bootstrap.rb

@@ -10,20 +10,20 @@ command 'bootstrap' do |c|
     options.default env: 'production'
 
     do_unless Escualo::Bootstrap.check(ssh), 'This host has already been bootstrapped', options do
+
+      step 'Enabling swap...' do
+        Escualo::Bootstrap.enable_swap ssh
+      end if options.swap
+
       step 'Configuring variables...' do
         Escualo::Env.setup ssh
         Escualo::Env.set_builtins ssh, options
       end
 
-      step 'Installing base software...' do
-        Escualo::Bootstrap.install_base ssh, options
+      step 'Installing Ruby...' do
         Escualo::Bootstrap.install_ruby ssh, options
       end
 
-      step 'Enabling swap...' do
-        Escualo::Bootstrap.enable_swap ssh
-      end if options.swap
-
       step 'Installing gems...' do
         Escualo::Gems.install ssh, options
       end

data/lib/escualo/base.rb

@@ -0,0 +1,20 @@
+module Escualo
+  module Base
+    def self.install_base(ssh, options)
+      ssh.shell.perform! %q{
+        apt-get install -y \
+                 autoconf \
+                 bison \
+                 build-essential \
+                 libreadline6 \
+                 libreadline6-dev \
+                 curl \
+                 git \
+                 libssl-dev \
+                 zlib1g \
+                 zlib1g-dev \
+                 libreadline-dev
+      }, options
+    end
+  end
+end

data/lib/escualo/bootstrap.rb

@@ -1,22 +1,5 @@
 module Escualo
   module Bootstrap
-    def self.install_base(ssh, options)
-      ssh.shell.perform! %q{
-        apt-get install -y \
-                 autoconf \
-                 bison \
-                 build-essential \
-                 libreadline6 \
-                 libreadline6-dev \
-                 curl \
-                 git \
-                 libssl-dev \
-                 zlib1g \
-                 zlib1g-dev \
-                 libreadline-dev
-      }, options
-    end
-
     def self.install_ruby(ssh, options)
       ssh.shell.perform! 'apt-get purge libruby* -y', options
       if options.with_rbenv

data/lib/escualo/gems.rb

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

data/lib/escualo/version.rb

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

data/lib/escualo.rb

@@ -20,6 +20,7 @@ require_relative './escualo/version'
 require_relative './escualo/env'
 require_relative './escualo/ppa'
 require_relative './escualo/gems'
+require_relative './escualo/base'
 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: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
@@ -135,6 +135,7 @@ files:
 - bin/escualo
 - lib/command.rb
 - lib/commands/artifact.rb
+- lib/commands/base.rb
 - lib/commands/bootstrap.rb
 - lib/commands/deploy.rb
 - lib/commands/env.rb
@@ -146,6 +147,7 @@ files:
 - lib/commands/upload.rb
 - lib/escualo.rb
 - lib/escualo/artifact.rb
+- lib/escualo/base.rb
 - lib/escualo/bootstrap.rb
 - lib/escualo/env.rb
 - lib/escualo/gems.rb