docker-sync 0.5.11.pre.beta1 → 0.5.11.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2501ae9905e17c2a687358bb4a5d7f8b2eb10bfb
-  data.tar.gz: 458f430966f1e477bacc032ee6ccecad0e6bf194
+  metadata.gz: 8644a79fafb6932d66c52709ff86bf281b8cf543
+  data.tar.gz: b4f27677378f73590c310a954497d0465d848489
 SHA512:
-  metadata.gz: a06185a80616f8fcfa1344e61c05636d07944af8618a03aac4f5fbfcad6ce9480aaff10d9420148b76e42d8b542b00e4d8bf8a5fbfe9692af029fcf6c0454909
-  data.tar.gz: 4b1cecb9ce0f4c9efa71f12268c331631f9bee7bd919115903ca44f4c2ca82bc5684c422ec05bca63b730efc5ff50612a438a0643bd07909ddadc87d8a1d940f
+  metadata.gz: 7931f368d41d7be352ac09f106c4b691a6794019ec0f1a29b4ab809b972bedc4fb68613b7d76668a371dc2292cbb17bf592f35e4095f6ae42acd9ac33be15682
+  data.tar.gz: 2dab2954df86b18bc432ff086d880806e14dad82ca562eeacc5867e0e2b05b64a8b00abf360abd1f91ca5810af7c07316e8638e95d3a297c4793a2748c881899

data/VERSION

@@ -1 +1 @@
-0.5.11-beta1
+0.5.11-beta2

data/lib/docker-sync/dependencies.rb

@@ -23,24 +23,19 @@ module DockerSync
       Docker.ensure!
       Unison.ensure!  if config.unison_required?
       Rsync.ensure!   if config.rsync_required?
-      if config.fswatch_required?
-        unless Fswatch.available?
-          Fswatch.ensure!
-          puts "please restart docker sync so the installation of fswatch takes effect"
-          raise(UNSUPPORTED_OPERATING_SYSTEM)
-        end
-      end
-
+      Fswatch.ensure! if config.fswatch_required?
     end
 
-    def self.ensure_all_for_linux!(_config)
+    def self.ensure_all_for_linux!(config)
       Docker.ensure!
+      Fswatch.forbid! if config.fswatch_required?
     end
 
     def self.ensure_all_for_freebsd!(config)
       Docker.ensure!
       Unison.ensure!  if config.unison_required?
       Rsync.ensure!   if config.rsync_required?
+      Fswatch.forbid! if config.fswatch_required?
     end
   end
 end

data/lib/docker-sync/dependencies/docker_driver.rb

@@ -5,14 +5,14 @@ module DockerSync
         def self.docker_for_mac?
           return false unless Environment.mac?
           return @docker_for_mac if defined? @docker_for_mac
-          @docker_for_mac = system('pgrep -q com.docker.hyperkit')
+          @docker_for_mac = Environment.system('pgrep -q com.docker.hyperkit')
         end
 
         def self.docker_toolbox?
           return false unless Environment.mac? || Environment.freebsd?
           return false unless find_executable0('docker-machine')
           return @docker_toolbox if defined? @docker_toolbox
-          @docker_toolbox = system('docker info | grep -q "Operating System: Boot2Docker"')
+          @docker_toolbox = Environment.system('docker info | grep -q "Operating System: Boot2Docker"')
         end
       end
     end

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

@@ -1,15 +1,24 @@
 module DockerSync
   module Dependencies
     module Fswatch
+      UNSUPPORTED = 'Fswatch is not expected to run on platforms other then MacOS'
+
       def self.available?
-        raise 'Fswatch cannot be available for other platforms then MacOS' unless Environment.mac?
+        forbid! unless Environment.mac?
         return @available if defined? @available
         @available = find_executable0('fswatch')
       end
 
       def self.ensure!
-        raise 'Fswatch cannot be installed on other platforms then MacOS' unless Environment.mac?
-        PackageManager.install_package('fswatch') unless available?
+        return if available?
+
+        PackageManager.install_package('fswatch')
+        puts "please restart docker sync so the installation of fswatch takes effect"
+        exit(1)
+      end
+
+      def self.forbid!
+        raise UNSUPPORTED
       end
     end
   end

data/lib/docker-sync/dependencies/package_managers/base.rb

@@ -35,7 +35,7 @@ module DockerSync
         end
 
         def perform_installation
-          defined?(Bundler) ? Bundler.clean_system(install_cmd) : system(install_cmd)
+          Environment.system(install_cmd)
         end
 
         def install_cmd

data/lib/docker-sync/dependencies/unox.rb

@@ -17,7 +17,7 @@ module DockerSync
 
         return @available if defined? @available
         cmd = 'brew list unox 2>&1 > /dev/null'
-        @available = defined?(Bundler) ? Bundler.clean_system(cmd) : system(cmd)
+        @available = Environment.system(cmd)
         @available
       end
 
@@ -35,7 +35,7 @@ module DockerSync
         say_status 'warning', LEGACY_UNOX_WARNING, :yellow
         raise(FAILED_TO_REMOVE_LEGACY_UNOX) unless yes?('Uninstall legacy unison-fsmonitor (unox)? (y/N)')
         say_status 'command', uninstall_cmd, :white
-        system(uninstall_cmd)
+        Environment.system(uninstall_cmd)
       end
 
       def self.non_brew_version_installed?

data/lib/docker-sync/environment.rb

@@ -15,5 +15,9 @@ module DockerSync
     def self.freebsd?
       @freebsd ||= OS.freebsd?
     end
+
+    def self.system(cmd)
+      defined?(Bundler) ? Bundler.clean_system(cmd) : Kernel.system(cmd)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.11.pre.beta1
+  version: 0.5.11.pre.beta2
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor