vagrant-unison2 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9c0f38337bb5960bb29c8da31e978a23695887
-  data.tar.gz: 966b97b53ea314c8461d8690bcaa507dad9b6bc9
+  metadata.gz: 87a35ea31a8192ca39297beeb53277d516a58f8f
+  data.tar.gz: ca4509331a2bb649fbb959cc1619177a837e3e04
 SHA512:
-  metadata.gz: 3abcb7f645f70a8b3f006b79f10d106ef9365ebdf15c84279c787db7567d8b461293a4f37bc6305293960a62c4fc24cd064102395c039a4ebd430c5117ab86ee
-  data.tar.gz: e4e96ea90142df5d27c9d67a07d7b435a02f55d22e7e74937150d134a8c0b565c1cae94423636645dbc8a7649d78b3e0cfdeae33964e077c5d40823f9beb04b5
+  metadata.gz: 11f2dfcd7259fe59fa8a10fd71fd231e9caff772b7def9cdeb5c0376d36f4f9a7d399f943c876fa3aa1ab8b8e6d1403b93d6dea5ae80e845a50663ecae747162
+  data.tar.gz: 62a52069e8664093dd546aaac1ebe268b6f29156d97b205b1780e34b4bb9b004973a7586b14edb45192a09a16efbbc5d4aeadb6fda7784eeffd2ad48a8bad03a

data/.gitignore

@@ -16,3 +16,4 @@ Vagrantfile
 # IDEs
 .project
 .idea
+.tags*

data/README.md

@@ -23,32 +23,38 @@ to your Vagrant VM (local or on AWS).  Under the covers it uses [Unison](http://
      * Other 64-bit Linux:
         * Install package from `http://ftp5.gwdg.de/pub/linux/archlinux/extra/os/x86_64/unison-2.48.3-2-x86_64.pkg.tar.xz`. (Install at your own risk, this is a plain http link. If someone knows of a signed version, checksum, or https host let me know so I can update it).
      * On Windows, download [2.40.102](http://alan.petitepomme.net/unison/assets/Unison-2.40.102.zip), unzip, rename `Unison-2.40.102 Text.exe` to `unison.exe` and copy to somewhere in your path.
-1. Install using standard Vagrant 1.1+ plugin installation methods.
-```
-$ vagrant plugin install vagrant-unison2
-```
-1. After installing, edit your Vagrantfile and add a configuration directive similar to the below:
-```ruby
-Vagrant.configure("2") do |config|
-  config.vm.box = "dummy"
 
-  # Required configs
-  config.unison.host_folder = "src/"  #relative to the folder your Vagrantfile is in
-  config.unison.guest_folder = "src/" #relative to the vagrant home folder -> /home/vagrant
+2. Install using standard Vagrant 1.1+ plugin installation methods.
+    * `vagrant plugin install vagrant-unison2`
 
-  # Optional configs
-  # 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
-  # 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'
-  # `vagrant unison-sync-polling` command will restart unison in VM if memory usage gets above this threshold (in MB).
-  config.unison.mem_cap_mb = 500 # Default: 200
+3. Configure unison in your Vagrantfile, as shown below.
 
-end
-```
-1. Start up your starting your vagrant box as normal (eg: `vagrant up`)
+4. Start your vagrant box as normal (eg: `vagrant up`)
+
+## Configuration
+
+  ```ruby
+  Vagrant.configure("2") do |config|
+    config.vm.box = "dummy"
+
+    # Required configs
+    config.unison.host_folder = "src/"  #relative to the folder your Vagrantfile is in
+    config.unison.guest_folder = "src/" #relative to the vagrant home folder (e.g. /home/vagrant)
+
+    # Optional configs
+    # 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
+    # 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 
+    # `vagrant unison-sync-polling` command will restart unison in VM if memory
+    # usage gets above this threshold (in MB).
+    config.unison.mem_cap_mb = 500 # Default: 200
+
+  end
+  ```
 
 
 ## Start syncing Folders
@@ -105,7 +111,7 @@ Unison failed: Uncaught exception Failure("input_value: bad bigarray kind")
 ```
 
 This is caused when the unison on your host and guest were compiled with different versions of ocaml. To fix ensure that
-both are compiled with the same ocaml version. [More Info Here](https://gist.github.com/pch/aa1c9c4ec8522a11193b) 
+both are compiled with the same ocaml version. [More Info Here](https://gist.github.com/pch/aa1c9c4ec8522a11193b)
 
 ### Skipping files changed on both sides
 
@@ -119,6 +125,20 @@ sync the file. (I'm looking for a way to fix this particular error case).
 
 Running a unison-cleanup should fix this state.
 
+### Properties changed on both sides
+
+The error is:
+```
+Synchronization complete at 13:00:33  (0 item transferred, 1 skipped, 0 failed)
+  skipped:  (properties changed on both sides)
+props    <-?-> props      /
+```
+
+This can be caused by file permissions being synced. If you get this error set
+the perms arg to 0 as in the [example configuration](#configuration).
+
+See [perms documentation](http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html#perms) for more info.
+
 
 ## Development
 

data/lib/vagrant-unison2/config.rb

@@ -44,6 +44,11 @@ module VagrantPlugins
       # @return [int]
       attr_accessor :mem_cap_mb
 
+      # perms arg value
+      #
+      # @return [int]
+      attr_accessor :perms
+
       def initialize(region_specific=false)
         @host_folder   = UNSET_VALUE
         @guest_folder  = UNSET_VALUE
@@ -53,6 +58,7 @@ module VagrantPlugins
         @ssh_port      = UNSET_VALUE
         @ssh_user      = UNSET_VALUE
         @mem_cap_mb    = UNSET_VALUE
+        @perms         = UNSET_VALUE
       end
 
       def finalize!

data/lib/vagrant-unison2/shell_command.rb

@@ -31,6 +31,7 @@ module VagrantPlugins
           terse_arg,
           repeat_arg,
           ignore_arg,
+          perms_arg,
           ['-sshargs', %("#{@ssh_command.ssh_args}")],
         ].flatten.compact
         _args
@@ -44,6 +45,10 @@ module VagrantPlugins
         ['-ignore', %("#{@machine.config.unison.ignore}")] if @machine.config.unison.ignore
       end
 
+      def perms_arg
+        ['-perms', @machine.config.unison.perms] if @machine.config.unison.perms
+      end
+
       def repeat_arg
         ['-repeat', @machine.config.unison.repeat] if repeat && @machine.config.unison.repeat
       end

data/lib/vagrant-unison2/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Unison
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-unison2
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - David Laing
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen