docker-sync 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f672a525e3ac21a5fe659eb7d0a15d8ba617e14
-  data.tar.gz: cbacd747e7959c1319c1f897070bd1d6d3a7da18
+  metadata.gz: 8746cae5b189f20e47f395a21cf677b62746baca
+  data.tar.gz: 793703a123def635266d38e82e70e411bf1994d4
 SHA512:
-  metadata.gz: c9ac6925db1d1e9da1088d6f85c82a0a47e4183933da35873df1aa02d7b93ed868976705cd496b9b98afaf41f10f551c1b1ca7f1baa95397b87e8cfe2aeb59cb
-  data.tar.gz: 973e7208ff7e7f9d560ba96f3a93d40bd56f7a82f4f02207a865248cb6d9c11dbaf0785ef6ab677f2e9205198e1b96a61310ee5810a53d1730aa87b0e34e238c
+  metadata.gz: d030d530618e60eb2106c9552ad1a2a6d1a8b5f36de28bec3481b53d03f9b4a27f80968cb1129483a136f41a340f7ec832d140c26938457f79fcb12b57cc58c9
+  data.tar.gz: 16581581034acbadf1f20c11f953df4c62fe7b2ee5502e011ac44110ca50ca9750966eb62ea4429bb1831541a570c56570816d0e559b481112195fd9d23c46d6

data/Thorfile

@@ -1,7 +1,7 @@
 #lib = File.expand_path('./lib', __dir__)
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-
 thor = File.expand_path('../tasks', __FILE__)
+
 Dir.glob(File.join(thor, '/**/*.thor')).each { |taskfile|
   load taskfile
 }

data/lib/config.rb

@@ -1,5 +1,5 @@
 require 'pp'
-require 'Pathname'
+require 'pathname'
 # this has basically completely reused from Thor::runner.rb - thank you!
 
 module DockerSyncConfig

data/lib/docker_sync/sync_manager.rb

@@ -1,5 +1,7 @@
 require 'thor/shell'
+# noinspection RubyResolve
 require 'docker_sync/sync_process'
+# noinspection RubyResolve
 require 'execution'
 require 'yaml'
 

data/lib/docker_sync/sync_process.rb

@@ -1,133 +1,91 @@
 require 'thor/shell'
-require 'execution'
-require 'shellwords'
+# noinspection RubyResolve
+require 'docker_sync/sync_strategy/rsync'
+require 'docker_sync/sync_strategy/unison'
+# noinspection RubyResolve
+require 'docker_sync/watch_strategy/fswatch'
+
 module Docker_Sync
   class SyncProcess
     include Thor::Shell
-    include Execution
     @options
     @sync_name
     @watch_thread
+    @sync_strategy
+    @watch_strategy
 
+    # noinspection RubyStringKeysInHashInspection
     def initialize(sync_name, options)
       defaults = {
-        'verbose' => false,
-        'sync_host_ip' => get_host_ip
+          'verbose' => false,
+          'sync_host_ip' => get_host_ip
       }
       @sync_name = sync_name
       @options = defaults.merge(options)
-
-    end
-
-    def get_host_ip
-      return 'localhost'
+      @sync_strategy = nil
+      @watch_strategy = nil
+      set_sync_strategy
+      set_watch_strategy
     end
 
-    def run
-      start_container
-      sync
-      watch
-    end
-
-    def stop
-      say_status 'ok', "Stopping sync container #{@sync_name}"
-      begin
-        `docker stop #{@sync_name}`
-      rescue Exception => e
-        say_status 'error', "Stopping failed of #{@sync_name}:", :red
-        puts e.message
+    def set_sync_strategy
+      if @options.key?('sync_strategy')
+        case @options['sync_strategy']
+          when 'rsync'
+            @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
+          when 'unison'
+            @sync_strategy = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+          else
+            @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
+        end
+      else
+        @sync_strategy = Docker_Sync::SyncStrategy::Rsync.new(@sync_name, @options)
       end
     end
 
-    def start_container
-      say_status 'ok', 'Starting rsync', :white
-      running = `docker ps --filter 'status=running' --filter 'name=#{@sync_name}' | grep #{@sync_name}`
-      if running == ''
-        say_status 'ok', "#{@sync_name} container not running", :white
-        exists = `docker ps --filter "status=exited" --filter "name=filesync_dw" | grep filesync_dw`
-        if exists == ''
-          say_status 'ok', "creating #{@sync_name} container", :white
-          cmd = "docker run -p '#{@options['sync_host_port']}:873' -v #{@sync_name}:#{@options['dest']} -e VOLUME=#{@options['dest']} --name #{@sync_name} -d eugenmayer/rsync"
-        else
-          say_status 'success', "starting #{@sync_name} container", :green
-          cmd = "docker start #{@sync_name}"
+    def set_watch_strategy
+      if @options.key?('watch_strategy')
+        case @options['watch_strategy']
+          when 'fswatch'
+            @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
+          else
+            @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
         end
-        say_status 'command', cmd, :white
-        `#{cmd}` || raise('Start failed')
       else
-        say_status 'ok', "#{@sync_name} container still running", :blue
+        @watch_strategy = Docker_Sync::WatchStrategy::Fswatch.new(@sync_name, @options)
       end
-      say_status 'success', "starting initial #{@sync_name} of src", :green
-      # this sleep is needed since the container could be not started
-      sleep 1
-      sync
     end
 
-    def stop_container
-      `docker stop #{@sync_name}`
+    def get_host_ip
+      return 'localhost'
+    end
+
+    def run
+      @sync_strategy.run
+      @watch_strategy.run
     end
 
-    def reset_container
-      stop_container
-      `docker rm #{@sync_name}`
-      `docker volume rm #{@sync_name}`
+    def stop
+      @sync_strategy.stop
+      @watch_strategy.stop
     end
 
     def clean
-      reset_container
+      @sync_strategy.clean
+      @watch_strategy.clean
     end
 
     def sync
