subspace 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16254186781d02c9bcbae985b9251472b9daab254ba2db81dd03de7d7e464ce4
-  data.tar.gz: 7e924dd5ff57579a5db778c7a5b109c9ce99f42df8855d4bda4ef82f42aa9d8d
+  metadata.gz: 502252722c12c738a1eb7fdd9223000f97511661be03d875f9d85a4ee0371a2d
+  data.tar.gz: 9d180bf402c16d0a178222a559548f1172877c175d16b2c7f01f3ef374993099
 SHA512:
-  metadata.gz: 30673a2bbab4e6c6a8303eb3cf8ecbf1c15bd434a8adb757f3f9f6bbdd86867beb2066708bda03e1509a201cea5a9e253842ee257e58913e132e0a91beb98ff4
-  data.tar.gz: b5dcbc7ecdafbef131c00911aa2f271b0586a9ad534f2ceb56936a5811d6d57f54c1440bab5acc81569c46bd5fe45083cee6a9c2b1d7ff9aa2ea9fc620e34d93
+  metadata.gz: c42b398e7e586f80670135895e65b890578aa606a36596492876f359e39a2160037edc387418833e72a9bd5c255b9bf0b5f4361403468c96c37fda10efcaa083
+  data.tar.gz: e0bec8f2360847cb043f657f63dfecde5397e6ecb78d8aca4b96fe4392ac508f01402378f7acef7bf87cb069296de1b7a7a4a74a057b3213f09fedb73f99ccd6

data/CHANGELOG.md

@@ -4,6 +4,21 @@ This is a [changelog](https://keepachangelog.com/en/0.3.0/).
 
 This project attempts to follow [semantic versioning](https://semver.org/)
 
+## Known Bugs
+
+* Terminal Color
+  * Not working on OSX - macs don't read from /etc/profile.d/
+  * Stops showing color if you `sudo su`
+
+## 1.0.8
+
+* enhancements
+  * Add support for `-i` in `subpsace ssh` command.
+
+* bug fixes
+  * Check for all monit jobs stopping before changing config.
+  * Ensure /etc/profile.d/ exists
+
 ## 1.0.7
 
 * enhancements

data/ansible/roles/common/tasks/main.yml

@@ -2,17 +2,24 @@
   - name: Test connection
     ping:
 
+  - name: Ensure /etc/profile.d/ exists
+    file:
+      path: "/etc/profile.d/"
+      owner: root
+      state: directory
+    become: yes
+
   - name: Create terminal color file and make it executable
     file:
       path: "/etc/profile.d/termcolor.sh"
       state: touch
       mode: a+x
     become: true
-  
+
   - name: Set terminal color
     vars:
-      terminal_env_playbook: "{{terminal_env | default('not provided', true) }}" 
-    template: 
+      terminal_env_playbook: "{{terminal_env | default('not provided', true) }}"
+    template:
       src: terminalcolor
       dest: "/etc/profile.d/termcolor.sh"
     become: true

data/ansible/roles/common/templates/motd

@@ -4,7 +4,7 @@ This server brought to you by:
 \___ \| | | | '_ \___ \| '_ \ / _` |/ __/ _ \
  ___) | |_| | |_) |__) | |_) | (_| | (_|  __/
 |____/ \__,_|_.__/____/| .__/ \__,_|\___\___|
-                       |_|             v1.0.6
+                       |_|             v1.0.8
 ~~~ https://github.com/tenforwardconsulting/subspace ~~~
 
 If you need to make configuration changes to the server, please modify the

data/ansible/roles/delayed_job/tasks/main.yml

@@ -4,15 +4,21 @@
   - name: Monit Stop All
     shell: monit stop all
     become: true
+    ignore_errors: yes
+
+  - name: Wait for monit to stop
+    shell: monit status | grep Monitored | wc -l | awk '{print $1 $2}'
+    register: monit_stopped
+    retries: 10
+    until: monit_stopped.stdout == "0"
+    delay: 10
+    become: true
 
   - name: Install delayed_job monit script
     template:
       src: delayed-job-monit-rc
       dest: /etc/monit/conf.d/delayed_job_{{project_name}}_{{rails_env}}
     become: true
-    notify:
-      - reload_monit
-      - restart_monit
 
   - name: Remove old upstart files
     file:
@@ -26,6 +32,14 @@
       state: absent
     become: true
 
-  - name: Monit Start All
-    shell: monit start all
+  - name: reload_monit
+    shell: monit reload
+    become: true
+
+  - name: wait
+    pause:
+      seconds: 3
+
+  - name: restart_monit
+    shell: monit restart all
     become: true

data/lib/subspace/cli.rb

@@ -62,6 +62,9 @@ class Subspace::Cli
       c.summary = 'ssh to the remote server as the administrative user'
       c.description = ''
       c.option '--user USER', "Use a different user (eg deploy).  Default is the ansible_ssh_user"
+      Subspace::Commands::Ssh::PASS_THROUGH_PARAMS.each do |param_name|
+        c.option "-#{param_name} #{param_name.upcase}", "Passed directly through to ssh command"
+      end
       c.when_called Subspace::Commands::Ssh
     end
 

data/lib/subspace/commands/ssh.rb

@@ -1,8 +1,11 @@
 require 'yaml'
 class Subspace::Commands::Ssh < Subspace::Commands::Base
+  PASS_THROUGH_PARAMS = ["i"]
+
   def initialize(args, options)
     @host = args.first
     @user = options.user
+    @options = options
     run
   end
 
@@ -17,7 +20,16 @@ class Subspace::Commands::Ssh < Subspace::Commands::Base
     user = @user || host_vars["ansible_ssh_user"] || host_vars["ansible_user"]
     host = host_vars["ansible_ssh_host"] || host_vars["ansible_host"]
     port = host_vars["ansible_ssh_port"] || host_vars["ansible_port"] || 22
-    cmd = "ssh #{user}@#{host} -p #{port}"
+    ssh_options = []
+    PASS_THROUGH_PARAMS.each do |param_name|
+      x = param_name.split('-')[1..-1].map(&:upcase).join('_')
+      hash_key = (param_name.gsub('-', '_') + (x == '' ? '' : "_#{x}")).to_sym
+      value = @options.__hash__[hash_key]
+      if value
+        ssh_options += ["-#{param_name}", value]
+      end
+    end
+    cmd = "ssh #{user}@#{host} -p #{port} #{ssh_options.join(" ")}"
     say cmd
     exec cmd
   end

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler