docker-sync 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9986beceeb3f875df932e66562fbd84c8e933df5
-  data.tar.gz: 1f8ca0857499bc05dadefdec2090a99a2f39ecec
+  metadata.gz: 3910d6ffb6de84e75c09c017b98179fc2392c380
+  data.tar.gz: ad1c1e5f030116680834323636be0b6337637c45
 SHA512:
-  metadata.gz: 8a1a678fba8bb4c6ebe4d977d22476d6266d46872ac4b839ccc8d28b3bb915c073cddff0f96116d195b41bb6561e3bf6d386928ef07d5a2d2515731c3039e9c9
-  data.tar.gz: 2bb30716832245c895b09d7768fab9a97074163eb143376dbba2d2cd11b5330c51c9fc1adb65de8a67ac274f6aa6b71224bd1227746f37a73e1cd04eb1217d28
+  metadata.gz: 790a319c6efb072a0b45d6f1cb80d5fa0354859324786150a16b133df016c10ab1d21507f25d7ec0b374292ffe6acb0d1419e37288243028fb65ba4ae9fc8263
+  data.tar.gz: 2b1c23f585760a9f55a33de7181f53a241ebf45d33dfbbe5323827949a145feea66a159762784bd9c810122ed2f655b5f78dc5d9d56ecbde3e8255d79e3d0a98

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/docker-sync/compose.rb

@@ -41,9 +41,8 @@ class ComposeManager
   end
 
   def run
-    say_status 'ok','starting compose',:white
+    say_status 'ok','starting compose',:green
     @compose_session.up
-    say_status 'success','started compose',:green
   end
 
   def stop

data/lib/docker-sync/preconditions.rb

@@ -48,12 +48,18 @@ module Preconditions
     if (find_executable0 'unison-fsmonitor').nil?
       cmd1 = 'curl "https://raw.githubusercontent.com/hnsl/unox/master/unox.py" -o "/usr/local/bin/unison-fsmonitor" \
       && chmod +x /usr/local/bin/unison-fsmonitor'
-      cmd2 = 'easy_install pip && pip install macfsevents'
+      cmd2 = 'sudo easy_install pip && sudo pip install macfsevents'
       Thor::Shell::Basic.new.say_status 'warning', 'Could not find unison-fsmonitor (for file watching) binary in $PATH. Please install unox before you continue, see https://github.com/hnsl/unox.', :yellow
-      if Thor::Shell::Basic.new.yes?('Shall I install unison-fsmonitor for you?')
-        `#{cmd1}`
-        Thor::Shell::Basic.new.say_status 'ok','install macfsevents using pip', :yellow
-        `#{cmd2}`
+      if Thor::Shell::Basic.new.yes?('Shall I install unison-fsmonitor for you? ')
+        system cmd1
+        if $?.exitstatus > 0
+          raise('Failed to install unison-fsmonitor, please file an issue with the output of the error')
+        end
+        Thor::Shell::Basic.new.say_status 'ok','install macfsevents using pip (This will ask for sudo, since we use the system python)', :yellow
+        system cmd2
+        if $?.exitstatus > 0
+          raise('Failed to install macfsevents, please file an issue with the output of the error')
+        end
       else
         raise("Please install it, see https://github.com/hnsl/unox, or simply run :\n #{cmd1} && #{cmd2}")
       end

data/lib/docker-sync/sync_process.rb

@@ -70,7 +70,7 @@ module Docker_Sync
     end
 
     def get_host_ip
-      return 'localhost'
+      return '127.0.0.1'
     end
 
     def run

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

@@ -87,10 +87,10 @@ module Docker_Sync
         say_status 'ok', 'Starting rsync', :white
         container_name = get_container_name
         volume_name = get_volume_name
-        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
+        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' --format "{{.Names}}" | grep '^#{container_name}$'`
         if running == '' # container is yet not running
           say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
-          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
+          exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" --format "{{.Names}}" | grep '^#{container_name}$'`
           if exists == '' # container has yet not been created
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
 

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

@@ -78,10 +78,10 @@ module Docker_Sync
         say_status 'ok', 'Starting unison', :white
         container_name = get_container_name
         volume_name = get_volume_name
-        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
+        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}" | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
+          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']
             cmd = "docker run -p '#{@options['sync_host_port']}:#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e UNISON_DIR=#{@options['dest']} -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} --name #{container_name} -d #{@docker_image}"

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

@@ -80,6 +80,7 @@ module Docker_Sync
         stdout, stderr, exit_status = Open3.capture3(cmd)
         if not exit_status.success?
           say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
+          say_status 'message', stdout
           say_status 'message', stderr
         else
           TerminalNotifier.notify(
@@ -94,9 +95,21 @@ module Docker_Sync
 
       def sync_options
         args = []
+        exclude_type = 'Path'
+        unless @options['sync_excludes_type'].nil?
+          exclude_type = @options['sync_excludes_type']
+        end
 
         unless @options['sync_excludes'].nil?
-          args = @options['sync_excludes'].map { |pattern| "-ignore='Path #{pattern}'" } + args
+          args = @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 + args
         end
         args.push(@options['src'])
         args.push('-auto')
@@ -127,14 +140,14 @@ module Docker_Sync
         end
 
         additional_docker_env = env.map{ |key,value| "-e #{key}=\"#{value}\"" }.join(' ')
-        running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
+        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}" | sed -E -n 's/.*\\s(.*)$/\\1/p' | grep '^#{container_name}$'`
+          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 -p '127.0.0.1::#{UNISON_CONTAINER_PORT}' \
+            cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' \
                               -v #{volume_name}:#{@options['dest']} \
                               -e UNISON_DIR=#{@options['dest']} \
                               -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} \

data/tasks/sync/sync.thor

@@ -114,11 +114,4 @@ class Sync < Thor
       print_table(config) if options['verbose']
     end
   end
-  desc 'start', 'Start all sync configurations in this project'
-  def upgrade
-    # do run update check in the start command only
-    upgrades = UpgradeChecker.new
-    upgrades.run
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor