docker-sync 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e94e8b63059e13f3836bf55b2ac0b333cfc2bf
-  data.tar.gz: 122904ea397e01bcada45ab92244935230d0c403
+  metadata.gz: 0dc6a6d17b0c061b6f089c82f25fccdee21b477f
+  data.tar.gz: 52d4daa5b8b9aab3e6bb9fd218dd7d324ff55a94
 SHA512:
-  metadata.gz: 160f2d4a43d7f4fd26434429ea9c935e3afaf5e15363c4de14b5502cb038a93cd74fffa1d7ba0ea306d6220d5c8ded5433fc48c4f6242a08da2f6d2b64514bab
-  data.tar.gz: 4169edcfb1926c07ff4e95c1d6bceab1bde258c3cc62213291eddf6a83479499c75582a1c90ed9ceaeb903dce6ac2a03df9842f1195bda52bba64d97c0ab6397
+  metadata.gz: 9b1c17a21b47ef1bc4445ad5cfe705e78c64ada480e9f677c0adf1485fe184415b27e94a467b9520da759513baf0fa26f6e23ae03305166ea67e4934ab6b66b1
+  data.tar.gz: d1eed5aba038bcfb69f49f49ad09782bdf0b54e435cc539455950fd4860c539e8b194f7dd7a41c0152fa640206a50fcce4a00c7c5867ffcd6d5ab6f4bbb0b2f0

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

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

@@ -2,7 +2,7 @@ require 'singleton'
 require 'docker-sync/config/config_locator'
 require 'docker-sync/config/config_serializer'
 require 'forwardable'
-
+require 'docker-sync/preconditions/strategy'
 module DockerSync
   class ProjectConfig
     extend Forwardable
@@ -134,9 +134,14 @@ module DockerSync
       end
 
       def default_sync_strategy
-        case true
-        when OS.linux? then 'native'
-        else 'native_osx'
+        if OS.linux?
+          return 'native'
+        elsif OS.osx?
+          if DockerSync::Preconditions::Strategy.instance.is_driver_docker_for_mac?
+            return 'native_osx'
+          else
+            return 'unison'
+          end
         end
       end
 
@@ -145,7 +150,7 @@ module DockerSync
         when 'rsync' then 'fswatch'
         when 'unison' then 'unison'
         when 'native' then 'dummy'
-        when 'native_osx' then 'dummy'
+        when 'native_osx' then 'remotelogs'
         else raise "you shouldn't be here"
         end
       end

data/lib/docker-sync/sync_process.rb

@@ -9,6 +9,7 @@ require 'docker-sync/sync_strategy/native_osx'
 require 'docker-sync/watch_strategy/fswatch'
 require 'docker-sync/watch_strategy/dummy'
 require 'docker-sync/watch_strategy/unison'
+require 'docker-sync/watch_strategy/remotelogs'
 
 module Docker_Sync
   class SyncProcess
@@ -62,6 +63,8 @@ module Docker_Sync
         @watch_strategy = Docker_Sync::WatchStrategy::Dummy.new(@sync_name, @options)
       when 'unison'
         @watch_strategy = Docker_Sync::WatchStrategy::Unison.new(@sync_name, @options)
+      when 'remotelogs'
+        @watch_strategy = Docker_Sync::WatchStrategy::Remote_logs.new(@sync_name, @options)
       else
         raise "Unknown watch_strategy #{@options['watch_strategy']}"
       end

data/lib/docker-sync/upgrade_check.rb

@@ -1,6 +1,7 @@
 require 'gem_update_checker'
 require 'thor/actions'
 require 'docker-sync/config/global_config'
+require 'docker-sync/update_check'
 
 class UpgradeChecker
   include Thor::Shell
@@ -94,6 +95,17 @@ class UpgradeChecker
       end
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.2')
+      checker = UpdateChecker.new
+      checker.check_unison_hostsync_image
+
+      Thor::Shell::Basic.new.say_status 'warning', "The native_osx is NOW ONLY for docker-for-mac, this is due to https://github.com/EugenMayer/docker-sync/issues/346\n\nThat means, that unison is picked as a default automatically, if you use docker-machine", :red
+
+      unless Thor::Shell::Basic.new.yes?('Just wanted you to no that! (y/N)')
+        exit 1
+      end
+    end
+
     # update the upgrade_status
     @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
   end

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

@@ -0,0 +1,50 @@
+require 'thor/shell'
+require 'docker-sync/execution'
+
+module Docker_Sync
+  module WatchStrategy
+    class Remote_logs
+      include Thor::Shell
+      include Execution
+
+      @options
+      @sync_name
+      @watch_fork
+      @watch_thread
+
+      def initialize(sync_name, options)
+        @options = options
+        @sync_name = sync_name
+        @watch_fork = nil
+        @watch_thread = nil
+        @unison = Docker_Sync::SyncStrategy::Unison.new(@sync_name, @options)
+      end
+
+      def run
+        say_status 'success', "Showing unison logs from your sync container: #{@unison.get_container_name}", :green
+        cmd = "docker exec #{@unison.get_container_name} tail -f /tmp/unison.log"
+        @watch_thread = threadexec(cmd, 'Sync Log:')
+      end
+
+      def stop
+      end
+
+      def clean
+      end
+
+      def watch
+      end
+
+      def watch_options
+      end
+
+      def watch_fork
+        return @watch_fork
+      end
+
+      def watch_thread
+        return @watch_thread
+      end
+    end
+  end
+end

data/tasks/stack/stack.thor

@@ -12,8 +12,14 @@ class Stack < Thor
   class_option :sync_name, :aliases => '-n', :type => :string, :desc => 'If given, only this sync configuration will be references/started/synced'
   class_option :version, :aliases => '-v',:type => :boolean, :default => false, :desc => 'prints out the version of docker-sync and exits'
 
-  desc 'start', 'Start sync services, watcher and then your docker-compose defined stack'
+  desc '--version, -v', 'Prints out the version of docker-sync and exits'
+  def print_version
+    puts UpgradeChecker.get_current_version
+    exit(0)
+  end
+  map %w[--version -v] => :print_version
 
+  desc 'start', 'Start sync services, watcher and then your docker-compose defined stack'
   def start
     if options[:version]
       puts UpgradeChecker.get_current_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Eugen Mayer
@@ -173,6 +173,7 @@ files:
 - lib/docker-sync/upgrade_check.rb
 - lib/docker-sync/watch_strategy/dummy.rb
 - lib/docker-sync/watch_strategy/fswatch.rb
+- lib/docker-sync/watch_strategy/remotelogs.rb
 - lib/docker-sync/watch_strategy/unison.rb
 - tasks/daemon/daemon.thor
 - tasks/stack/stack.thor