docker-sync 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16e4b3329738820f64c10c631ff0d5ad87c3d3e24af3c7c2e55267b2c84f260
-  data.tar.gz: 5997aa17faededdd6074b9399fcad5c3a5c3dbec8bd2d6971b8e3b5b0c353da8
+  metadata.gz: 1938ef0a123f6f1a0af089e55086717e8e94f2f013c40c3d29f61743d0cda08e
+  data.tar.gz: bd46e6944225bd9f52cc66ce4a45f1ff11a954e4c9b5bb441f249b20f0c0dfa1
 SHA512:
-  metadata.gz: b4d9f320c005ca2dad6e8a6beff59c4502b6b65d11558d8b428c924511a6c8d60c14c57e3277cadaeddc8d7dcdb68f1cae0e1fc6c71935555992f99877119af5
-  data.tar.gz: '09684e8c94b1afa1702032568d6de9179199d026806481f0966ae521405cd5499a2f25443b13107547413a278c9cba9f24668ab20b3617c89a9b3b3d4050f528'
+  metadata.gz: aba2408b6a8370e0fc534b0fffa27e9d048705c227247c6552b637747cf0913362dcd76f4dad9ce906df5a395e125b134a29d88c53f471fec8bc5aed43abe1ce
+  data.tar.gz: aa5eb3883ece787df7c6398e0ad7cd967dee35be9b9e0f60cfc0812855e95904dc49b58f25e47ee1973da60fc8e72c08c0ea75c232bef3bea621f080ac558ace

data/VERSION

@@ -1 +1 @@
-0.7.0
+1.0.0

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,4 +1,3 @@
-require 'docker/compose'
 require 'pp'
 class ComposeManager
   include Thor::Shell
@@ -30,7 +29,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/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

@@ -14,7 +14,7 @@ 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?
 
         return true if brew_package_installed?('unox')
         return false unless brew_package_installed?('unison-fsmonitor')
@@ -26,7 +26,7 @@ module DockerSync
 
       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')

data/lib/docker-sync/docker_compose_session.rb

@@ -0,0 +1,44 @@
+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/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!

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

@@ -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?
@@ -78,13 +74,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 +208,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

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.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2022-09-08 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
@@ -224,7 +220,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