docker-sync 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a89a19048102b5fcc54438687fb393820dde82c
-  data.tar.gz: 296a95c1806e2a39528928792e0a2214474f1cc9
+  metadata.gz: b2336a2163de001ea72e9eb9c2c10121878f222a
+  data.tar.gz: 86f36bcf8f7dfeff282d24482e57ee1b9841ce96
 SHA512:
-  metadata.gz: 3f2eb116585b29cdc996a3b986b2e5c98d5bba11b082150e20bf818006b867d10dc0af3de3c54b48f63ad48bf0a59ce46c6e81f9d67a0f33ed670360cd1cdb8a
-  data.tar.gz: 95b9667a3536132f1f3d768ac36ececfaa82fe51e48e1621efed5147c995d4cd6d92556ef4ff3ae23e70efe214c5a110290c37ffcb7ebc3dfe0f3658edf93c58
+  metadata.gz: ad2e54be371b67155fa802581608754bdb9132e9070541962e4c0c70521890ea4c297085ce979d0b8ea2cbc9a04b50cf03f64346927b97fb089987c93892a4f6
+  data.tar.gz: a77c9eac0ae4208d0d10cadb6b97bb1aa4578d9cf3dcce69e72c4695d8eea8d06afcca54d37ff320702d5ffbf5bd2f06051951f523c6e55e407267580ba2092d

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/docker-sync/config/project_config.rb

@@ -26,7 +26,10 @@ module DockerSync
 
     def initialize(config_path: nil, config_string: nil)
       if config_string.nil?
-        config_path = DockerSync::ConfigLocator.lookup_project_config_path
+        if config_path.nil? || config_path.empty?
+          config_path = DockerSync::ConfigLocator.lookup_project_config_path
+        end
+
         load_project_config(config_path)
       else
         @config = DockerSync::ConfigSerializer.default_deserializer_string(config_string)
@@ -87,38 +90,85 @@ module DockerSync
       end
 
       def normalize_config!
+        normalize_options_config!
+
         config['syncs'].each do |name, sync_config|
           config['syncs'][name] = normalize_sync_config(sync_config)
         end
       end
 
+      def normalize_options_config!
+        config['options'] = {
+          'project_root' => 'pwd',
+        }.merge(config['options'] || {})
+      end
+
       def normalize_sync_config(sync_config)
         {
           'sync_strategy' => sync_strategy_for(sync_config),
           'watch_strategy' => watch_strategy_for(sync_config)
-        }.merge(sync_config)
+        }.merge(sync_config).merge(
+          'src' => expand_path(sync_config['src']),
+        )
       end
 
       def sync_strategy_for(sync_config)
-        case sync_config['sync_strategy']
-        when 'rsync' then 'rsync'
-        else 'unison'
+        sync_strategy = sync_config['sync_strategy']
+
+        if ['rsync', 'unison', 'native'].include?(sync_strategy)
+          sync_strategy
+        else
+          default_sync_strategy
         end
       end
 
       def watch_strategy_for(sync_config)
-        if sync_config.key?('watch_strategy')
-          case sync_config['watch_strategy']
-          when 'fswatch' then 'fswatch'
-          when 'disable','dummy' then 'dummy'
-          else 'unison'
-          end
-        elsif sync_config['sync_strategy'] == 'rsync'
-          'fswatch'
+        watch_strategy = sync_config['watch_strategy']
+        watch_strategy = 'dummy' if watch_strategy == 'disable'
+
+        if ['fswatch', 'unison', 'dummy'].include?(watch_strategy)
+          watch_strategy
         else
-          'unison'
+          default_watch_strategy(sync_config)
         end
       end
 
+      def default_sync_strategy
+        case true
+        when OS.linux? then 'native'
+        else 'unison'
+        end
+      end
+
+      def default_watch_strategy(sync_config)
+        case sync_strategy_for(sync_config)
+        when 'rsync' then 'fswatch'
+        when 'unison' then 'unison'
+        when 'native' then 'dummy'
+        else raise "you shouldn't be here"
+        end
+      end
+
+      def expand_path(path)
+        Dir.chdir(project_root) {
+          # [nbr] convert the sync src from relative to absolute path
+          # preserve '/' as it may be significant to the sync cmd
+          absolute_path = File.expand_path(path)
+          absolute_path << "/" if path.end_with?("/")
+          absolute_path
+        }
+      end
+
+      def project_root
+        if use_config_path_for_project_root?
+          File.dirname(@config_path)
+        else
+          Dir.pwd
+        end
+      end
+
+      def use_config_path_for_project_root?
+        config['options']['project_root'] == 'config_path' && !(@config_path.nil? || @config_path.empty?)
+      end
   end
 end

data/lib/docker-sync/preconditions/preconditions_linux.rb

@@ -2,6 +2,19 @@ module DockerSync
   module Preconditions
     class Linux
       def check_all_preconditions(config)
+        return unless should_run_precondition?
+
+        docker_available
+        docker_running
+
+        if config.unison_required?
+          unison_available
+        end
+
+        if config.rsync_required?
+          rsync_available
+          fswatch_available
+        end
       end
 
       def docker_available
@@ -18,7 +31,21 @@ module DockerSync
 
       def unison_available
       end
-    end
 
+      def is_driver_docker_for_mac?
+        return false
+      end
+
+      def is_driver_docker_toolbox?
+        return false
+      end
+      private
+
+      def should_run_precondition?(silent: false)
+        true
+      end
+
+
+    end
   end
 end

data/lib/docker-sync/preconditions/preconditions_osx.rb

@@ -45,6 +45,7 @@ module DockerSync
             cmd1 = 'brew install unison'
 
             Thor::Shell::Basic.new.say_status 'warning', 'Could not find unison binary in $PATH. Trying to install now', :red
+            Thor::Shell::Basic.new.say_status 'command', cmd1, :white
             if Thor::Shell::Basic.new.yes?('I will install unison using brew for you? (y/N)')
               system cmd1
             else
@@ -59,7 +60,7 @@ module DockerSync
       def fswatch_available
         if should_run_precondition?
           if (find_executable0 'fswatch').nil?
-            cmd1 = 'brew install fswatch"'
+            cmd1 = 'brew install fswatch'
 
             Thor::Shell::Basic.new.say_status 'warning', 'No fswatch available. Install it by "brew install fswatch Trying to install now', :red
             if Thor::Shell::Basic.new.yes?('I will install fswatch using brew for you? (y/N)')
@@ -72,11 +73,22 @@ module DockerSync
 
       end
 
+      def is_driver_docker_for_mac?
+        `docker info | grep 'Docker Root Dir: /var/lib/docker' && docker info | grep 'Operating System: Alpine Linux'`
+        $?.success?
+      end
+
+      def is_driver_docker_toolbox?
+        return false unless find_executable0('docker-machine')
+        `docker info | grep 'Operating System: Boot2Docker'`
+        $?.success?
+      end
+
       private
 
       def should_run_precondition?(silent = false)
         unless has_brew?
-          Thor::Shell::Basic.new.say_status 'inf', 'Not running any precondition checks since you have no brew and that is unsupported. Is all up to you know.', :white unless silent
+          Thor::Shell::Basic.new.say_status 'info', 'Not running any precondition checks since you have no brew and that is unsupported. Is all up to you know.', :white unless silent
           return false
         end
         return true
@@ -90,15 +102,24 @@ module DockerSync
       def unox_available
         if should_run_precondition?
           `brew list unox`
-          if $?.exitstatus > 0
-            unless (find_executable0 'unison-fsmonitor').nil?
-              # unox installed, but not using brew, we do not allow that anymore
-              Thor::Shell::Basic.new.say_status 'error', 'You install unison-fsmonitor (unox) not using brew. Please uninstall it and run docker-sync again, so we can install it for you', :red
-              exit 1
+          unless $?.success?
+            # unox installed, but not using brew, we do not allow that anymore
+            if File.exist?('/usr/local/bin/unison-fsmonitor')
+              Thor::Shell::Basic.new.say_status 'error', 'You installed unison-fsmonitor (unox) not using brew-method - the old legacy way. We need to fix that.', :red
+
+              uninstall_cmd='sudo rm /usr/local/bin/unison-fsmonitor'
+              Thor::Shell::Basic.new.say_status 'command', uninstall_cmd, :white
+              if Thor::Shell::Basic.new.yes?('Should i uninstall the legacy /usr/local/bin/unison-fsmonitor for you ? (y/N)')
+                system uninstall_cmd
+              else
+                Thor::Shell::Basic.new.say_status 'error', 'Uninstall /usr/local/bin/unison-fsmonitor manually please', :white
+                exit 1
+              end
             end
-            cmd1 = 'brew tap eugenmayer/dockersync && brew install eugenmayer/dockersync/unox'
 
+            cmd1 = 'brew tap eugenmayer/dockersync && brew install eugenmayer/dockersync/unox'
             Thor::Shell::Basic.new.say_status 'warning', 'Could not find unison-fsmonitor (unox) binary in $PATH. Trying to install now', :red
