vagrant-sshfs 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c91c4d0b5c14a9aa152ee7aeb65858d5bac9d84b
-  data.tar.gz: edc3eb21abb620de264de82c30c0027b7f4aa8f1
+  metadata.gz: 40c211084d6df40b60293757b4dcc3775534d680
+  data.tar.gz: 512170ebed792cdfaa5874d8b00bd0c36e418b0f
 SHA512:
-  metadata.gz: 985d4973184f6c796efc6e6cd2ee4dfa2bac5f37f1f4eaa2fac3afa990d2f79ac10df299500f2b3f893ff65b1e4a6dcda362139407a2f2d2558d233142ac9ae6
-  data.tar.gz: 536cd4c49ccae0b37fdc2875e39bf884e246101b519b2c0481868fd876accf611c937d5dbab0a1cefd26e6e537249adba1b75bff83f907e60734c78a879ea74a
+  metadata.gz: 60fb794de0eb03d139ab3c6369809b186640c02c0067f36087fe844f4cfff9ebcfc6ab5a8ef3960eba9567c1956ff2fcf5d2f1bb5454034628c40b4d33b1fb87
+  data.tar.gz: 6b180c7cc99ae728491220c39eb4ac7ae91eabff27ae6d05c1fb3ca95633989340393d9b53f425636ddd426292c3e20abca9b9e490f5a86926f95823c77632b9

data/.gitignore

@@ -2,3 +2,4 @@
 mountpoint
 .vagrant
 *.gem
