docker-sync 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1670b82d1e005cdfb4485db9241a513f962a732b29d4bd3cf6beec9227c52e65
-  data.tar.gz: da40497b93174d5794d9fe7271a9c8a02c86fac647ee038b6d2380500da0cd31
+  metadata.gz: 88cce934f387bf527bd53628913c8bfe95b99533cea63a0ab45258fa66a4b185
+  data.tar.gz: b7fa487477e4ba03b6082f8712a391e0ac7c15b1fde8c671b35436c2a244f35a
 SHA512:
-  metadata.gz: e0bf6820a799a2381e343d4cd9e5719a2f1adf2879f1cf82bc1a96833110963b8737a019c5870e74c6a59cb76a9951a97e1bf3226bea5e94a423c69897767dc7
-  data.tar.gz: 550d7628a372fab1328ff3d06452919259409ac4d4d6d01324da9eab1fb99e6dbd26f9ba033fbbf0762134d766691e07edaf6e68117baa0371671c2b21accb43
+  metadata.gz: 635d2f2a06c5f284395b1dbc67db3fbc616efca42650a3d912265d1c88239078776a9975c74394b1dfb4071a5ca9b9f85234fe4a530932b0da1176dbb9b1e55b
+  data.tar.gz: 3e54b8c08bee9b846e9fdd8991b21370bc57b97bb0864b3a7f88712c775e72832902cf0134651ecd2ed6d33165c8496af48f8997f1429b41bc5643b3854621f2

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.2

data/lib/docker-sync/dependencies/docker_driver.rb

@@ -5,7 +5,11 @@ module DockerSync
         def self.docker_for_mac?
           return false unless Environment.mac?
           return @docker_for_mac if defined? @docker_for_mac
-          @docker_for_mac = Environment.system('pgrep -q com.docker.hyperkit')
+
+          # com.docker.hyperkit for old virtualization engine
+          # com.docker.virtualization for new virtualization engine
+          # see https://docs.docker.com/desktop/mac/#enable-the-new-apple-virtualization-framework
+          @docker_for_mac = Environment.system('pgrep -q com.docker.hyperkit') || Environment.system('pgrep -q com.docker.virtualization')
         end
 
         def self.docker_toolbox?

data/lib/docker-sync/dependencies/unox.rb

@@ -5,6 +5,7 @@ module DockerSync
     module Unox
       LEGACY_UNOX_WARNING          = 'You installed unison-fsmonitor (unox) the old legacy way (i.e. not using brew). We need to fix that.'.freeze
       FAILED_TO_REMOVE_LEGACY_UNOX = 'Failed to remove legacy unison-fsmonitor (unox). Please delete /usr/local/bin/unison-fsmonitor manually and try again.'.freeze
+      UNSUPPORTED_FSMONITOR        = 'You are using unsupported version of unison-fsmonitor, consider installing eugenmayer/dockersync/unox instead'.freeze
 
       class << self
         extend Forwardable
@@ -13,15 +14,19 @@ module DockerSync
 
       def self.available?
         # should never have been called anyway - fix the call that it should check for the OS
-        raise 'Unox cannot be available for other platforms then MacOS' unless Environment.mac?
+        raise 'Unox cannot be available for platforms other than MacOS' unless Environment.mac?
 
-        cmd = 'brew list unox > /dev/null 2>&1'
-        Environment.system(cmd)
+        return true if brew_package_installed?('unox')
+        return false unless brew_package_installed?('unison-fsmonitor')
+
+        say_status 'warning', UNSUPPORTED_FSMONITOR, :yellow unless @unsupported_fsmonitor_warning_displayed
+        @unsupported_fsmonitor_warning_displayed = true
+        true
       end
 
       def self.ensure!
         return if available?
-        raise 'Unox cannot be installed on other platforms then MacOS' unless Environment.mac?
+        raise 'Unox cannot be installed on platforms other than MacOS' unless Environment.mac?
 
         cleanup_non_brew_version!
         PackageManager.install_package('eugenmayer/dockersync/unox')
@@ -39,6 +44,11 @@ module DockerSync
       def self.non_brew_version_installed?
         !available? && File.exist?('/usr/local/bin/unison-fsmonitor')
       end
+
+      def self.brew_package_installed?(name)
+        cmd = "brew list #{name} > /dev/null 2>&1"
+        Environment.system(cmd)
+      end
     end
   end
 end

data/lib/docker-sync/sync_strategy/rsync.rb

@@ -42,12 +42,16 @@ module DockerSync
 
         out = `#{cmd}`
         if $?.exitstatus > 0
-          say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+          error_msg = "Error starting sync, exit code #{$?.exitstatus}"
+          say_status 'error', error_msg, :red
           say_status 'message', out
-        else
           TerminalNotifier.notify(
-            "Synced #{@options['src']}", :title => @sync_name
+            "#{error_msg}", :title => @sync_name, :subtitle => @options['src'], group: 'docker-sync'
           ) if @options['notify_terminal']
+        else
+          TerminalNotifier.notify(
+            "Synced #{@options['src']}", :title => @sync_name, group: 'docker-sync'
+          ) if @options['notify_terminal'] && @options['notify_terminal'] != 'errors_only'
           say_status 'ok', "Synced #{@options['src']}", :white
           if @options['verbose']
             say_status 'output', out

data/lib/docker-sync/sync_strategy/unison.rb

@@ -78,13 +78,20 @@ module DockerSync
 
         stdout, stderr, exit_status = Open3.capture3(cmd)
         if !exit_status.success?
-          say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+          error_msg = "Error starting sync, exit code #{$?.exitstatus}"
+          say_status 'error', error_msg, :red
           say_status 'message', stdout
           say_status 'message', stderr
-        else
+
           if @options['notify_terminal']
             TerminalNotifier.notify(
-              "Synced #{@options['src']}", title: @sync_name
+              "#{error_msg}", :title => @sync_name, :subtitle => @options['src'], group: 'docker-sync'
+            )
+          end
+        else
+          if @options['notify_terminal'] && @options['notify_terminal'] != 'errors_only'
+            TerminalNotifier.notify(
+              "Synced #{@options['src']}", title: @sync_name, group: 'docker-sync'
             )
           end
           say_status 'ok', "Synced #{@options['src']}", :white
@@ -205,7 +212,7 @@ module DockerSync
         say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
         # wait until container is started, then sync:
         sync_host_port = get_host_port(get_container_name, UNISON_CONTAINER_PORT)
-        cmd = "unison -testserver #{@options['src']} \"socket://#{@options['sync_host_ip']}:#{sync_host_port}\""
+        cmd = "unison -testserver \"#{@options['src']}\" \"socket://#{@options['sync_host_ip']}:#{sync_host_port}\""
         say_status 'command', cmd, :white if @options['verbose']
         attempt = 0
         max_attempt = @options['max_attempt'] || 5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Docker Sync - Fast and efficient way to sync code to docker-containers