multisync 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ac03244c8167301ec37ba7e610862fd8a04bbcbf076ae924d6e68de7a433ca
-  data.tar.gz: '06986d1e288623a55578897df7ad2e29245077387b9f49aacf0e0c5e1be5517d'
+  metadata.gz: 0b40dd5c5699b8fe754bd06fc636e2675694bd300ee28a39eca17ee6ef50bfb7
+  data.tar.gz: 5b532fefc45be4f36aad50f943aae553502e858e91a3c739dd0dc38184998eab
 SHA512:
-  metadata.gz: 661926fde8d62277b7865747afc6af70e991ab23ec92c1c34a1ec742a580d3a8a6b4b136d043a417ee304f25586ed20039895926c79988bcb44ba91a800f7c11
-  data.tar.gz: 73c84b8e6dd7218c63ae1e9be51bf6775caa3715f73c0a4b896363832623310b9bfcdcf180f0b149efa5612a4abce4a783cb59429e63cc5b17347f2e82f55496
+  metadata.gz: dcf5932ebd4519b0b32a68746cbfc9eb5398d4279bc62f86d2ec00d706b28f4ab979a79529b6523f21bff9cef9b76c707676d17c0e9e1bcf073518580a786285
+  data.tar.gz: c71f270b5e0000c7a41a7481b6e4321c5fe359bf2a6c4bc78ff634c9ec282441ae8866b156908901af4f8e57c380d65866219334d8f7127371d688c1d09263f8

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/multisync.svg)](https://badge.fury.io/rb/multisync)
 
-# Multisync
+# multisync
 
 Multisync offers a DSL to organize sets of rsync tasks. It takes advantage of templates, groups and inheritance to simplify things.
 

data/lib/multisync/cli.rb

@@ -62,10 +62,14 @@ class Multisync::Cli
   end
   
   def run_tasks
-    tasks.each do |task|
-      runtime.run task
+    begin
+      tasks.each do |task|
+        runtime.run task
+      end
+      return if options[:print]
+    rescue Interrupt => e
+      $stderr.puts "\nAborted!".color(:red)
     end
-    return if options[:print]
     table = Terminal::Table.new(headings: summary_headings, rows: summary_data, style: table_style)
     puts
     puts
@@ -77,23 +81,29 @@ class Multisync::Cli
   end
   
   def summary_data
+    # Exclude tasks with an empty result (> not run) first
     tasks.map do |task|
       result = task.result
       desc = [task.source_description, "--> #{task.destination_description}"]
 
       case result[:action]
       when :run
-        if result[:status].success?
+        if result[:status] && result[:status].success?
           # successfull run
           stat = Multisync::RsyncStat.new(result[:stdout]).parse
           [*desc, *stat.to_a.map{|e| {value: e.color(:green), alignment: :right} } ]
         else
-          # failed run
-          [*desc, { value: result[:stderr].strip.color(:red), colspan: 6 } ]
+          # failed or interrupted run
+          [*desc, { value: (result[:stderr] || 'n/a').strip.color(:red), colspan: 6 } ]
         end
+
       when :skip
         # skiped sync
         [*desc, { value: result[:skip_message].color(:yellow), colspan: 6 } ]
+
+      else
+        # not executed
+        [*desc, { value: 'not executed'.faint, colspan: 6 } ]
       end
     end
   end

data/lib/multisync/runtime.rb

@@ -38,11 +38,15 @@ class Multisync::Runtime
     # special meaning for home, instead of passing it as literal char
     source, destination = [sync.source, sync.destination].map {|path| path.gsub(/\s+/, '\\ ') }
     cmd = "rsync #{rsync_options.join(' ')} #{source} #{destination}"
-    rsync = Mixlib::ShellOut.new(cmd, live_stdout: $stdout, live_stderr: $stderr, timeout: timeout)
+    cmd_options = { timeout: timeout }
+    cmd_options.merge!({live_stdout: $stdout, live_stderr: $stderr}) unless quiet?
+    rsync = Mixlib::ShellOut.new(cmd, cmd_options)
     sync.result[:cmd] = rsync.command
-    
-    puts
-    puts [sync.source_description, sync.destination_description].join(' --> ').color(:cyan)
+
+    unless quiet?
+      puts
+      puts [sync.source_description, sync.destination_description].join(' --> ').color(:cyan)
+    end
     
     # Perform all only_if checks, from top to bottom
     sync.checks.each do |check|

data/lib/multisync/version.rb

@@ -1,3 +1,3 @@
 module Multisync
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multisync
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Patrick Marchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout