docker-sync 0.5.11 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e36cdd4a606f5db9bedea29fa21a0224586927
-  data.tar.gz: 4e8bc82c2b0578b0aa8cd477a8dc6db4dd6b9415
+  metadata.gz: 04a9a15570d1faf97af25c0dfa37241a3374c8e0
+  data.tar.gz: 92fc94323ba31dc7cd0e6935d51ecef7d470d58f
 SHA512:
-  metadata.gz: 0a14fd9fef116acf44ac60540be952a4a7e8209fcd04b71785b911768f952023bdddcaa916f071fe0a1f182eca24d1f3ee0df7e93914b4185fce5b2bbc66552a
-  data.tar.gz: c67482b7187dd070b77e5e183812e5a08f6e23ea7cb929b50c6c1907c985be06edb6717829941a62f504fb47bd0c7fe411e8043e4601fc20f21e79d400c8aedc
+  metadata.gz: cba7ebc5e2c0b3214ee0e4456ad5b9ca6ba30cf327aa614983cc437dd6b7e692260e3cd1154c6f27fd6dc2fe22e0581474595cbee4fac118dc2351e4cbe316d7
+  data.tar.gz: 26ab2e2b6d6cc95c9334991446848d869b12356edc67f6a530d3fc8af1bda6eae0f3fc105098eec1fdf43e314dcfbc46c694f9dc9399ed92cb77c9584ab35f83

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.13

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

@@ -22,7 +22,7 @@ module DockerSync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison:2.51.2.1'
+          @docker_image = 'eugenmayer/unison:2.51.2.2'
         end
         begin
           Dependencies::Unison.ensure!

data/lib/docker-sync/upgrade_check.rb

@@ -63,6 +63,14 @@ class UpgradeChecker
       end
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.5.12')
+      Thor::Shell::Basic.new.say_status 'warning', "0.5.12 uses a newer OCALM 4.08.1 version in the Unison image. If you use the unison strategy, please upgrade your local unison to be compiled against OCALM 4.08.1", :red
+
+      unless Thor::Shell::Basic.new.yes?('Sync will fail otherwise. Continue? (y/N)')
+        exit 1
+      end
+    end
+
     # update the upgrade_status
     @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
   end

data/tasks/sync/sync.thor

@@ -155,8 +155,15 @@ class Sync < Thor
 
       # Check to see if we're already running:
       if daemon_running?
-        say_status 'ok:', 'docker-sync already started for this configuration', :white
-        exit 0
+        should_exit = true
+        unless options[:sync_name].empty?
+          running = `docker ps --filter 'status=running' --filter 'name=#{options[:sync_name]}' --format "{{.Names}}" | grep '^#{options[:sync_name]}$'`
+          should_exit = false if running == ''
+        end
+        if should_exit
+          say_status 'ok:', 'docker-sync already started for this configuration', :white
+          exit 0
+        end
       end
 
       # If we're daemonizing, run a sync first to ensure the containers exist so that a docker-compose up won't fail:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.13
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor