docker-sync 0.7.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88cce934f387bf527bd53628913c8bfe95b99533cea63a0ab45258fa66a4b185
-  data.tar.gz: b7fa487477e4ba03b6082f8712a391e0ac7c15b1fde8c671b35436c2a244f35a
+  metadata.gz: 99de3e53b469050cd1cf2afd597aa4fabcc23338e4d6d5cd67ebb833fa1ff184
+  data.tar.gz: 4aadccbadd4ebeade4b3b5d214a900a411198c74aff3e813f71c9a6c4f297aaa
 SHA512:
-  metadata.gz: 635d2f2a06c5f284395b1dbc67db3fbc616efca42650a3d912265d1c88239078776a9975c74394b1dfb4071a5ca9b9f85234fe4a530932b0da1176dbb9b1e55b
-  data.tar.gz: 3e54b8c08bee9b846e9fdd8991b21370bc57b97bb0864b3a7f88712c775e72832902cf0134651ecd2ed6d33165c8496af48f8997f1429b41bc5643b3854621f2
+  metadata.gz: df858a48916d036de531a04ad6707cb71e5212f9883c0df2f6ad8d326ecf349b64c4f4d859794ccc2afc35d2fd9fba31c17afaeebcb395df2cf1c91b548d617b
+  data.tar.gz: 311975e4eacca8e19f2d5a3dc1f707850b5719e5ddb02d6f5250b777a5f738214534d691f54338d171f8e4a84d3d025e81a4a39b276758bdc2fc20c39caf4591

data/VERSION

@@ -1 +1 @@
-0.7.2
+1.0.2

data/lib/docker-sync/command.rb

@@ -0,0 +1,126 @@
+begin
+  require 'pty'
+rescue LoadError
+  # for Windows support, tolerate a missing PTY module
+end
+
+module DockerSync
+  # based on `Backticks::Command` from `Backticks` gem
+  class Command
+    FOREVER = 86_400 * 365
+    CHUNK = 1_024
+
+    # @return [Integer] child process ID
+    attr_reader :pid
+
+    # @return [nil,Process::Status] result of command if it has ended; nil if still running
+    attr_reader :status
+
+    # @return [String] all input that has been captured so far
+    attr_reader :captured_input
+
+    # @return [String] all output that has been captured so far
+    attr_reader :captured_output
+
+    # @return [String] all output to stderr that has been captured so far
+    attr_reader :captured_error
+
+    # Run a command. The parameters are same as `Kernel#spawn`.
+    #
+    # Usage:
+    #    run('docker-compose', '--file=joe.yml', 'up', '-d', 'mysvc')
+    def self.run(*argv, dir: nil)
+      nopty = !defined?(PTY)
+
+      stdin_r, stdin = nopty ? IO.pipe : PTY.open
+      stdout, stdout_w = nopty ? IO.pipe : PTY.open
+      stderr, stderr_w = IO.pipe
+
+      chdir = dir || Dir.pwd
+      pid = spawn(*argv, in: stdin_r, out: stdout_w, err: stderr_w, chdir: chdir)
+
+      stdin_r.close
+      stdout_w.close
+      stderr_w.close
+
+      self.new(pid, stdin, stdout, stderr)
+    end
+
+    def initialize(pid, stdin, stdout, stderr)
+      @pid = pid
+      @stdin = stdin
+      @stdout = stdout
+      @stderr = stderr
+      @status = nil
+
+      @captured_input  = String.new(encoding: Encoding::BINARY)
+      @captured_output = String.new(encoding: Encoding::BINARY)
+      @captured_error  = String.new(encoding: Encoding::BINARY)
+    end
+
+    def success?
+      status.success?
+    end
+
+    def join(limit = FOREVER)
+      return self if @status
+
+      tf = Time.now + limit
+      until (t = Time.now) >= tf
+        capture(tf - t)
+        res = Process.waitpid(@pid, Process::WNOHANG)
+        if res
+          @status = $?
+          return self
+        end
+      end
+
+      nil
+    end
+
+    private
+
+    def capture(limit)
+      streams = [@stdout, @stderr]
+      streams << STDIN if STDIN.tty?
+
+      ready, = IO.select(streams, [], [], limit)
+
+      # proxy STDIN to child's stdin
+      if ready && ready.include?(STDIN)
+        data = STDIN.readpartial(CHUNK) rescue nil
+        if data
+          @captured_input << data
+          @stdin.write(data)
+        else
+          # our own STDIN got closed; proxy this fact to the child
+          @stdin.close unless @stdin.closed?
+        end
+      end
+
+      # capture child's stdout and maybe proxy to STDOUT
+      if ready && ready.include?(@stdout)
+        data = @stdout.readpartial(CHUNK) rescue nil
+        if data
+          @captured_output << data
+          STDOUT.write(data)
+          fresh_output = data
+        end
+      end
+
+      # capture child's stderr and maybe proxy to STDERR
+      if ready && ready.include?(@stderr)
+        data = @stderr.readpartial(CHUNK) rescue nil
+        if data
+          @captured_error << data
+          STDERR.write(data)
+        end
+      end
+      fresh_output
+    rescue Interrupt
+      # Proxy Ctrl+C to the child
+      Process.kill('INT', @pid) rescue nil
+      raise
+    end
+  end
+end

data/lib/docker-sync/compose.rb

@@ -1,5 +1,6 @@
-require 'docker/compose'
 require 'pp'
+require 'docker-sync/docker_compose_session'
+
 class ComposeManager
   include Thor::Shell
   @compose_session
