vagrant-vaimo-unison 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7722d3d705a217a1a3cb2840bed3216d04d6839a
-  data.tar.gz: 19bbf9feb84fa5c03d8b6b29f0900a8180aa49a0
+  metadata.gz: a719989697e0e88a4de615042660811d231c216f
+  data.tar.gz: 3b907f1f4483815e27f7969e985689e006c6f3aa
 SHA512:
-  metadata.gz: 097c54aa51cfaeecf7ea5c5b5f39563a5e52c838d43865b786a55f8c71e692947c6471af4acca8ebde346ccaeba443da611ff6f86ef3ec649bf35b0dbc8966b4
-  data.tar.gz: 80a3280cbb3bc78287886eefdcad1489613ca24d119dcf3a5157102e8e9f73c2baac3957bc338860db2708fa8bf1e40efe1c72d38998db743e907e0aab936730
+  metadata.gz: f9f004ed178a759e3847aa46c5d02042c15a951ddf03a1d51d9075e506b66e656f3bf5142971fd4097361cdef80bb1acb70410b2c615a03d82405fcafe474e0e
+  data.tar.gz: 3466c2cf67c6f77e1112567e3f68205bf3fb4ff72930859ab09adfd893d9beab26d35fdee9caec68093e01b95f7d0a8b3ceedd168d9331dd4305544a0758442e

data/README.md

