docker-sync 0.4.0.pre.beta2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66c65a38606565e60bf76aa80b33934690b6851
-  data.tar.gz: ee1aa4c4a84dfbb9eb9dfdbaa5fc31d3a27cef46
+  metadata.gz: 14d9d3ece46e03a2e565e2dde64904390fb65ac8
+  data.tar.gz: b84c982835813565bfdd2998dd6f5cd1bfa09d16
 SHA512:
-  metadata.gz: 250dc5898a0f2e92ad7208bec4ff1c92b1a3177daf1873c8768ec634e6e4e3f1b68c2a3f8aa5e1fb8c9c9e3ca49952dcd360a41b25b1102060672727cfa52fd3
-  data.tar.gz: c59ef8da87e69dd577bb9f647de17ed9db331e6b4a6aae73210c7c1cecd05053145c89222fa8f96332d72afb794fab8e33624b203182ee22a0487e809da8b436
+  metadata.gz: 68eafeed28b2bac6692b02cdb43b510f221dd45931650805c594a8d5cc21a4ef00b1d2dbdfaefa723bf423745ca37c55fd909e45100760e7f5d10cc309cfa65c
+  data.tar.gz: 7c757603135a5600ab4e17cbf37bf2ab945531189ec8959e0025072fbed0b25dc308556e829ad810bd8308340e671bb8dd7651f6ddedb88a155f55fd18ee7680

data/VERSION

@@ -1 +1 @@
-0.4.0-beta2
+0.4.0

data/lib/docker-sync/sync_process.rb

@@ -25,11 +25,11 @@ module Docker_Sync
 
       defaults = {
           'verbose' => false,
-          'sync_host_ip' => get_host_ip_default
       }
+
       # even if sync_host_ip is set, if it is set to auto, enforce the default
-      if options.key?('sync_host_ip') && options['sync_host_ip'] == 'auto' || options['sync_host_ip'] == ''
-        options['sync_host_ip'] = defaults['sync_host_ip']
+      if !options.key?('sync_host_ip') || options['sync_host_ip'] == 'auto' || options['sync_host_ip'] == ''
+        options['sync_host_ip'] = get_host_ip_default
       end
 
       @options = defaults.merge(options)
@@ -71,7 +71,7 @@ module Docker_Sync
       return '127.0.0.1' if DockerSync::Preconditions::Strategy.instance.is_driver_docker_for_mac?
 
       if DockerSync::Preconditions::Strategy.instance.is_driver_docker_toolbox?
-        cmd = 'docker-machine ip'
+        cmd = 'docker-machine ip $(docker-machine active)'
         stdout, stderr, exit_status = Open3.capture3(cmd)
         unless exit_status.success?
           raise "Error getting sync_host_ip automatically, exit code #{$?.exitstatus} ... #{stderr}"

data/lib/docker-sync/upgrade_check.rb

@@ -70,7 +70,7 @@ class UpgradeChecker
       cmd1 = 'sudo rm -f /usr/local/bin/unison-fsmonitor && brew tap eugenmayer/dockersync && brew install eugenmayer/dockersync/unox'
       Thor::Shell::Basic.new.say_status 'ok', cmd1, :rwhite
 
-      if Thor::Shell::Basic.new.yes?('I will reinstall docker-sync for you using the above command (y/N)')
+      if Thor::Shell::Basic.new.yes?('I will reinstall unox for you using the above command (y/N)')
         system cmd1
       else
         raise('Please reinstall docker-sync yourself')
@@ -78,6 +78,13 @@ class UpgradeChecker
       end
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.0')
+      Thor::Shell::Basic.new.say_status 'warning', "docker-sync has a new superior default sync strategy native_osx - consider switching to it no matter if you used unison or rsync. \nIt does no longer need Unison/Unox on OSX - no brew needed either. And its a lot thriftier ! \n\n_Please_ read :): https://github.com/EugenMayer/docker-sync/wiki/1.2-Upgrade-Guide\n\n", :red
+
+      unless Thor::Shell::Basic.new.yes?('Shall we continue - DID you read it - really :) ? (y/N)')
+        exit 1
+      end
+    end
 
     # update the upgrade_status
     @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"

data/tasks/daemon/daemon.thor

@@ -17,6 +17,8 @@ class Daemon < Thor
 
   desc 'start', 'Start docker-sync daemon'
   def start
+    say_status 'warning', 'Daemon mode is not the default, just use docker-sync start .. docker-sync-daemon is deprecated', :blue
+
     opt = options.dup
     opt.merge!(:daemon => true)
     sync = Sync.new([], opt)
@@ -25,6 +27,8 @@ class Daemon < Thor
 
   desc 'stop', 'Stop docker-sync daemon'
   def stop
+    say_status 'warning', 'Daemon mode is not the default, just use docker-sync start .. docker-sync-daemon is deprecated', :blue
+
     opt = options.dup
     opt.merge!(:daemon => true)
     sync = Sync.new([], opt)
@@ -33,6 +37,8 @@ class Daemon < Thor
 
   desc 'clean', 'Clean docker-sync daemon'
   def clean
+    say_status 'warning', 'Daemon mode is not the default, just use docker-sync start .. docker-sync-daemon is deprecated', :blue
+
     opt = options.dup
     opt.merge!(:daemon => true)
     sync = Sync.new([], opt)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.beta2
+  version: 0.4.0
 platform: ruby
 authors:
 - Eugen Mayer
@@ -192,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1