vagrant-vaimo-unison 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a719989697e0e88a4de615042660811d231c216f
-  data.tar.gz: 3b907f1f4483815e27f7969e985689e006c6f3aa
+  metadata.gz: 319e8a96dda86e57d96b6f6dbb1705074774d25b
+  data.tar.gz: 52c3960d155fed81eb047570804862511fb4c4de
 SHA512:
-  metadata.gz: f9f004ed178a759e3847aa46c5d02042c15a951ddf03a1d51d9075e506b66e656f3bf5142971fd4097361cdef80bb1acb70410b2c615a03d82405fcafe474e0e
-  data.tar.gz: 3466c2cf67c6f77e1112567e3f68205bf3fb4ff72930859ab09adfd893d9beab26d35fdee9caec68093e01b95f7d0a8b3ceedd168d9331dd4305544a0758442e
+  metadata.gz: 8193b9ae8c364c2d5800fb87e1ac9d1238a2bfa369d72fa6367c42408bd683c2cf1f027c4b051a638f253ed379f871e1d219a128d016b5928fbadadd2d89778f
+  data.tar.gz: 0ff882e69b5d70deab46614a9e0d81d18ceffbe7cedeffc4ecd7a1febac11509b0b089177ece4d51d0477e2d32f21c46e9277be4c361c1e650af1db21c26eb37

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

@@ -9,7 +9,7 @@ require_relative 'unison_sync'
 
 module VagrantPlugins
   module Unison
-    class CommandSync < Vagrant.plugin("2", :command)
+    class CommandSync < Vagrant.plugin('2', :command)
       include UnisonSync
       attr_accessor :bg_thread
 
@@ -18,16 +18,48 @@ module VagrantPlugins
       end
 
       def execute
+        sync_once
+        sync_polling
+      end
+
+      def sync_once
+        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 'Started main sync process'
+            if options[:verbose]
+              @env.ui.info '  Verbose mode: enabled'
+              @env.ui.info "  Command: #{command}"
+            end
+
+            status = system(command)
+            @env.ui.info 'unison exited with a error' unless status
+          end
+        end
+        return 0 if status
+
+        1
+      end
+
+      def sync_polling
         status = nil
         with_target_vms do |machine|
           @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
 
-            @env.ui.info "Running #{command}"
+            @env.ui.info 'Polling process started'
+            if options[:verbose]
+              @env.ui.info '  Verbose mode: enabled'
+              @env.ui.info "  Memory limit: #{machine.config.unison.mem_cap_mb}MB"
+              @env.ui.info "  Command: #{command}" if options[:verbose]
+            end
 
             # Re-run on a crash.
             # On a sigint, wait 2 seconds before respawning command.
@@ -54,9 +86,7 @@ module VagrantPlugins
             end
           end
         end
-        if status
-          return 0
-        end
+        return 0 if status
 
         1
       end
@@ -66,18 +96,18 @@ module VagrantPlugins
         Thread.new(ssh_command.ssh, machine.config.unison.mem_cap_mb) do |ssh_command_text, mem_cap_mb|
           while true
             sleep 15
-            total_mem              = `#{ssh_command_text} 'free -m | egrep "^Mem:" | awk "{print \\$2}"' 2>/dev/null`
-            _unison_proc_returnval = (
-            `#{ssh_command_text} 'ps aux | grep "[u]nison -server" | awk "{print \\$2, \\$4}"' 2>/dev/null`
-            )
-            if _unison_proc_returnval == ''
+            total_mem             = `#{ssh_command_text} 'free -m | egrep "^Mem:" | awk "{print \\$2}"' 2>/dev/null`
+            unison_proc_returnval = `#{ssh_command_text} 'ps aux | grep "[u]nison -server" | awk "{print \\$2, \\$4}"' 2>/dev/null`
+
+            if unison_proc_returnval == ''
               puts 'Unison not running in VM'
               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)