@@ -30,7 +31,7 @@ class ComposeManager
         compose_files.push compose_dev_path
       end
     end
-    @compose_session = Docker::Compose::Session.new(dir:'./', :file => compose_files)
+    @compose_session = DockerSync::DockerComposeSession.new(dir: './', files: compose_files)
   end
 
   def run

data/lib/docker-sync/docker_compose_session.rb

@@ -0,0 +1,46 @@
+require 'docker-sync/command'
+
+module DockerSync
+  # based on `Docker::Compose::Compose` from `docker-compose` gem
+  class DockerComposeSession
+    def initialize(dir: nil, files: nil)
+      @dir = dir
+      @files = files || [] # Array[String]
+      @last_command = nil
+    end
+
+    def up(build: false)
+      args = []
+      args << '--build' if build
+
+      run!('up', *args)
+    end
+
+    def stop
+      run!('stop')
+    end
+
+    def down
+      run!('down')
+    end
+
+    private
+
+    def run!(*args)
+      # file_args and args should be Array of String
+      file_args = @files.map { |file| "--file=#{file}" }
+
+      @last_command = Command.run('docker-compose', *file_args, *args, dir: @dir).join
+      status = @last_command.status
+      out = @last_command.captured_output
+      err = @last_command.captured_error
+      unless status.success?
+        desc = (out + err).strip.lines.first || '(no output)'
+        message = format("'%s' failed with status %s: %s", args.first, status.to_s, desc)
+        raise message
+      end
+
+      out
+    end
+  end
+end

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

@@ -20,11 +20,7 @@ module DockerSync
         @options = options
         @sync_name = sync_name
         # if a custom image is set, apply it
-        if @options.key?('image')
-          @docker_image = @options['image']
-        else
-          @docker_image = 'eugenmayer/unison:2.51.3-4.12.0-AMD64'
-        end
+        @docker_image = @options.key?('image') ? @options['image'] : 'ghcr.io/eugenmayer/unison:2.52.1-4.12.0'
 
         begin
           Dependencies::Docker.ensure!
@@ -187,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,9 @@ module DockerSync
 
       def sync_options
         args = []
+
         unless @options['sync_excludes'].nil?
-          args = @options['sync_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
+          args = excludes_list.append(Environment.default_ignores).flatten!.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

@@ -19,11 +19,7 @@ module DockerSync
         @options = options
         @sync_name = sync_name
         # if a custom image is set, apply it
-        @docker_image = if @options.key?('image')
-                          @options['image']
-                        else
-                          'eugenmayer/unison:2.51.3-4.12.0-AMD64'
-                        end
+        @docker_image = @options.key?('image') ? @options['image'] :  'ghcr.io/eugenmayer/unison:2.52.1-4.12.0'
         begin
           Dependencies::Unison.ensure!
           Dependencies::Unox.ensure! if Environment.mac?
@@ -105,6 +101,14 @@ module DockerSync
         exclude_type = 'Name'
         exclude_type = @options['sync_excludes_type'] unless @options['sync_excludes_type'].nil?
 
+        # use the 'Name' exclude type for all default ignores
+        # to prevent conflicts with the sync_excludes_type settings
+        unless Environment.default_ignores.nil?
+          expanded_ignore_strings = Environment.default_ignores.map do |pattern|
+            "-ignore='Name #{pattern}'"
+          end
+        end
+
         unless @options['sync_excludes'].nil?
           expanded_ignore_strings = @options['sync_excludes'].map do |pattern|
             ignore_string = if exclude_type == 'none'
@@ -139,6 +143,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']}'"

data/lib/docker-sync/update_check.rb

@@ -4,8 +4,6 @@ require 'docker-sync/config/global_config'
 
 class UpdateChecker
   include Thor::Shell
-  @config
-  @newer_image_found
 
   def initialize
     @config = DockerSync::GlobalConfig.load

data/lib/docker-sync/upgrade_check.rb

@@ -5,7 +5,6 @@ require 'docker-sync/update_check'
 
 class UpgradeChecker
   include Thor::Shell
-  @config
   def initialize
     @config = DockerSync::GlobalConfig.load
   end

data/tasks/stack/stack.thor

@@ -2,7 +2,6 @@ require 'docker-sync'
 require 'docker-sync/sync_manager'
 require 'docker-sync/update_check'
 require 'docker-sync/upgrade_check'
-require 'docker/compose'
 require 'docker-sync/compose'
 require 'docker-sync/config/project_config'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: gem_update_checker
   requirement: !ruby/object:Gem::Requirement
@@ -50,26 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: docker-compose
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -90,54 +70,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +132,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.3.2
 description: Sync your code live to docker-containers without losing any performance
   on OSX
 email: eugen.mayer@kontextwork.de
@@ -169,6 +163,7 @@ files:
 - bin/docker-sync-daemon
 - bin/docker-sync-stack
 - lib/docker-sync.rb
+- lib/docker-sync/command.rb
 - lib/docker-sync/compose.rb
 - lib/docker-sync/config/config_locator.rb
 - lib/docker-sync/config/config_serializer.rb
@@ -188,6 +183,7 @@ files:
 - lib/docker-sync/dependencies/rsync.rb
 - lib/docker-sync/dependencies/unison.rb
 - lib/docker-sync/dependencies/unox.rb
+- lib/docker-sync/docker_compose_session.rb
 - lib/docker-sync/environment.rb
 - lib/docker-sync/execution.rb
 - lib/docker-sync/sync_manager.rb