+            Thor::Shell::Basic.new.say_status 'command', cmd1, :white
             if Thor::Shell::Basic.new.yes?('I will install unox through brew for you? (y/N)')
               system cmd1
             else

data/lib/docker-sync/preconditions/strategy.rb

@@ -51,6 +51,14 @@ module DockerSync
       def unison_available
         strategy.unison_available
       end
+
+      def is_driver_docker_for_mac?
+        strategy.is_driver_docker_for_mac?
+      end
+
+      def is_driver_docker_toolbox?
+        strategy.is_driver_docker_toolbox?
+      end
     end
   end
 end

data/lib/docker-sync/sync_manager.rb

@@ -30,12 +30,6 @@ module Docker_sync
       @config_syncs.each do |name, config|
         @config_syncs[name]['config_path'] = @config_path
 
-        # [nbr] convert the sync src from relative to absolute path
-        #	preserve '/' as it may be significant to the sync cmd
-              absolute_path = File.expand_path(@config_syncs[name]['src'])
-        absolute_path << "/" if @config_syncs[name]['src'].end_with?("/")
-        @config_syncs[name]['src'] = absolute_path
-
         @config_syncs[name]['cli_mode'] = @config_global['cli_mode'] || 'auto'
 
         # set the global verbose setting, if the sync-endpoint does not define a own one
@@ -46,8 +40,10 @@ module Docker_sync
           end
         end
 
-        # set default value for 'dest'
-        if !@config_syncs[name].key?('dest')
+        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!'
+          exit 1
+        else
           @config_syncs[name]['dest'] = '/sync'
         end
 
@@ -163,6 +159,7 @@ module Docker_sync
             config_string: options[:config_string]
           )
 
+        @config_path = config.config_path
         @config_global = config['options'] || {}
         @config_syncs = config['syncs']
         upgrade_syncs_config

data/lib/docker-sync/sync_process.rb

@@ -2,6 +2,7 @@ require 'thor/shell'
 # noinspection RubyResolve
 require 'docker-sync/sync_strategy/rsync'
 require 'docker-sync/sync_strategy/unison'
+require 'docker-sync/sync_strategy/native'
 # noinspection RubyResolve
 require 'docker-sync/watch_strategy/fswatch'
 require 'docker-sync/watch_strategy/dummy'
@@ -18,11 +19,17 @@ module Docker_Sync
 
     # noinspection RubyStringKeysInHashInspection
     def initialize(sync_name, options)
+      @sync_name = sync_name
+
       defaults = {
           'verbose' => false,
-          'sync_host_ip' => get_host_ip
+          'sync_host_ip' => get_host_ip_default
       }
-      @sync_name = sync_name
+      # even if sync_host_ip is set, if it is set to auto, enforce the default
+      if options.key?('sync_host_ip') && options['sync_host_ip'] == 'auto' || options['sync_host_ip'] == ''
+        options['sync_host_ip'] = defaults['sync_host_ip']
+      end
+
       @options = defaults.merge(options)
       @sync_strategy = nil
       @watch_strategy = nil
@@ -36,6 +43,8 @@ module Docker_Sync
         @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
       when 'unison'
         @sync_strategy = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+      when 'native'
+        @sync_strategy = Docker_Sync::SyncStrategy::Native.new(@sync_name, @options)
       else
         raise "Unknown sync_strategy #{@options['sync_strategy']}"
       end
@@ -54,8 +63,17 @@ module Docker_Sync
       end
     end
 
-    def get_host_ip
-      return '127.0.0.1'
+    def get_host_ip_default
+      return '127.0.0.1' if DockerSync::Preconditions::Strategy.instance.is_driver_docker_for_mac?
+
+      if DockerSync::Preconditions::Strategy.instance.is_driver_docker_toolbox?
+        cmd = 'docker-machine ip'
+        stdout, stderr, exit_status = Open3.capture3(cmd)
+        unless exit_status.success?
+          raise "Error getting sync_host_ip automatically, exit code #{$?.exitstatus} ... #{stderr}"
+        end
+        return stdout.gsub("\n",'')
+      end
     end
 
     def run

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

