escualo 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 385c0ddef83465ce3be3b5aaae2c5306982de886
-  data.tar.gz: 7cb43a1d0008547536eddca4c6881b4048b5adff
+  metadata.gz: 3827d539f18c31abf1aaec81a89e06a42a70a58a
+  data.tar.gz: 02efc2c36af8bcffe6fc5be8400398c69daf0548
 SHA512:
-  metadata.gz: 3c904315d18c412774d419d8222ff3636b22c8ba08325c40845ac3d63be9586820e98cf0c4e774087a657e48cdd4c0055f3b1bf3294394638be7e19714f0d058
-  data.tar.gz: c44dae46ec6a3b99ba10167456ac528a72998c54a6cf8dbbbd5b7a25270cc4d9889e0059134f194431e626e968c5db437c46972f2e85f3985c0de5f5891e8d6b
+  metadata.gz: 6feadff99ff05b7df68ef80a2f243ec03aed1421faae87075fef2dda457297c9b4195fbfb3b6eef2eec57c1a87d53904436179a045855688e08b234458c3d648
+  data.tar.gz: 0ec8e3e187abeaa19e6707f3e2c5bfb7145d1813d0e737b6e88b09e654ff1fb7f2b6c59b1784d1f258d55b7fdf508111a7ac2ba1b742453b68e723e2d6391b79

data/lib/commands/bootstrap.rb

@@ -1,3 +1,8 @@
+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'
@@ -5,23 +10,22 @@ command 'bootstrap' do |c|
   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', 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|
-    unless options.monit_password
-      password = ask('Monit Password: ') { |q| q.echo = '*' }
-      options.default monit_password: password
-    end
-    options.default monit_version: '5.16'
+    ask_monit_password(options) unless  options.monit_password || options.no_monit
+    options.default monit_version: '5.16',
+                    environment: 'production'
 
     do_unless Escualo::Env.present?(ssh, :ESCUALO_BASE_VERSION),
               'This host has already been bootstrapped',
               options do
       step 'Configuring variables...' do
         Escualo::Env.setup ssh
-        Escualo::Env.set_builtins ssh
+        Escualo::Env.set_builtins ssh, options
       end
 
       step 'Installing base software...' do

data/lib/commands/env.rb

@@ -31,6 +31,6 @@ command 'env clean' do |c|
   c.syntax = 'escualo env clean'
   c.description = 'Unset all escualo variables on host'
   c.ssh_action do |args, options, ssh|
-    Escualo::Env.clean ssh
+    Escualo::Env.clean ssh, options
   end
 end

data/lib/escualo/bootstrap.rb

@@ -67,7 +67,7 @@ module Escualo
     end
 
     def self.install_gems(ssh, options)
-      ssh.perform! 'gem install bundler && gem install escualo', options
+      ssh.shell.perform! 'gem install bundler && gem install escualo', options
     end
   end
 end

data/lib/escualo/env.rb

@@ -10,19 +10,19 @@ module Escualo
       }
     end
 
-    def self.set_builtins(ssh)
+    def self.set_builtins(ssh, options)
       set ssh, ESCUALO_BASE_VERSION: Escualo::BASE_VERSION
       set ssh, Escualo::Env.locale_variables
-      set ssh, Escualo::Env.production_variables
+      set ssh, Escualo::Env.environment_variables(options.environment)
     end
 
     def self.list(ssh)
       ssh.exec!("cat ~/.escualo/vars/*").gsub("export ", '')
     end
 
-    def self.clean(ssh)
+    def self.clean(ssh, options)
       ssh.exec!("rm ~/.escualo/vars/*")
-      set_builtins ssh
+      set_builtins ssh, options
     end
 
     def self.present?(ssh, variable)
@@ -52,9 +52,9 @@ module Escualo
       end.to_h
     end
 
-    def self.production_variables
+    def self.environment_variables(environment)
       %w{RAILS_ENV NODE_ENV RACK_ENV}.map do |it|
-        [it, 'production']
+        [it, environment]
       end.to_h
     end
 

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
   BASE_VERSION = '3.2'
 end

metadata

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