vagrant-unison 0.0.8 → 0.0.9

data/lib/vagrant-unison/command.rb

@@ -1,8 +1,6 @@
 require "log4r"
 require "vagrant"
 require 'listen'
-require 'net/ssh'
-require 'net/scp'
 
 module VagrantPlugins
   module Unison
@@ -12,52 +10,18 @@ module VagrantPlugins
         
         with_target_vms do |machine|
           hostpath, guestpath = init_paths machine
-          
-          ssh_info = machine.ssh_info
-          
-          # Create empty guestpath
-          machine.communicate.sudo("rm -rf '#{guestpath}'")
-          machine.communicate.sudo("mkdir -p '#{guestpath}'")
-          machine.communicate.sudo("chown #{ssh_info[:username]} '#{guestpath}'")
 
-          Net::SCP.start(ssh_info[:host], ssh_info[:username], 
-                        { :port => ssh_info[:port], 
-                          :keys => [ ssh_info[:private_key_path] ],
-                          :paranoid => false }) do |scp|
+          trigger_unison_sync machine
 
-            #copy up everything at the beginning
-            @env.ui.info "Uploading {host}::#{hostpath} to {guest}::#{guestpath}"
-            Dir.glob("#{hostpath}**/*", File::FNM_DOTMATCH).each do |file|
-              remote_file = file.gsub(hostpath, guestpath)
-              if File.stat(file).file?  
-                scp.upload!( file, remote_file ) do |ch, name, sent, total|
-                  @env.ui.info "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
-                end
-              end
-              if File.directory?(file)
-                machine.communicate.sudo("mkdir -p '#{remote_file}'")
-                machine.communicate.sudo("chown #{ssh_info[:username]} '#{remote_file}'")
-              end
-            end
-
-            @env.ui.info "Watching {host}::#{hostpath} for changes..."
-
-            Listen.to(hostpath) do |modified, added, removed|
-              (modified << added).flatten.each do |file|
-                remote_file = file.gsub(hostpath, guestpath)
-                @env.ui.info "Uploading {host}::#{file} to {guest VM}::#{remote_file}"
-                scp.upload!( file, remote_file ) do |ch, name, sent, total|
-                  @env.ui.info "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
-                end
-              end
-              removed.each do |file|
-                remote_file = file.gsub(hostpath, guestpath)
-                @env.ui.info "Deleting {guest VM}::#{remote_file}"
-                machine.communicate.sudo("rm #{remote_file}")
-              end
-            end # Listen
-          end # Net::SCP.start
+          @env.ui.info "Watching #{hostpath} for changes..."
 
+          Listen.to(hostpath) do |modified, added, removed|
+            @env.ui.info "Detected modifications to #{modified.inspect}" unless modified.empty?
+            @env.ui.info "Detected new files #{added.inspect}" unless added.empty?
+            @env.ui.info "Detected deleted files #{removed.inspect}" unless removed.empty?
+            
+            trigger_unison_sync machine
+          end
         end
 
         0  #all is well
@@ -67,12 +31,42 @@ module VagrantPlugins
           hostpath  = File.expand_path(machine.config.sync.host_folder, @env.root_path)
           guestpath = machine.config.sync.guest_folder
 
-          # Make sure there is a trailing slash both paths
+          # Make sure there is a trailing slash on the host path to
+          # avoid creating an additional directory with rsync
           hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-          guestpath = "#{guestpath}/" if guestpath !~ /\/$/
 
           [hostpath, guestpath]
       end
+
+      def trigger_unison_sync(machine)
+        hostpath, guestpath = init_paths machine
+
+        @env.ui.info "Unisoning changes from {host}::#{hostpath} --> {guest VM}::#{guestpath}"
+
+        ssh_info = machine.ssh_info
+
+        # Create the guest path
+        machine.communicate.sudo("mkdir -p '#{guestpath}'")
+        machine.communicate.sudo("chown #{ssh_info[:username]} '#{guestpath}'")
+
+        # Unison over to the guest path using the SSH info
+        command = [
+          "unison", "-batch",
+          "-ignore=Name {.git*,.vagrant/,*.DS_Store}",
+          "-sshargs", "-p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i #{ssh_info[:private_key_path]}",
+          hostpath,
+          "ssh://#{ssh_info[:username]}@#{ssh_info[:host]}/#{guestpath}"
+         ]
+
+        r = Vagrant::Util::Subprocess.execute(*command)
+        if r.exit_code != 0
+          raise Vagrant::Errors::UnisonError,
+            :command => command.inspect,
+            :guestpath => guestpath,
+            :hostpath => hostpath,
+            :stderr => r.stderr
+        end
+      end
      
     end
   end

data/lib/vagrant-unison/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Unison
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/vagrant-unison.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "listen", "~> 0.7.3"
   s.add_runtime_dependency "rb-fsevent", "~> 0.9"
-  s.add_runtime_dependency "net-scp", "~> 1.1.0"  
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec-core", "~> 2.12.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-unison
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3608198865268606227
+      hash: -2151286611180644825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: