docker-sync 0.5.13 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04a9a15570d1faf97af25c0dfa37241a3374c8e0
-  data.tar.gz: 92fc94323ba31dc7cd0e6935d51ecef7d470d58f
+SHA256:
+  metadata.gz: d08392b2115f84c6dd7d37cb28232b4193523d4bb8e45860a9be061cefd88fb5
+  data.tar.gz: 18626e0ea9919d701dee2787d32457314bbe4abee642ce26ce23c3a02b5e5145
 SHA512:
-  metadata.gz: cba7ebc5e2c0b3214ee0e4456ad5b9ca6ba30cf327aa614983cc437dd6b7e692260e3cd1154c6f27fd6dc2fe22e0581474595cbee4fac118dc2351e4cbe316d7
-  data.tar.gz: 26ab2e2b6d6cc95c9334991446848d869b12356edc67f6a530d3fc8af1bda6eae0f3fc105098eec1fdf43e314dcfbc46c694f9dc9399ed92cb77c9584ab35f83
+  metadata.gz: bf0b3f26f0eb4f2d99b95336e13669e4abef9db285b240011660d5d19bd89485b4940f523adbd1d8bbb6b412af3e251a8e21c4e4d9cd40b43676a897452bcdc5
+  data.tar.gz: dbc9ec63c1b187f181e9bf180507cb724a7e54010dc145e80a882f020eab19051400496f72e0b8c5cd078fa8130bd29fce74ab6a188d6162d012dfb70a6e3823

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.7.1

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

@@ -11,7 +11,7 @@ module DockerSync
 
       def self.running?
         return @running if defined? @running
-        @running = system('docker ps 2>&1 > /dev/null')
+        @running = system('docker ps > /dev/null 2>&1')
       end
 
       def self.ensure!

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

@@ -2,8 +2,7 @@ module DockerSync
   module Dependencies
     module Rsync
       def self.available?
-        return @available if defined? @available
-        @available = find_executable0('rsync')
+        find_executable0('rsync')
       end
 
       def self.ensure!

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

@@ -2,8 +2,7 @@ module DockerSync
   module Dependencies
     module Unison
       def self.available?
-        return @available if defined? @available
-        @available = find_executable0('unison')
+        find_executable0('unison')
       end
 
       def self.ensure!

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,17 +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?
 
-        return @available if defined? @available
-        cmd = 'brew list unox 2>&1 > /dev/null'
-        @available = Environment.system(cmd)
-        @available
+        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')
@@ -41,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/environment.rb

@@ -4,11 +4,13 @@ module DockerSync
   module Environment
     def self.linux?
       return @linux if defined? @linux
+
       @linux = OS.linux?
     end
 
     def self.mac?
       return @mac if defined? @mac
+
       @mac = OS.mac?
     end
 
@@ -17,7 +19,7 @@ module DockerSync
     end
 
     def self.system(cmd)
-      defined?(Bundler) ? Bundler.clean_system(cmd) : Kernel.system(cmd)
+      defined?(Bundler) ? Bundler.unbundled_system(cmd) : Kernel.system(cmd)
     end
   end
 end

data/lib/docker-sync/sync_manager.rb

@@ -48,7 +48,7 @@ module DockerSync
         end
 
         if @config_syncs[name].key?('dest')
-          puts 'Please do no longer use "dest" in your docker-sync.yml configuration - also see https://github.com/EugenMayer/docker-sync/wiki/1.2-Upgrade-Guide#dest-has-been-removed!'
+          puts 'Please do no longer use "dest" in your docker-sync.yml configuration - also see https://docker-sync.readthedocs.io/en/latest/getting-started/upgrade.html#id4'
           exit 1
         else
           @config_syncs[name]['dest'] = '/app_sync'

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

@@ -23,7 +23,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.3-4.12.0-AMD64'
         end
 
         begin

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

@@ -14,16 +14,16 @@ module DockerSync
       @sync_name
       @watch_thread
       @local_server_pid
-      UNISON_CONTAINER_PORT = '5000'
+      UNISON_CONTAINER_PORT = '5000'.freeze
       def initialize(sync_name, options)
         @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.2.2'
-        end
+        @docker_image = if @options.key?('image')
+                          @options['image']
+                        else
+                          'eugenmayer/unison:2.51.3-4.12.0-AMD64'
+                        end
         begin
           Dependencies::Unison.ensure!
           Dependencies::Unox.ensure! if Environment.mac?
@@ -61,7 +61,7 @@ module DockerSync
 
       def watch
         args = sync_options