+.idea

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## vagrant-sshfs 0.0.8 (Jun 2, 2015) ##
+
+* Fixed unicode character issue
+
+    *seasick*
+
+## vagrant-sshfs 0.0.7 (Dec 8, 2014) ##
+
+*   Smooth folders creation.
+*   Unmount on machine Destroy/Halt/Suspend
+*   Remount on machine Resume/Provision/Suspend
+
+    *dmatora*
+
 ## vagrant-sshfs 0.0.6 (Oct 14, 2014) ##
 
 *   Avoids StrictHostKeyChecking by default.

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-sshfs (0.0.5)
+    vagrant-sshfs (0.0.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -26,6 +26,14 @@ The plugin is enabled by default, so it will run everytime the machine starts. I
 
 `config.sshfs.enabled = false`
 
+The plugin creates missing folder by default, if you want to be prompted, you can disable it with the following configuration:
+
+`config.sshfs.prompt_create_folders = false`
+
+The plugin is creating folders using sudo by default, In case that is not desired, you can disable that with the following configuration:
+
+`config.sshfs.sudo = false`
+
 To manually run it, you can use the `sshfs` command. Please check `vagrant -h`.
 
 ## Issues

data/lib/vagrant-sshfs/actions.rb

@@ -5,15 +5,11 @@ require 'vagrant-sshfs/builders/guest'
 module Vagrant
   module SshFS
     module Actions
-      class Up
+      class Base
         def initialize(app, env)
           @machine = env[:machine]
         end
 
-        def call(env)
-          get_builder(env).mount! if @machine.config.sshfs.enabled
-        end
-
         private
 
         def get_builder(env)
@@ -25,7 +21,23 @@ module Vagrant
         end
       end
 
+      class Up < Base
+        def call(env)
+          get_builder(env).mount! if @machine.config.sshfs.enabled
+        end
+      end
+
+      class Destroy < Base
+        def call(env)
+          get_builder(env).unmount! if @machine.config.sshfs.enabled
+        end
+      end
+
       class Reload < Up; end
+      class Provision < Up; end
+      class Suspend < Destroy; end
+      class Resume < Up; end
+      class Halt < Destroy; end
     end
   end
 end

data/lib/vagrant-sshfs/builders/base.rb

@@ -9,14 +9,21 @@ module Vagrant
         end
 
         def mount!
+          unmount!
+
           paths.each do |src, target|
-            info("unmounting", src: target)
-            unmount(target)
             info("mounting", src: src, target: target)
             mount(src, target)
           end
         end
 
+        def unmount!
+          paths.each do |src, target|
+            info("unmounting", src: target)
+            unmount(target)
+          end
+        end
+
         def mount
           raise NotImplementedError
         end

data/lib/vagrant-sshfs/builders/host.rb

@@ -8,7 +8,8 @@ module Vagrant
 
         def unmount(target)
           if `which fusermount`.empty?
-            `umount #{target}`
+            `killall -9 sshfs 2>/dev/null`
+            `umount -f #{target}`
           else
             `fusermount -u -q #{target}`
           end
@@ -50,8 +51,12 @@ module Vagrant
 
         def check_src!(src)
           unless machine.communicate.test("test -d #{src}")
-            if ask("create_src", src: src) == "y"
-              machine.communicate.execute("mkdir -p #{src}")
+            if machine.config.sshfs.prompt_create_folders == false || ask("create_src", src: src) == "y"
+              if machine.config.sshfs.sudo
+                machine.communicate.execute("sudo su -c 'mkdir -p #{src}'")
+              else
+                machine.communicate.execute("mkdir -p #{src}")
+              end
               info("created_src", src: src)
             else
               error("not_created_src", src: src)
@@ -68,7 +73,7 @@ module Vagrant
           if File.exist?(folder) && Dir.entries(folder).size > 2
             error("non_empty_target", target: folder)
           elsif !File.exist?(folder)
-            if ask("create_target", target: folder) == "y"
+            if machine.config.sshfs.prompt_create_folders == false || ask("create_target", target: folder) == "y"
               FileUtils.mkdir_p(folder)
               info("created_target", target: folder)
             else

data/lib/vagrant-sshfs/config.rb

@@ -4,6 +4,8 @@ module Vagrant
       attr_accessor :paths
       attr_accessor :username
       attr_accessor :enabled
+      attr_accessor :prompt_create_folders
+      attr_accessor :sudo
       attr_accessor :mount_on_guest
       attr_accessor :host_addr
 
@@ -11,6 +13,8 @@ module Vagrant
         @paths = {}
         @username = nil
         @enabled = true
+        @prompt_create_folders = false
+        @sudo = true
       end
 
       def merge(other)

data/lib/vagrant-sshfs/plugin.rb

@@ -17,6 +17,26 @@ module Vagrant
         hook.append(Vagrant::SshFS::Actions::Reload)
       end
 
+      action_hook(:sshfs, :machine_action_provision) do |hook|
+        hook.append(Vagrant::SshFS::Actions::Provision)
+      end
+
+      action_hook(:sshfs, :machine_action_suspend) do |hook|
+        hook.append(Vagrant::SshFS::Actions::Suspend)
+      end
+
+      action_hook(:sshfs, :machine_action_resume) do |hook|
+        hook.append(Vagrant::SshFS::Actions::Resume)
+      end
+
+      action_hook(:sshfs, :machine_action_halt) do |hook|
+        hook.append(Vagrant::SshFS::Actions::Halt)
+      end
+
+      action_hook(:sshfs, :machine_action_destroy) do |hook|
+        hook.append(Vagrant::SshFS::Actions::Destroy)
+      end
+
       command "sshfs" do
         Vagrant::SshFS::Command
       end

data/lib/vagrant-sshfs/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module SshFS
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

data/locales/en.yml

@@ -9,8 +9,8 @@ en:
           created_src: "Created src `%{src}`"
           created_target: "Created target `%{target}`"
         ask:
-          create_src: "Source folder `%{src}` does not exist, create?"
-          create_target: "Target folder `%{target}` does not exist, create?"
+          create_src: "Source folder `%{src}` does not exist, create? (y/n)"
+          create_target: "Target folder `%{target}` does not exist, create? (y/n)"
           pass: "Password for `%{user}`:"
         error:
           base: "vagrant-sshfs failed and couldn't proceed"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - fabiokr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that mounts folders with sshfs in the host machine.