docker-sync 0.3.6 → 0.4.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2336a2163de001ea72e9eb9c2c10121878f222a
-  data.tar.gz: 86f36bcf8f7dfeff282d24482e57ee1b9841ce96
+  metadata.gz: ee30fd93932dfd458f8d77e2e4109e0f61a16269
+  data.tar.gz: 107807dec19acbc71e6807f861db99e67d52a2bc
 SHA512:
-  metadata.gz: ad2e54be371b67155fa802581608754bdb9132e9070541962e4c0c70521890ea4c297085ce979d0b8ea2cbc9a04b50cf03f64346927b97fb089987c93892a4f6
-  data.tar.gz: a77c9eac0ae4208d0d10cadb6b97bb1aa4578d9cf3dcce69e72c4695d8eea8d06afcca54d37ff320702d5ffbf5bd2f06051951f523c6e55e407267580ba2092d
+  metadata.gz: 651b6deb48778e5c9dceae3ecae2a1668b16dc820e4e63b8ad6f818b2a7d4fcc13abf117e82575c38358eb63bd06412c742ab608f3f0eba5ab3e143170a2c6f3
+  data.tar.gz: 819d3d464a51f88237d140a785a56f4e3cb4ed7745edab0ce32bd0c87eadecf9f20c14391b474cc099356b13d1ce21891fe93b6125d6cde08a392057b0899c2f

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0-beta1

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

@@ -115,7 +115,7 @@ module DockerSync
       def sync_strategy_for(sync_config)
         sync_strategy = sync_config['sync_strategy']
 
-        if ['rsync', 'unison', 'native'].include?(sync_strategy)
+        if %w(rsync unison native native_osx).include?(sync_strategy)
           sync_strategy
         else
           default_sync_strategy
@@ -145,6 +145,7 @@ module DockerSync
         when 'rsync' then 'fswatch'
         when 'unison' then 'unison'
         when 'native' then 'dummy'
+        when 'native_osx' then 'dummy'
         else raise "you shouldn't be here"
         end
       end
@@ -154,7 +155,7 @@ module DockerSync
           # [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 << '/' if path.end_with?('/')
           absolute_path
         }
       end

data/lib/docker-sync/sync_manager.rb

@@ -49,7 +49,7 @@ module Docker_sync
 
         # for each strategy check if a custom image has been defined and inject that into the sync-endpoints
         # which do fit for this strategy
-        %w(rsync unison).each do |strategy|
+        %w(rsync unison native_osx native).each do |strategy|
           if config.key?("#{strategy}_image") && @config_syncs[name]['sync_strategy'] == strategy
             @config_syncs[name]['image'] = config["#{strategy}_image"]
           end

data/lib/docker-sync/sync_process.rb

@@ -3,6 +3,8 @@ require 'thor/shell'
 require 'docker-sync/sync_strategy/rsync'
 require 'docker-sync/sync_strategy/unison'
 require 'docker-sync/sync_strategy/native'
+require 'docker-sync/sync_strategy/native_osx'
+
 # noinspection RubyResolve
 require 'docker-sync/watch_strategy/fswatch'
 require 'docker-sync/watch_strategy/dummy'
@@ -45,6 +47,8 @@ module Docker_Sync
         @sync_strategy = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
       when 'native'
         @sync_strategy = Docker_Sync::SyncStrategy::Native.new(@sync_name, @options)
+      when 'native_osx'
+        @sync_strategy = Docker_Sync::SyncStrategy::NativeOsx.new(@sync_name, @options)
       else
         raise "Unknown sync_strategy #{@options['sync_strategy']}"
       end

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

@@ -0,0 +1,148 @@
+require 'thor/shell'
+require 'docker-sync/preconditions/strategy'
+require 'docker-sync/execution'
+require 'open3'
+require 'socket'
+require 'terminal-notifier'
+
+module Docker_Sync
+  module SyncStrategy
+    class NativeOsx
+      include Thor::Shell
+      include Execution
+
+      @options
+      @sync_name
+      @watch_thread
+      @local_server_pid
+
+      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:hostsync'
+        end
+
+        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
+        start_container
+        sync
+      end
+
+      def watch
+        # nop
+      end
+
+      def sync
+        # nop
+      end
+
+      def expand_ignore_strings
+        expanded_ignore_strings = []
+
+        exclude_type = 'Name'
+        unless @options['sync_excludes_type'].nil?
+          exclude_type = @options['sync_excludes_type']
+        end
+
+        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='#{ignore_string}'"
+          end
+        end
+        expanded_ignore_strings
+      end
+
+      def start_container
+        say_status 'ok', 'Starting unison', :white
+        container_name = get_container_name
+        #create_volume
+        host_sync_src = @options['src']
+        volume_app_sync_name = @sync_name
+        env = {}
+        say_status 'ok', 'sync_user is no longer supported, since it ise no needed, use sync_userid only please', :yellow if @options.key?('sync_user')
+
+        ignore_strings = expand_ignore_strings
+        env['UNISON_EXCLUDES'] = ignore_strings.join(' ')
+        env['MAX_INOTIFY_WATCHES'] = @options['max_inotify_watches'] if @options.key?('max_inotify_watches')
+        if @options['sync_userid'] == 'from_host'
+          env['OWNER_UID'] = Process.uid
+        else
+          env['OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
+        end
+
+        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 == ''
+            say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
+            run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required
+            cmd = "docker run -v #{volume_app_sync_name}:/app_sync -v #{host_sync_src}:/host_sync -e VOLUME=#{@options['dest']} -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} #{additional_docker_env} #{run_privileged} --name #{container_name} -d #{@docker_image}"
+          else
+            say_status 'ok', "starting #{container_name} container", :white if @options['verbose']
+            cmd = "docker start #{container_name} && docker exec #{container_name} supervisorctl restart unison"
+          end
+        else
+          say_status 'ok', "#{container_name} container still running, restarting unison in container", :blue
+          cmd = "docker exec #{container_name} supervisorctl restart unison"
+        end
+        say_status 'command', cmd, :white if @options['verbose']
+        `#{cmd}` || raise('Start failed')
+        say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
+        # wait until container is started, then sync:
+        say_status 'success', 'Unison container started', :green
+      end
+
+      def get_container_name
+        return "#{@sync_name}"
+      end
+
+      def get_volume_name
+        return @sync_name
+      end
+
+      def stop_container
+        `docker ps | grep #{get_container_name} && docker stop #{get_container_name} && docker wait #{get_container_name}`
+      end
+
+      def reset_container
+        stop_container
+        `docker ps -a | grep #{get_container_name} && docker rm #{get_container_name}`
+        `docker volume ls -q | grep #{get_volume_name} && docker volume rm #{get_volume_name}`
+      end
+
+      def clean
+        reset_container
+      end
+
+      def stop
+        say_status 'ok', "Stopping sync container #{get_container_name}"
+        begin
+          stop_container
+        rescue Exception => e
+          say_status 'error', "Stopping failed of #{get_container_name}:", :red
+          puts e.message
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0.pre.beta1
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -166,6 +166,7 @@ files:
 - lib/docker-sync/sync_manager.rb
 - lib/docker-sync/sync_process.rb
 - lib/docker-sync/sync_strategy/native.rb
+- lib/docker-sync/sync_strategy/native_osx.rb
 - lib/docker-sync/sync_strategy/rsync.rb
 - lib/docker-sync/sync_strategy/unison.rb
 - lib/docker-sync/update_check.rb
@@ -191,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1