-        args.push("-repeat watch")
+        args.push('-repeat watch')
         cmd = ''
         cmd = cmd + 'ulimit -n ' + @options['max_inotify_watches'].to_s + ' && ' if @options.key?('max_inotify_watches')
         cmd = cmd + 'unison ' + args.join(' ')
@@ -77,18 +77,25 @@ module DockerSync
         say_status 'command', cmd, :white if @options['verbose']
 
         stdout, stderr, exit_status = Open3.capture3(cmd)
-        if not exit_status.success?
-          say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+        if !exit_status.success?
+          error_msg = "Error starting sync, exit code #{$?.exitstatus}"
+          say_status 'error', error_msg, :red
           say_status 'message', stdout
           say_status 'message', stderr
+
+          if @options['notify_terminal']
+            TerminalNotifier.notify(
+              "#{error_msg}", :title => @sync_name, :subtitle => @options['src'], group: 'docker-sync'
+            )
+          end
         else
-          TerminalNotifier.notify(
-              "Synced #{@options['src']}", :title => @sync_name
-          ) if @options['notify_terminal']
-          say_status 'ok', "Synced #{@options['src']}", :white
-          if @options['verbose']
-            say_status 'output', stdout
+          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
+          say_status 'output', stdout if @options['verbose']
         end
       end
 
@@ -96,18 +103,16 @@ module DockerSync
         expanded_ignore_strings = []
 
         exclude_type = 'Name'
-        unless @options['sync_excludes_type'].nil?
-          exclude_type = @options['sync_excludes_type']
-        end
+        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|
-            if exclude_type == 'none'
-              # the ignore type like Name / Path are part of the pattern
-              ignore_string = "#{pattern}"
-            else
-              ignore_string = "#{exclude_type} #{pattern}"
-            end
+            ignore_string = if exclude_type == 'none'
+                              # the ignore type like Name / Path are part of the pattern
+                              pattern.to_s
+                            else
+                              "#{exclude_type} #{pattern}"
+                            end
             "-ignore='#{ignore_string}'"
           end
         end
@@ -128,32 +133,33 @@ module DockerSync
         if @options.key?('sync_group') || @options.key?('sync_groupid')
           raise('Unison does not support sync_group, sync_groupid - please use rsync if you need that')
         end
-        return args
+
+        args
       end
 
       # cares about conflict resolution
       def sync_prefer
         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']}'"
-          when 'dest' then "-prefer 'socket://#{@options['sync_host_ip']}:#{sync_host_port}'"
-          else "-prefer '#{@options['sync_prefer']}'"
+        when 'default' then "-prefer '#{@options['src']}' -copyonconflict" # thats our default, if nothing is set
+        when 'src' then "-prefer '#{@options['src']}'"
+        when 'dest' then "-prefer 'socket://#{@options['sync_host_ip']}:#{sync_host_port}'"
+        else "-prefer '#{@options['sync_prefer']}'"
         end
       end
 
-
       def start_container
         say_status 'ok', "Starting unison for sync #{@sync_name}", :white
 
         container_name = get_container_name
         volume_name = get_volume_name
         env = {}
-        raise 'sync_user is no longer supported, since it ise no needed, use sync_userid only please' if @options.key?('sync_user')
+        if @options.key?('sync_user')
+          raise 'sync_user is no longer supported, since it ise no needed, use sync_userid only please'
+        end
 
         env['UNISON_SRC'] = '-socket 5000'
         env['UNISON_DEST'] = '/app_sync'
 
-
         env['MONIT_ENABLE'] = 'false'
         env['MONIT_INTERVAL'] = ''
         env['MONIT_HIGH_CPU_CYCLES'] = ''
@@ -171,17 +177,19 @@ module DockerSync
         end
 
         # start unison-image in unison socket mode mode
-        env['HOSTSYNC_ENABLE']=0
-        env['UNISONSOCKET_ENABLE']=1
+        env['HOSTSYNC_ENABLE'] = 0
+        env['UNISONSOCKET_ENABLE'] = 1
 
-        additional_docker_env = env.map{ |key,value| "-e #{key}=\"#{value}\"" }.join(' ')
+        additional_docker_env = env.map { |key, value| "-e #{key}=\"#{value}\"" }.join(' ')
         running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' --format "{{.Names}}" | grep '^#{container_name}$'`
         if running == ''
           say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
           exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" --format "{{.Names}}" | grep '^#{container_name}$'`
           if exists == ''
             run_privileged = ''
-            run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required
+            if @options.key?('max_inotify_watches')
+              run_privileged = '--privileged'
+            end # TODO: replace by the minimum capabilities required
             tz_expression = '-e TZ=$(basename $(dirname `readlink /etc/localtime`))/$(basename `readlink /etc/localtime`)'
             say_status 'ok', 'Starting precopy', :white if @options['verbose']
             # we just run the precopy script and remove the container
@@ -204,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['dest']} \"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
@@ -212,8 +220,12 @@ module DockerSync
           # noinspection RubyUnusedLocalVariable
           stdout, stderr, exit_status = Open3.capture3(cmd)
           break if exit_status == 0
+
           attempt += 1
-          raise "Failed to start unison container in time, try to increase max_attempt (currently #{max_attempt}) in your configuration. See https://github.com/EugenMayer/docker-sync/wiki/2.-Configuration for more informations" if attempt > max_attempt
+          if attempt > max_attempt
+            raise "Failed to start unison container in time, try to increase max_attempt (currently #{max_attempt}) in your configuration. See https://github.com/EugenMayer/docker-sync/wiki/2.-Configuration for more informations"
+          end
+
           sleep 1
         end
         sync
@@ -221,7 +233,7 @@ module DockerSync
       end
 
       # noinspection RubyUnusedLocalVariable
-      def get_host_port(container_name, container_port)
+      def get_host_port(container_name, _container_port)
         cmd = 'docker inspect --format=\'{{(index (index .NetworkSettings.Ports "5000/tcp") 0).HostPort}}\' ' + container_name
         say_status 'command', cmd, :white if @options['verbose']
         stdout, stderr, exit_status = Open3.capture3(cmd)
@@ -230,15 +242,15 @@ module DockerSync
           say_status 'error', "Error getting mapped port, exit code #{$?.exitstatus}", :red
           say_status 'message', stderr
         end
-        return stdout.gsub("\n",'')
+        stdout.gsub("\n", '')
       end
 
       def get_container_name
-        return "#{@sync_name}"
+        @sync_name.to_s
       end
 
       def get_volume_name
-        return @sync_name
+        @sync_name
       end
 
       def stop_container

data/lib/docker-sync/update_check.rb

@@ -92,9 +92,13 @@ class UpdateChecker
     if check.update_available
       say_status 'warning',"There is an update (#{check.latest_version}) available (current version #{check.current_version}). Please update before you continue",:yellow
       if yes?("Shall I update docker-sync to #{check.latest_version} for you?")
-        system('gem update docker-sync')
-        say_status 'success','Successfully updated, please restart docker-sync and check the changelog at https://github.com/EugenMayer/docker-sync/wiki/5.-Changelog',:green
-        exit 0
+        if system('gem update docker-sync')
+          say_status 'success','Successfully updated, please restart docker-sync and check the changelog at https://github.com/EugenMayer/docker-sync/releases',:green
+          exit 0
+        else
+          say_status 'error','Unable to update docker-sync',:red
+          exit 1
+        end
       else
         exit 1 if update_enforced
       end

data/tasks/sync/sync.thor

@@ -79,6 +79,17 @@ class Sync < Thor
 
   end
 
+  desc 'restart', 'Restart docker-sync daemon'
+  method_option :daemon, :aliases => '-d', :default => false, :type => :boolean, :desc => 'Run in the background'
+  method_option :foreground, :aliases => '-f', :default => false, :type => :boolean, :desc => 'Run in the foreground'
+  method_option :app_name, :aliases => '--name', :default => 'daemon', :type => :string, :desc => 'App name used in PID and OUTPUT file name for Daemon'
+  method_option :dir, :aliases => '--dir', :default => './.docker-sync', :type => :string, :desc => 'Path to PID and OUTPUT file Directory'
+  method_option :logd, :aliases => '--logd', :default => true, :type => :boolean, :desc => 'To log OUPUT to file on Daemon or not'
+  def restart
+    invoke :stop, options.select{|k, _| ["app_name", "dir"].include?(k) }
+    invoke :start
+  end
+
   desc 'sync', 'just sync - do not start a watcher though'
   def sync
     print_version if options[:version]
@@ -156,7 +167,7 @@ class Sync < Thor
       # Check to see if we're already running:
       if daemon_running?
         should_exit = true
-        unless options[:sync_name].empty?
+        unless options[:sync_name].nil? || 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.7.1
 platform: ruby
 authors:
 - Eugen Mayer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-02 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: gem_update_checker
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +209,7 @@ homepage: https://github.com/EugenMayer/docker_sync
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,16 +217,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Docker Sync - Fast and efficient way to sync code to docker-containers
 test_files: []