@@ -3,7 +3,7 @@
 This is a [Vagrant](http://www.vagrantup.com) 1.7+ plugin that syncs files over SSH from a local folder
 to your Vagrant VM (local or on AWS).  Under the covers it uses [Unison](http://www.cis.upenn.edu/~bcpierce/unison/)
 
-**NOTE:** This plugin requires Vagrant 1.7+,
+**NOTE:** This plugin requires Vagrant 1.9+,
 
 ## Features
 
@@ -45,11 +45,14 @@ to your Vagrant VM (local or on AWS).  Under the covers it uses [Unison](http://
     # File patterns to ignore when syncing. Ensure you don't have spaces between the commas!
     config.unison.ignore = "Name {.DS_Store,.git,node_modules}" # Default: none
 
+    # File patterns to not ignore when syncing. Ensure you don't have spaces between the commas!
+    config.unison.ignorenot = "Name {.htaccess}" # Default: none
+
     # SSH connection details for Vagrant to communicate with VM.
     config.unison.ssh_host = "10.0.0.1" # Default: '127.0.0.1'
     config.unison.ssh_port = 22 # Default: 2222
     config.unison.ssh_user = "deploy" # Default: 'vagrant'
-    config.unison.perms = 0 # if you get "properties changed on both sides" error 
+    config.unison.perms = 0 # if you get "properties changed on both sides" error
 
     # `vagrant unison-sync-polling` command will restart unison in VM if memory
     # usage gets above this threshold (in MB).
@@ -60,20 +63,9 @@ to your Vagrant VM (local or on AWS).  Under the covers it uses [Unison](http://
   end
   ```
 
+## Start syncing/watching Folders
 
-## Start syncing Folders
-
-Run `vagrant unison-sync-once` to run a single, non-interactive sync and then exit.
-
-Run `vagrant unison-sync-polling` to start in bidirect monitor (repeat) mode - every second unison checks for changes on either side and syncs them.
-
-## (Legacy) Sync using OSX inotify events
-
-Run `vagrant unison-sync` to sync then start watching the local_folder for changes, and syncing these to your vagrang VM.
-
-This uses the `watch` ruby gem and runs a one-off unison sync when it gets change events.
-
-For some reason, this does not always get all the events immediately which can be frustrating. Since the polling mode (unison repeat mode) is not too resource intensive, I recommend that instead.
+Run `vagrant unison-sync` to run polling (will sync files from host to guest if changes are made)
 
 ## Sync in interactive mode
 
@@ -86,7 +78,7 @@ This is a useful tool when the automatic sync sees a change in a file on both
 sides and skips it.
 
 ## Cleanup unison database
-Run `vagrant unison-cleanup` to clear the unison metadata from `~/Library/Application Support/Unison/` as well as all files.
+Run `vagrant unison-cleanup` to clear the unison metadata from `~/Library/Application Support/Unison/`.
 
 ## Error states
 

data/lib/vagrant-vaimo-unison/command.rb

@@ -9,37 +9,7 @@ require_relative 'unison_sync'
 
 module VagrantPlugins
   module Unison
-    class CommandOnce < Vagrant.plugin('2', :command)
-      include UnisonSync
-
-      def self.synopsis
-        'sync the unison shared folder once'
-      end
-
-      def execute
-        status = nil
-        with_target_vms do |machine|
-          execute_sync_command(machine) do |command|
-            command.batch = true
-            command.terse = true
-            command       = command.to_s
-
-            @env.ui.info 'Running unison once'
-            @env.ui.info "    #{command}"
-
-            status = system(command)
-            @env.ui.info "**** unison exited. success: #{status} ****"
-          end
-        end
-        if status
-          return 0
-        end
-
-        1
-      end
-    end
-
-    class CommandPolling < Vagrant.plugin("2", :command)
+    class CommandSync < Vagrant.plugin("2", :command)
       include UnisonSync
       attr_accessor :bg_thread
 
@@ -53,6 +23,7 @@ module VagrantPlugins
           @bg_thread = watch_vm_for_memory_leak(machine)
           execute_sync_command(machine) do |command|
             command.repeat = true
+            command.batch  = true
             command.terse  = true
             command        = command.to_s
 
@@ -104,7 +75,7 @@ module VagrantPlugins
               next
             end
             pid, mem_pct_unison = _unison_proc_returnval.strip.split(' ')
-            mem_unison          = (total_mem.to_f * mem_pct_unison.to_f/100).round(1)
+            mem_unison          = (total_mem.to_f * mem_pct_unison.to_f / 100).round(1)
             # Debugging: uncomment to log every loop tick
             # puts "Unison running as #{pid} using #{mem_unison} mb"
             if mem_unison > mem_cap_mb
@@ -116,23 +87,42 @@ module VagrantPlugins
       end
     end
 
+    class CommandOnce < Vagrant.plugin('2', :command)
+      include UnisonSync
+
+      def self.synopsis
+        'sync the unison shared folder once'
+      end
+
+      def execute
+        @env.ui.info 'The command is deprecated, use vagrant unison-sync'
+      end
+    end
+
+    class CommandPolling < Vagrant.plugin("2", :command)
+      include UnisonSync
+      attr_accessor :bg_thread
+
+      def self.synopsis
+        'sync the unison shared folder forever, by polling for changes'
+      end
+
+      def execute
+        @env.ui.info 'The command is deprecated, use vagrant unison-sync'
+      end
+    end
+
     class CommandCleanup < Vagrant.plugin('2', :command)
       def self.synopsis
-        'remove all unison supporting state on local and remote system'
+        'Remove archives and configuration from host and guest. Keeps files in guest (need to remove manually if needed)'
       end
 
       def execute
         with_target_vms do |machine|
-          guest_path = UnisonPaths.new(@env, machine).guest
-
           command = "rm -rf ~/Library/'Application Support'/Unison/*"
           @env.ui.info "Running #{command} on host"
           system(command)
 
-          command = "rm -rf #{guest_path}/* #{guest_path}/..?* #{guest_path}/.[!.]*"
-          @env.ui.info "Running #{command} on guest VM (delete all files from directory including hidden ones)"
-          machine.communicate.sudo(command)
-
           command = 'rm -rf ~/.unison'
           @env.ui.info "Running #{command} on guest VM"
           machine.communicate.execute(command)

data/lib/vagrant-vaimo-unison/plugin.rb

@@ -24,6 +24,15 @@ module VagrantPlugins
         Config
       end
 
+      command 'unison-sync' do
+        setup_logging
+        setup_i18n
+
+        #Return the command
+        require_relative 'command'
+        CommandSync
+      end
+
       command 'unison-sync-once' do
         setup_logging
         setup_i18n

data/lib/vagrant-vaimo-unison/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Unison
-    VERSION = '0.2.0'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vaimo-unison
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Laing
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake