vagrant-unison-morroni 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a1e3610b031aeb5831e9c317d33d9a1043118f
-  data.tar.gz: 47dafdfc4653ef9ad3cfdc1b960e084663f9c7d8
+  metadata.gz: 3fa98d4ec7213165ae90b15dfd5801c050159dea
+  data.tar.gz: 6b62c1b805e8fa92754ecf2a3e76a4e37676ae1c
 SHA512:
-  metadata.gz: bf0d8490596d157fd23c1018cdee4b9fbdf2278e35beeb5e352a7ab90f4379da94f27b4cbb4a6cb01c5c8bbe794e3d592e65548f24f11bfc1c987cdfc261c956
-  data.tar.gz: 73e0a8fc3d0b4f9c492a07f6cd8ef69d549711c729ffacb01a5b841f70076d860e4c6e0ab4a16849979023fb51c59253aba92ff92b2971fd918b3d45f9d3949b
+  metadata.gz: 248b4519e756a3be0772bc82d245ea19a9d0297cc2fdcea0d2f159064b0bebbb8a21f503a5a04d073d1d22d79986922a5b67474c143fc8e62a94cd8c007de57b
+  data.tar.gz: a8ca22bba75fc058918c2e134a1ba88796c0a4da7bcd437ce3909d69e5cc85d54311e8a15b6313881f109c00307d8870d72992956a095272e9e4bc4ada220e46

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

@@ -105,9 +105,22 @@ module VagrantPlugins
             ssh_command = SshCommand.new(@@machine, unison_paths)
             command = ShellCommand.new(@@machine, unison_paths, ssh_command)
 
+=begin
+            #load @@machine.env.root_path.to_s + '/include-common/load-ini/load-ini.rb'
+            load ENV['host_proj_dir'] + '/include-common/load-ini/load-ini.rb'
+
+            properties = load_ini()
+            if (properties.has_key?('UNISONFLAGS'))
+              unisonflags = ' '+properties['UNISONFLAGS']+' '
+            else
+              unisonflags = ''
+            end
+=end
+            unisonflags = ' -ignorearchives '
+            
             command.repeat = true
             command.terse = true
-            command = command.to_s + ' -ignorearchives > ' + @@machine.env.root_path.to_s + '/.vagrant/unison.log  2>&1 &'
+            command = command.to_s + unisonflags + ' > ' + @@machine.env.root_path.to_s + '/.vagrant/unison.log  2>&1 &'
 
             @@machine.env.ui.info "Running #{command}"
 

data/lib/vagrant-unison-morroni/plugin.rb~

@@ -0,0 +1,161 @@
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The vagrant-unison plugin must be run within Vagrant."
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < "1.1.0"
+  raise "The vagrant-unison plugin is only compatible with Vagrant 1.1+"
+end
+
+module VagrantPlugins
+  module Unison
+    class Plugin < Vagrant.plugin("2")
+      name "Unison"
+      description <<-DESC
+      This plugin syncs files over SSH from a local folder
+      to your Vagrant VM (local or on AWS). 
+      DESC
+
+      config "sync" do
+        require_relative "config"
+        Config
+      end
+
+      command "sync" do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        #Return the command
+        require_relative "command"
+        Command
+      end
+
+      command "sync-repeat" do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        #Return the command
+        require_relative "command"
+        CommandRepeat
+      end
+
+      command "sync-cleanup" do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        #Return the command
+        require_relative "command"
+        CommandCleanup
+      end
+
+      command "sync-interact" do
+        # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        #Return the command
+        require_relative "command"
+        CommandInteract
+      end
+
+      provisioner "start-unison" do
+        require "log4r"
+        require "vagrant"
+        require "thread"
+        require 'listen'
+
+        require_relative 'unison_paths'
+        require_relative 'ssh_command'
+        require_relative 'shell_command'
+        require_relative 'unison_sync'
+        class StartUnisonProvisioner < Vagrant.plugin("2", :provisioner)
+
+          def initialize(machine, config)
+            @@machine = machine
+            super
+          end
+
+          def configure(root_config)
+          end
+
+          def provision
+            
+            unison_paths = UnisonPaths.new(@@machine.env, @@machine)
+            guest_path = unison_paths.guest
+            host_path = unison_paths.host
+
+            user_name = @@machine.ssh_info[:username]
+
+            @@machine.ui.info(host_path)
+            @@machine.ui.info(guest_path)
+            
+
+            @@machine.env.ui.info "Unisoning changes from {host}::#{host_path} --> {guest VM}::#{guest_path}"
+
+            # Create the guest path
+            @@machine.communicate.sudo("mkdir -p '#{guest_path}'")
+            @@machine.communicate.sudo("chown #{user_name} '#{guest_path}'")
+
+            ssh_command = SshCommand.new(@@machine, unison_paths)
+            command = ShellCommand.new(@@machine, unison_paths, ssh_command)
+
+            command.repeat = true
+            command.terse = true
+            command = command.to_s + ' -ignorearchives > ' + @@machine.env.root_path.to_s + '/.vagrant/unison.log  2>&1 &'
+
+            @@machine.env.ui.info "Running #{command}"
+
+            system(command)
+
+          end
+          
+          def cleanup
+          end
+
+        end
+        StartUnisonProvisioner
+      end
+
+      # This initializes the internationalization strings.
+      def self.setup_i18n
+        I18n.load_path << File.expand_path("locales/en.yml", Unison.source_root)
+        I18n.reload!
+      end
+
+      # This sets up our log level to be whatever VAGRANT_LOG is.
+      def self.setup_logging
+        require "log4r"
+
+        level = nil
+        begin
+          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
+        rescue NameError
+          # This means that the logging constant wasn't found,
+          # which is fine. We just keep `level` as `nil`. But
+          # we tell the user.
+          level = nil
+        end
+
+        # Some constants, such as "true" resolve to booleans, so the
+        # above error checking doesn't catch it. This will check to make
+        # sure that the log level is an integer, as Log4r requires.
+        level = nil if !level.is_a?(Integer)
+
+        # Set the logging level on all "vagrant" namespaced
+        # logs as long as we have a valid level.
+        if level
+          logger = Log4r::Logger.new("vagrant_sync")
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Unison
-    VERSION = "0.0.19"
+    VERSION = "0.0.20"
   end
 end

data/lib/vagrant-unison-morroni/version.rb~

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Unison
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-unison-morroni
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - David Laing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -111,6 +111,7 @@ files:
 - lib/vagrant-unison-morroni/config.rb
 - lib/vagrant-unison-morroni/errors.rb
 - lib/vagrant-unison-morroni/plugin.rb
+- lib/vagrant-unison-morroni/plugin.rb~
 - lib/vagrant-unison-morroni/shell_command.rb
 - lib/vagrant-unison-morroni/ssh_command.rb
 - lib/vagrant-unison-morroni/unison_paths.rb