-            # Debugging: uncomment to log every loop tick
-            # puts "Unison running as #{pid} using #{mem_unison} mb"
+
+            pid, mem_pct_unison = unison_proc_returnval.strip.split(' ')
+            mem_unison          = (total_mem.to_f * mem_pct_unison.to_f / 100)
+            mem_unison          = mem_unison.round(1)
+
             if mem_unison > mem_cap_mb
               puts "Unison using #{mem_unison}MB memory is over limit of #{mem_cap_mb}MB, restarting"
               `#{ssh_command_text} kill -HUP #{pid} 2>/dev/null`
@@ -91,20 +121,20 @@ module VagrantPlugins
       include UnisonSync
 
       def self.synopsis
-        'sync the unison shared folder once'
+        'sync the unison shared folder once (deprecated)'
       end
 
       def execute
-        @env.ui.info 'The command is deprecated, use vagrant unison-sync'
+        @env.ui.info 'The command is deprecated, use vagrant unison-sync --no-polling'
       end
     end
 
-    class CommandPolling < Vagrant.plugin("2", :command)
+    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'
+        'sync the unison shared folder forever, by polling for changes (deprecated)'
       end
 
       def execute

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

@@ -14,11 +14,14 @@ module VagrantPlugins
         guest_path = unison_paths.guest
         host_path  = unison_paths.host
 
-        @env.ui.info "Unisoning changes from {host}::#{host_path} --> {guest VM}::#{guest_path}"
+        ssh_user = machine.config.unison.ssh_user
+
+        @env.ui.info "Sync changes from {host}::#{host_path}"
+        @env.ui.info "   --> {guest VM}::#{guest_path}"
 
         # Create the guest path
         machine.communicate.sudo("mkdir -p '#{guest_path}'")
-        machine.communicate.sudo("chown #{machine.config.unison.ssh_user} '#{guest_path}'")
+        machine.communicate.sudo("chown #{ssh_user} '#{guest_path}'")
 
         ssh_command   = SshCommand.new(machine)
         shell_command = ShellCommand.new(machine, unison_paths, ssh_command)
@@ -52,12 +55,13 @@ module VagrantPlugins
 
       def options
         @options ||= {
-          :prefer_local  => false,
-          :prefer_remote => false,
-          :force_local   => false,
-          :force_remote  => false,
-          :verbose       => false,
-          :project       => nil,
+            :prefer_local  => false,
+            :prefer_remote => false,
+            :force_local   => false,
+            :force_remote  => false,
+            :verbose       => false,
+            :project       => nil,
+            :no_polling    => false
         }
       end
 
@@ -65,6 +69,10 @@ module VagrantPlugins
         @option_parser ||= OptionParser.new do |o|
           o.banner = "Usage: vagrant #{ARGV[0]} [options]"
 
+          # o.on('--no-polling', 'trigger sync without starting the polling process') do |flag|
+          #    options[:no_polling] = flag
+          # end
+
           o.on('--push', 'prefer changes on the local machine.') do |flag|
             options[:prefer_local] = flag
             check_conflicting_options!
@@ -85,12 +93,12 @@ module VagrantPlugins
             check_conflicting_options!
           end
 
-          o.on('--verbose', 'Print additional debug information') do |flag|
+          o.on('--verbose', 'print additional debug information') do |flag|
             options[:verbose] = flag
           end
 
-          o.on('-p', '--project=project', 'Project') do |project|
-            options[:project] = project;
+          o.on('-p', '--project=project', 'project folder to sync') do |project|
+            options[:project] = project
           end
         end
       end
@@ -99,6 +107,7 @@ module VagrantPlugins
         enabled = [:prefer_local, :prefer_remote, :force_local, :force_remote].select do |opt|
           options[opt]
         end
+
         raise ArgumentError.new("Conflicting options: #{enabled.inspect}") if enabled.length > 1
       end
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vaimo-unison
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - David Laing
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to sync local files to VM over SSH using Unison