@@ -0,0 +1,69 @@
+require 'thor/shell'
+require 'docker-sync/preconditions/strategy'
+
+module Docker_Sync
+  module SyncStrategy
+    class Native
+      include Thor::Shell
+
+      @options
+      @sync_name
+
+      def initialize(sync_name, options)
+        @sync_name = sync_name
+        @options = options
+
+        begin
+          DockerSync::Preconditions::Strategy.instance.docker_available
+        rescue Exception => e
+          say_status 'error', "#{@sync_name} has been configured to sync with native docker volume, but docker is not found", :red
+          say_status 'error', e.message, :red
+          exit 1
+        end
+      end
+
+      def run
+        create_volume
+      end
+
+      def sync
+        # noop
+      end
+
+      def get_volume_name
+        @sync_name
+      end
+
+      def start_container
+        # noop
+      end
+
+      def clean
+        delete_volume
+      end
+
+      def stop
+        # noop
+      end
+
+      private
+
+      def create_volume
+        run_cmd "docker volume create --opt type=none --opt device=\"#{@options['src']}\" --opt o=bind "\
+          "--name #{get_volume_name}"
+
+        say_status 'success', "Docker volume for #{get_volume_name} created", :white
+      end
+
+      def delete_volume
+        run_cmd "docker volume ls -q | grep #{get_volume_name} && docker volume rm #{get_volume_name}"
+      end
+
+      def run_cmd(cmd)
+        say_status 'command', cmd, :white if @options['verbose']
+
+        `#{cmd}`
+      end
+    end
+  end
+end

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

@@ -117,7 +117,7 @@ module Docker_Sync
       def sync_options
         args = []
         args = expand_ignore_strings + args
-        args.push(@options['src'])
+        args.push("'#{@options['src']}'")
         args.push('-auto')
         args.push('-batch')
         args.push(sync_prefer)
@@ -187,7 +187,7 @@ module Docker_Sync
           stdout, stderr, exit_status = Open3.capture3(cmd)
           break if exit_status == 0
           attempt += 1
-          break if attempt > max_attempt
+          raise 'Failed to start unison container in time, try to increase max_attempt in your configuration. See https://github.com/EugenMayer/docker-sync/wiki/2.-Configuration for more informations' if attempt > max_attempt
           sleep 1
         end
         sync

data/lib/docker-sync/upgrade_check.rb

@@ -65,7 +65,7 @@ class UpgradeChecker
     end
 
     if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.3.0')
-      Thor::Shell::Basic.new.say_status 'warning', "The installation progress of docker-sync 0.3.0 has changed, brew is now mandatory - you need to uninstall unox ! : \n\n_Please_ read :): https://github.com/EugenMayer/docker-sync/wiki/1.3-Upgrade-Guide\n\n", :red
+      Thor::Shell::Basic.new.say_status 'warning', "The installation progress of docker-sync 0.3.0 has changed, brew is now mandatory - you need to uninstall unox ! : \n\n_Please_ read :): https://github.com/EugenMayer/docker-sync/wiki/1.2-Upgrade-Guide\n\n", :red
 
       cmd1 = 'sudo rm -f /usr/local/bin/unison-fsmonitor && brew tap eugenmayer/dockersync && brew install eugenmayer/dockersync/unox'
       Thor::Shell::Basic.new.say_status 'ok', cmd1, :rwhite

data/lib/docker-sync/watch_strategy/dummy.rb

@@ -9,11 +9,13 @@ module Docker_Sync
 
       @options
       @sync_name
+      @watch_fork
       @watch_thread
 
       def initialize(sync_name, options)
         @options = options
         @sync_name = sync_name
+        @watch_fork = nil
         @watch_thread = nil
       end
 
@@ -33,6 +35,10 @@ module Docker_Sync
       def watch_options
       end
 
+      def watch_fork
+        return @watch_fork
+      end
+
       def watch_thread
         return @watch_thread
       end

data/lib/docker-sync/watch_strategy/fswatch.rb

@@ -82,6 +82,11 @@ module Docker_Sync
         # append the actual operation
         return "#{sync_command}sync"
       end
+
+      def watch_fork
+        return nil
+      end
+
       def watch_thread
         return @watch_thread
       end

data/tasks/sync/sync.thor

@@ -119,7 +119,7 @@ class Sync < Thor
 
     config = config_preconditions
 
-    say_status 'ok',"Found configuration at #{config_path}"
+    say_status 'ok',"Found configuration at #{config.config_path}"
     @sync_manager = Docker_sync::SyncManager.new(config: config)
     @sync_manager.get_sync_points.each do |name, config|
       say_status name, "On address #{config['sync_host_ip']}:#{config['sync_host_port']}",:white unless options['verbose']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -165,6 +165,7 @@ files:
 - lib/docker-sync/preconditions/strategy.rb
 - lib/docker-sync/sync_manager.rb
 - lib/docker-sync/sync_process.rb
+- lib/docker-sync/sync_strategy/native.rb
 - lib/docker-sync/sync_strategy/rsync.rb
 - lib/docker-sync/sync_strategy/unison.rb
 - lib/docker-sync/update_check.rb