-      args = sync_options
-      cmd = 'rsync ' + args.join(' ')
-
-      say_status 'command', cmd, :white if @options['verbose']
-
-      out = `#{cmd}`
-      if $?.exitstatus > 0
-        say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
-        say_status 'message', out
-      else
-        say_status 'success', "Synced #{@options['src']}", :green
-        if @options['verbose']
-          say_status 'output', out
-        end
-      end
-    end
-
-    def sync_options
-      args = []
-      unless @options['sync_excludes'].nil?
-        args = @options['sync_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
-      end
-      args.push('-ap')
-      args.push(@options['sync_args']) if @options.key?('sync_args')
-      args.push("#{@options['src']}/") # add a trailing slash
-      args.push("rsync://#{@options['sync_host_ip']}:#{@options['sync_host_port']}/volume")
+      # TODO: probably use run here
+      @sync_strategy.sync
     end
 
     def watch
-      args = watch_options
-      say_status 'ok', "Starting to watch #{@options['src']} - Press CTRL-C to stop", :green
-      cmd = 'fswatch ' + args.join(' ')
-      say_status 'command', cmd, :white if @options['verbose']
-
-      @watch_thread = threadexec(cmd, "Sync #{@sync_name}", :blue)
-    end
-
-    def watch_options
-      args = []
-      unless @options['watch_excludes'].nil?
-        args = @options['watch_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
-      end
-      args.push('-orIE')
-      args.push(@options['watch_args']) if @options.key?('watch_args')
-      args.push(@options['src'])
-      args.push(" | xargs -I -n1 thor sync:sync -n #{@sync_name} --config='#{@options['config_path']}'")
+      @watch_strategy.run
     end
 
     def watch_thread
-      return @watch_thread
+      return @watch_strategy.watch_thread
     end
   end
 end

data/lib/docker_sync/sync_strategy/rsync.rb

@@ -0,0 +1,100 @@
+require 'thor/shell'
+
+module Docker_Sync
+  module SyncStrategy
+    class Rsync
+      include Thor::Shell
+      @options
+      @sync_name
+      @watch_thread
+
+      def initialize(sync_name, options)
+        @sync_name = sync_name
+        @options = options
+      end
+
+      def run
+        start_container
+        sync
+      end
+
+      def sync
+        args = sync_options
+        cmd = 'rsync ' + args.join(' ')
+
+        say_status 'command', cmd, :white if @options['verbose']
+
+        out = `#{cmd}`
+        if $?.exitstatus > 0
+          say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+          say_status 'message', out
+        else
+          say_status 'success', "Synced #{@options['src']}", :green
+          if @options['verbose']
+            say_status 'output', out
+          end
+        end
+      end
+
+      def sync_options
+        args = []
+        unless @options['sync_excludes'].nil?
+          args = @options['sync_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
+        end
+        args.push('-ap')
+        args.push(@options['sync_args']) if @options.key?('sync_args')
+        args.push("#{@options['src']}/") # add a trailing slash
+        args.push("rsync://#{@options['sync_host_ip']}:#{@options['sync_host_port']}/volume")
+      end
+
+
+      def start_container
+        say_status 'ok', 'Starting rsync', :white
+        running = `docker ps --filter 'status=running' --filter 'name=#{@sync_name}' | grep #{@sync_name}`
+        if running == ''
+          say_status 'ok', "#{@sync_name} container not running", :white
+          exists = `docker ps --filter "status=exited" --filter "name=filesync_dw" | grep filesync_dw`
+          if exists == ''
+            say_status 'ok', "creating #{@sync_name} container", :white
+            cmd = "docker run -p '#{@options['sync_host_port']}:873' -v #{@sync_name}:#{@options['dest']} -e VOLUME=#{@options['dest']} --name #{@sync_name} -d eugenmayer/rsync"
+          else
+            say_status 'success', "starting #{@sync_name} container", :green
+            cmd = "docker start #{@sync_name}"
+          end
+          say_status 'command', cmd, :white
+          `#{cmd}` || raise('Start failed')
+        else
+          say_status 'ok', "#{@sync_name} container still running", :blue
+        end
+        say_status 'success', "starting initial #{@sync_name} of src", :green
+        # this sleep is needed since the container could be not started
+        sleep 1
+        sync
+      end
+
+      def stop_container
+        `docker stop #{@sync_name}`
+      end
+
+      def reset_container
+        stop_container
+        `docker rm #{@sync_name}`
+        `docker volume rm #{@sync_name}`
+      end
+
+      def clean
+        reset_container
+      end
+
+      def stop
+        say_status 'ok', "Stopping sync container #{@sync_name}"
+        begin
+          stop_container
+        rescue Exception => e
+          say_status 'error', "Stopping failed of #{@sync_name}:", :red
+          puts e.message
+        end
+      end
+    end
+  end
+end

data/lib/docker_sync/sync_strategy/unison.rb

@@ -0,0 +1,105 @@
+require 'thor/shell'
+
+module Docker_Sync
+  module SyncStrategy
+    class Unison
+      include Thor::Shell
+      @options
+      @sync_name
+      @watch_thread
+      UNISON_IMAGE = 'leighmcculloch/unison'
+      UNISON_VERSION = '2.48.3'
+      UNISON_CONTAINER_PORT = '5000'
+      def initialize(sync_name, options)
+        @sync_name = sync_name
+        @options = options
+      end
+
+      def run
+        start_container
+        sync
+      end
+
+      def sync
+        args = sync_options
+        cmd = 'unison ' + args.join(' ')
+
+        say_status 'command', cmd, :white if @options['verbose']
+
+        out = `#{cmd}`
+        if $?.exitstatus > 0
+          say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+          say_status 'message', out
+        else
+          say_status 'success', "Synced #{@options['src']}", :green
+          if @options['verbose']
+            say_status 'output', out
+          end
+        end
+      end
+
+      def sync_options
+        args = []
+
+        unless @options['sync_excludes'].nil?
+          # TODO: does unison support excludes as a command paramter? seems to be a config-value only
+          say_status 'warning','Excludes are yet not implemented for unison!', :orange
+          #  args = @options['sync_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
+        end
+        args.push(@options['src'])
+        args.push('-auto')
+        args.push('-batch')
+        args.push(@options['sync_args']) if @options.key?('sync_args')
+        args.push("socket://#{@options['sync_host_ip']}:#{@options['sync_host_port']}/")
+      end
+
+      def start_container
+        say_status 'ok', 'Starting rsync', :white
+        running = `docker ps --filter 'status=running' --filter 'name=#{@sync_name}' | grep #{@sync_name}`
+        if running == ''
+          say_status 'ok', "#{@sync_name} container not running", :white
+          exists = `docker ps --filter "status=exited" --filter "name=filesync_dw" | grep filesync_dw`
+          if exists == ''
+            say_status 'ok', "creating #{@sync_name} container", :white
+            cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' -v #{@sync_name}:#{@options['dest']} -e UNISON_VERSION=#{UNISON_VERSION} -e UNISON_WORKING_DIR=#{@options['dest']} --name #{@sync_name} -d #{UNISON_IMAGE}"
+          else
+            say_status 'success', "starting #{@sync_name} container", :green
+            cmd = "docker start #{@sync_name}"
+          end
+          say_status 'command', cmd, :white
+          `#{cmd}` || raise('Start failed')
+        else
+          say_status 'ok', "#{@sync_name} container still running", :blue
+        end
+        say_status 'success', "starting initial #{@sync_name} of src", :green
+        # this sleep is needed since the container could be not started
+        sleep 1
+        sync
+      end
+
+      def stop_container
+        `docker stop #{@sync_name}`
+      end
+
+      def reset_container
+        stop_container
+        `docker rm #{@sync_name}`
+        `docker volume rm #{@sync_name}`
+      end
+
+      def clean
+        reset_container
+      end
+
+      def stop
+        say_status 'ok', "Stopping sync container #{@sync_name}"
+        begin
+          stop_container
+        rescue Exception => e
+          say_status 'error', "Stopping failed of #{@sync_name}:", :red
+          puts e.message
+        end
+      end
+    end
+  end
+end

data/lib/docker_sync/watch_strategy/fswatch.rb

@@ -0,0 +1,52 @@
+require 'thor/shell'
+require 'execution'
+module Docker_Sync
+  module WatchStrategy
+    class Fswatch
+      include Thor::Shell
+      include Execution
+      @options
+      @sync_name
+      @watch_thread
+
+      def initialize(sync_name, options)
+        @sync_name = sync_name
+        @options = options
+      end
+
+      def run
+        watch
+      end
+
+      def stop
+      end
+
+      def clean
+      end
+
+      def watch
+        args = watch_options
+        say_status 'ok', "Starting to watch #{@options['src']} - Press CTRL-C to stop", :green
+        cmd = 'fswatch ' + args.join(' ')
+        say_status 'command', cmd, :white if @options['verbose']
+
+        @watch_thread = threadexec(cmd, "Sync #{@sync_name}", :blue)
+      end
+
+      def watch_options
+        args = []
+        unless @options['watch_excludes'].nil?
+          args = @options['watch_excludes'].map { |pattern| "--exclude='#{pattern}'" } + args
+        end
+        args.push('-orIE')
+        args.push(@options['watch_args']) if @options.key?('watch_args')
+        args.push(@options['src'])
+        args.push(" | xargs -I -n1 thor sync:sync -n #{@sync_name} --config='#{@options['config_path']}'")
+      end
+
+      def watch_thread
+        return @watch_thread
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Eugen Mayer
@@ -51,6 +51,9 @@ files:
 - lib/config.rb
 - lib/docker_sync/sync_manager.rb
 - lib/docker_sync/sync_process.rb
+- lib/docker_sync/sync_strategy/rsync.rb
+- lib/docker_sync/sync_strategy/unison.rb
+- lib/docker_sync/watch_strategy/fswatch.rb
 - lib/execution.rb
 - tasks/sync.thor
 homepage: https://github.com/EugenMayer/docker_sync