docker-sync 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a467b9dee71d933110ea66148ac480c7ed3d9b0
-  data.tar.gz: 1533c522f6aa5db93e15d85e4b8a53f61f350e2a
+  metadata.gz: f91f3a2eb84005eb9ecd865282ace48c86f2f2c4
+  data.tar.gz: 3a5ca77ceab1cbe91ae630c6cd7c102db467f0c2
 SHA512:
-  metadata.gz: 3dfb30f05807f691089c1e106934a29e2bfa54794994b6d7180789824052e1f18532e239058b91f1989b8779c27bbfe58a2adf7db6eaa7c06c1ebc72b2b41004
-  data.tar.gz: c09c3b2a2e6615302bf5593e6f5472fa7f364a96e3183a421c09d911042fd20bad5ae0a2e83005f821b0e2883eebd15d4307aa178564b28f1256119b94785c5a
+  metadata.gz: 35de54d7b90e0dd76617a8ad102cea41ff8c837904790f96313c8943eb5b9c7e13249bfa3209673788fec538eb9784f173393dddfeff6f81e8a967be10feceda
+  data.tar.gz: 30776d4c9c53279ffa349ac44f50efb9b204a7577678d67c44baaeef5131f94eab02e62d28ae423dbd641e3a62f7ae5fe7d0f9b8f86bf8a6bc38ba799adac901

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/docker-sync/sync_manager.rb

@@ -16,7 +16,7 @@ module Docker_Rsync
     def initialize(options)
       @sync_processes = []
       @config_syncs = []
-      @config_options = []
+      @config_global = []
       @config_path = options[:config_path]
       load_configuration
     end
@@ -28,13 +28,13 @@ module Docker_Rsync
 
       config = YAML.load_file(@config_path)
       validate_config(config)
-      @config_options = config['options'] || {}
+      @config_global = config['options'] || {}
       @config_syncs = config['syncs']
       upgrade_syncs_config
     end
 
     def global_options
-      return @config_options
+      return @config_global
     end
 
     def get_sync_points
@@ -46,12 +46,13 @@ module Docker_Rsync
         @config_syncs[name]['config_path'] = @config_path
         # expand the sync source to remove ~ and similar expressions in the path
         @config_syncs[name]['src'] = File.expand_path(@config_syncs[name]['src'], File.dirname(@config_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
         unless config.key?('verbose')
           @config_syncs[name]['verbose'] = false
-          if @config_options.key?('verbose')
-            @config_syncs[name]['verbose'] = @config_options['verbose']
+          if @config_global.key?('verbose')
+            @config_syncs[name]['verbose'] = @config_global['verbose']
           end
         end
 

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

@@ -1,5 +1,6 @@
 require 'thor/shell'
 require 'docker-sync/preconditions'
+require 'terminal-notifier'
 
 module Docker_Sync
   module SyncStrategy
@@ -45,6 +46,9 @@ module Docker_Sync
           say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
           say_status 'message', out
         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', out

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

@@ -2,6 +2,7 @@ require 'thor/shell'
 require 'docker-sync/preconditions'
 require 'open3'
 require 'socket'
+require 'terminal-notifier'
 
 module Docker_Sync
   module SyncStrategy
@@ -48,6 +49,9 @@ module Docker_Sync
           say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
           say_status 'message', stderr
         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
@@ -118,7 +122,7 @@ module Docker_Sync
         else
           say_status 'ok', "#{container_name} container still running", :blue
         end
-        say_status 'ok', "starting initial #{container_name} of src", :white if @options['verbose']
+        say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
         # this sleep is needed since the container could be not started
         sleep 5 # TODO: replace with unison -testserver
         sync

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

@@ -1,6 +1,7 @@
 require 'thor/shell'
 require 'docker-sync/preconditions'
 require 'open3'
+require 'terminal-notifier'
 
 module Docker_Sync
   module SyncStrategy
@@ -45,6 +46,9 @@ module Docker_Sync
           say_status 'error', "Error starting sync, exit code #{$?.exitstatus}", :red
           say_status 'message', stderr
         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
@@ -91,7 +95,7 @@ module Docker_Sync
         else
           say_status 'ok', "#{container_name} container still running", :blue
         end
-        say_status 'ok', "starting initial #{container_name} of src", :white if @options['verbose']
+        say_status 'ok', "starting initial sync of #{container_name}", :white if @options['verbose']
         # this sleep is needed since the container could be not started
         sleep 1
         sync

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

@@ -55,17 +55,33 @@ module Docker_Sync
         args.push(@events_to_watch.map { |pattern| "--event #{pattern}" })
         args.push(@options['watch_args']) if @options.key?('watch_args')
         args.push(@options['src'])
-
-        sync_command = 'thor sync:sync'
-        exec_name =File.basename($PROGRAM_NAME)
-        if exec_name != 'thor'
-          sync_command = 'docker-sync sync'
-        else
-          say_status 'warning', 'Called user thor, not docker-sync* wise, assuming dev mode, using thor', :yellow
-        end
+        sync_command = get_sync_cli_call
         args.push(" | xargs -I -n1 #{sync_command} -n #{@sync_name} --config='#{@options['config_path']}'")
       end
 
+      def get_sync_cli_call
+        sync_command = 'thor sync:'
+        case @options['cli_mode']
+          when 'docker-sync'
+            say_status 'ok','Forcing cli mode docker-sync',:yellow if @options['verbose']
+            sync_command = 'docker-sync '
+          when 'thor'
+            say_status 'ok','Forcing cli mode thor',:yellow if @options['verbose']
+            sync_command = 'thor sync:'
+          else # 'auto' or any other, try to guss
+            say_status 'ok','Cli mode is auto, selecting .. ',:white if @options['verbose']
+            exec_name = File.basename($PROGRAM_NAME)
+            if exec_name != 'thor'
+              sync_command = 'docker-sync '
+            else
+              say_status 'warning', 'Called user thor, not docker-sync* wise, assuming dev mode, using thor', :yellow
+            end
+            say_status 'ok',".. #{sync_command}",:white if @options['verbose']
+        end
+
+        # append the actual operation
+        return "#{sync_command}sync"
+      end
       def watch_thread
         return @watch_thread
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -64,6 +64,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.3
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.3
 description: Sync your code live to docker-containers without losing any performance
   on OSX
 email: eugen.mayer@kontextwork.de