docker-sync 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1938ef0a123f6f1a0af089e55086717e8e94f2f013c40c3d29f61743d0cda08e
-  data.tar.gz: bd46e6944225bd9f52cc66ce4a45f1ff11a954e4c9b5bb441f249b20f0c0dfa1
+  metadata.gz: 440a1277f902234557ce07713930f28cf69e95fa6ff77ee095128fe407b2a6da
+  data.tar.gz: 65643b530ee3cfa703fa03140d07545a459f0e6414ccc4ef1fbb4bcc9485bb79
 SHA512:
-  metadata.gz: aba2408b6a8370e0fc534b0fffa27e9d048705c227247c6552b637747cf0913362dcd76f4dad9ce906df5a395e125b134a29d88c53f471fec8bc5aed43abe1ce
-  data.tar.gz: aa5eb3883ece787df7c6398e0ad7cd967dee35be9b9e0f60cfc0812855e95904dc49b58f25e47ee1973da60fc8e72c08c0ea75c232bef3bea621f080ac558ace
+  metadata.gz: 1bd8e762ee2d4eaff553501371169439c5fb511670a4a6937110d16965c9da0bfdac7ec0298a8b2dc2f8548333fd120c1174986320ce314dcfcd86ffc03b3329
+  data.tar.gz: f8528c8f0747cafb57ae66f638e78128ee561adeb77b7c9d3f8cf439fb0324f5637cca4dd48d6916952bc27baa35e6fcf9e14a7da7ac888211d3670dd31cf1c0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/docker-sync/compose.rb

@@ -1,4 +1,6 @@
 require 'pp'
+require 'docker-sync/docker_compose_session'
+
 class ComposeManager
   include Thor::Shell
   @compose_session

data/lib/docker-sync/docker_compose_session.rb

@@ -1,3 +1,5 @@
+require 'docker-sync/command'
+
 module DockerSync
   # based on `Docker::Compose::Compose` from `docker-compose` gem
   class DockerComposeSession

data/lib/docker-sync/environment.rb

@@ -21,5 +21,9 @@ module DockerSync
     def self.system(cmd)
       defined?(Bundler) ? Bundler.unbundled_system(cmd) : Kernel.system(cmd)
     end
+
+    def self.default_ignores()
+      ['.docker-sync/daemon.log', '.docker-sync/daemon.pid']
+    end
   end
 end

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

@@ -183,7 +183,7 @@ module DockerSync
         end
 
         unless @options['sync_excludes'].nil?
-          expanded_ignore_strings = @options['sync_excludes'].map do |pattern|
+          expanded_ignore_strings = @options['sync_excludes'].append(Environment.default_ignores).flatten!.map do |pattern|
             if exclude_type == 'none'
               # the ignore type like Name / Path are part of the pattern
               ignore_string = "#{pattern}"

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

@@ -61,8 +61,10 @@ module DockerSync
 
       def sync_options
         args = []
-        unless @options['sync_excludes'].nil?
-          args = @options['sync_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
+        excludes_list = @options['sync_excludes'].append(Environment.default_ignores).flatten!
+
+        unless excludes_list.nil?
+          args = excludes_list.map { |pattern| "--exclude='#{pattern}'" } + args
         end
         args.push('-ap')
         args.push(@options['sync_args']) if @options.key?('sync_args')

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

@@ -102,7 +102,7 @@ module DockerSync
         exclude_type = @options['sync_excludes_type'] unless @options['sync_excludes_type'].nil?
 
         unless @options['sync_excludes'].nil?
-          expanded_ignore_strings = @options['sync_excludes'].map do |pattern|
+          expanded_ignore_strings = @options['sync_excludes'].append(Environment.default_ignores).flatten!.map do |pattern|
             ignore_string = if exclude_type == 'none'
                               # the ignore type like Name / Path are part of the pattern
                               pattern.to_s
@@ -135,6 +135,8 @@ module DockerSync
 
       # cares about conflict resolution
       def sync_prefer
+        sync_host_port = get_host_port(get_container_name, UNISON_CONTAINER_PORT)
+
         case @options.fetch('sync_prefer', 'default')
         when 'default' then "-prefer '#{@options['src']}' -copyonconflict" # thats our default, if nothing is set
         when 'src' then "-prefer '#{@options['src']}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor