rat_deployer 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f3865952fcdfe384e29675e293cf14c366cd0c
-  data.tar.gz: ef8f40dfa437099645704bdeaceb3b35c2ab278e
+  metadata.gz: f3a34ca0a2412e7cf6180f7d7708f17d31759094
+  data.tar.gz: 0ed7f6722e96927da2ecb663ad0827234a9b28b0
 SHA512:
-  metadata.gz: c91cfb7161d0c22b9e07f7c70e00e486e5ae068f31118d659184962c2a1196ca052930391b5014c586e1a9ddab36af827f2e92624683b2c7bba91e3e1e4907fa
-  data.tar.gz: 919ff30c8c9a36e5580a6db8fb76f2dd40fba2071744673031f46847b6f555e6d4a18607c09787a01d5b230d0f19c4128becd8469ab75bb183504606c6dea1be
+  metadata.gz: d8c88b1943bb041fe61a9ff464bc7bc3fac32811aa90bfcb898dbbd8738af468dca82602aeadee09f59c91bc6356f1e087228e020af55c2aa619629894f42c37
+  data.tar.gz: 9e36e9bf273102ab126b474be995f4995075b4f7bac63ca9e2b2f0216df2954ce22d7971953fa25594d38bd583a0183accef374896f76ce40c3e94fcb3836c24

data/lib/rat_deployer/cli.rb

@@ -38,7 +38,8 @@ Reason:
         flags.unshift(RatDeployer::Config.remote_machine_flags)
       end
 
-      run "docker-compose #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
+      cmd = run "docker-compose #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
+      cmd.fetch(:output)
     end
 
     desc "docker ARGS...", "runs docker command with default flags"
@@ -52,7 +53,8 @@ Reason:
         flags.unshift(RatDeployer::Config.remote_machine_flags)
       end
 
-      run "docker #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
+      cmd = run "docker #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
+      cmd.fetch(:output)
     end
   end
 end

data/lib/rat_deployer/command.rb

@@ -4,13 +4,30 @@ require 'rat_deployer/config'
 
 module RatDeployer
   module Command
-    def run(cmd)
+    def run(cmd, silent: false)
       if RatDeployer::Config.prompt_enabled?
         msg = "||=> Running command ".colorize(:blue) + "`#{cmd.colorize(:white)}`"
         puts msg
       end
 
-      exit 1 unless system(cmd)
+      command = do_run(cmd, silent: silent)
+      exit 1 unless command.fetch(:status).zero?
+      command
+    end
+
+    def do_run(cmd, silent: false)
+      output, status = '', 1
+
+      IO.popen(cmd) do |io|
+        while line = io.gets do
+          puts line unless silent
+          output << line
+        end
+        io.close
+        status = $?.to_i
+      end
+
+      {output: output, status: status}
     end
 
     def put_heading(str)

data/lib/rat_deployer/notifier.rb

@@ -19,7 +19,11 @@ module RatDeployer
         attachments: [{
           title:  title,
           fields: get_deploy_properties.map do |k,v|
-            {title: k.to_s.titleize, value: v, short: true}
+            {
+              title: k.to_s.titleize,
+              value: k == :images ? v.join(' · ') : v,
+              short: k != :images
+           }
           end
         }]
       )
@@ -50,11 +54,15 @@ module RatDeployer
     def self.get_deploy_properties
       require 'socket'
 
+      docker_config = YAML.load(RatDeployer::Cli.new.compose('config'))
+      images = docker_config['services'].map { |s,c| c['image'] }.uniq.sort
+
       {
         env:        ENV.fetch('RAT_ENV'),
         user:       ENV.fetch('USER'),
         hostname:   Socket.gethostname,
-        started_at: Time.now.to_s
+        started_at: Time.now.to_s,
+        images:     images
       }
     end
   end

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Nicolas Oga