Ensure fswatch dependency only when needed

ridiks10 · May 15, 2017 · 72dd4eb · 72dd4eb
1 parent b0a4daf
commit 72dd4eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker-sync (0.4.5.beta1)
+    docker-sync (0.4.5)
       daemons (~> 1.2, >= 1.2.3)
       docker-compose (~> 1.0, >= 1.0.2)
       dotenv (~> 2.1, >= 2.1.1)

diff --git a/lib/docker-sync/config/project_config.rb b/lib/docker-sync/config/project_config.rb
@@ -58,6 +58,11 @@ def rsync_required?
       }
     end
 
+    def fswatch_required?
+      config['syncs'].any? { |name, sync_config|
+        sync_config['watch_strategy'] == 'fswatch'
+      }
+    end
 
     private
 

diff --git a/lib/docker-sync/dependencies.rb b/lib/docker-sync/dependencies.rb
@@ -19,15 +19,9 @@ def self.ensure_all!(config)
     def self.ensure_all_for_mac!(config)
       PackageManager.ensure!
       Docker.ensure!
-
-      if config.unison_required?
-        Unison.ensure!
-      end
-
-      if config.rsync_required?
-        Rsync.ensure!
-        Fswatch.ensure!
-      end
+      Unison.ensure!  if config.unison_required?
+      Rsync.ensure!   if config.rsync_required?
+      Fswatch.ensure! if config.fswatch_required?
     end
 
     def self.ensure_all_for_linux!(_config)
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,11 @@ def rsync_required? @@
           }
         end
+        def fswatch_required?
+          config['syncs'].any? { |name, sync_config|
+            sync_config['watch_strategy'] == 'fswatch'
+          }
+        end
         private
@@ Expand Down @@