vagrant-sshfs 0.0.4 → 0.0.5.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e635dbf5bc509348d441188e6999f0c3f2112d2
-  data.tar.gz: 390602f96bed49a4745c22f96e17550086c1cb20
+  metadata.gz: 8ecfea9cb249194e1e907464e021f17a49e5a876
+  data.tar.gz: ca924db4c82d1223c6ecd6caa93f8703d1001227
 SHA512:
-  metadata.gz: b0e4854d3fb65f849a4e61aad7f1baa680fe7db6b3c6fc904fe23658e6571b3f7674bea843cf140473a0707959bad5fd7cdb490ac23a56193b0e414b3afd94ac
-  data.tar.gz: bbce98be457d3b52513f86cfe8722dc3a73867b50f384a5fdb061417aff26a08a4ffa527aa46261999ef08b4006166a136a25bb1c018118ea8edcdc398428d57
+  metadata.gz: 1e10705226d1af4aab7033e44ccad80a12d0f09abe33aadea1ddbef0001ac3705f50856f48064e5b0ba4d789cbaef3a63304c0fe380603463c29d6125e360898
+  data.tar.gz: 16379fff339b38c6770f145db15919411d16f5fd4ee17cf0e444a33f035979ce7007130acd2b2e470e9b2839cdcc7c986010b0fc69c54cfab36a370f494d4223

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## vagrant-sshfs 0.0.5 ##
+
+*   Allows to disable the plugin to run on demand.
+
+    *Stéphane Klein*
+
+*   Allows to mount a host folder on the guest machine
+
+    *Adrian Olek*
+
 ## vagrant-sshfs 0.0.4 (March 5, 2014) ##
 
 *   Allows to set a custom ssh username.

data/Gemfile.lock

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

data/README.md

@@ -22,6 +22,34 @@ By default it will use the Vagrant ssh username. You can change that with the fo
 
 `config.sshfs.username = "theusername"`
 
+The plugin is enabled by default, so it will run everytime the machine starts. In case that is not desired, you can disabled that with the following configuration:
+
+`config.sshfs.enabled = false`
+
+## Issues
+
+### Connection reset by peer
+
+In case you are getting "Connection reset by peer" errors, it might be the case that you already have a host configuration under your `~/.ssh/know_hosts` for the given ip, and you are using the same ip with a different machine. If that is the case, you can set a `StrictHostKeyChecking no` under that ip to skip the check:
+
+```
+Host 127.0.0.1
+StrictHostKeyChecking no
+```
+
+### Mounting on guest (box)
+
+You need to have `sshfs` installed on guest machine and ssh server on host.
+
+To mount a host folder on guest machine add a configuration like this:
+
+    config.sshfs.mount_on_guest = true
+    config.sshfs.paths = { "src" => "mountpoint" }
+    config.sshfs.host_addr = '10.0.2.2'
+
+`src` is the source absolute path to the folder in the host machine, `mountpoint` is the folder in the guest. `src` can be an absolute path, or relative to the `Vagrantfile`.
+`host_addr` is the host machine IP accessible from guest.
+
 ## Contributing
 
 If you have issues or ideas, please contribute! You can create an issue throught Github, or send a Pull Request.

data/Vagrantfile

@@ -2,6 +2,7 @@ Vagrant.require_plugin "vagrant-sshfs"
 
 Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
   config.sshfs.paths = { "/home/vagrant/src" => "mountpoint" }
 end

data/lib/vagrant-sshfs/actions.rb

@@ -11,16 +11,47 @@ module Vagrant
         def mount!
           paths.each do |src, target|
             info("mounting", src: src, target: target)
-            `sshfs -p #{port} #{username}@#{host}:#{check_src!(src)} #{check_target!(target)} -o IdentityFile=#{private_key}`
+            mount(src, target)
           end
         end
 
-        private
+        def mount
+          raise NotImplementedError
+        end
 
         def paths
           machine.config.sshfs.paths
         end
 
+        def machine
+          @env[:machine]
+        end
+
+        def info(key, *args)
+          @env[:ui].info(i18n("info.#{key}", *args))
+        end
+
+        def ask(key, *args)
+          @env[:ui].ask(i18n("ask.#{key}", *args), :new_line => true)
+        end
+
+        def error(key, *args)
+          @env[:ui].error(i18n("error.#{key}", *args))
+          raise Error, :base
+        end
+
+        def i18n(key, *args)
+          I18n.t("vagrant.config.sshfs.#{key}", *args)
+        end
+      end
+
+      class HostBuilder < Builder
+        private
+
+        def mount(src, target)
+          `sshfs -p #{port} #{username}@#{host}:#{check_src!(src)} #{check_target!(target)} -o IdentityFile=#{private_key}`
+        end
+
         def ssh_info
           machine.ssh_info
         end
@@ -75,26 +106,33 @@ module Vagrant
         def target_folder(target)
           File.expand_path(target)
         end
+      end
 
-        def machine
-          @env[:machine]
-        end
+      class GuestBuilder < Builder
+        private
 
-        def info(key, *args)
-          @env[:ui].info(i18n("info.#{key}", *args))
+        def mount(src, target)
+          source = File.expand_path(src)
+
+          status = machine.communicate.execute(
+            "echo \"#{password}\" | sshfs -o allow_other -o password_stdin #{username}@#{host}:#{source} #{target}",
+            :sudo => true, :error_check => false)
+
+          if status != 0
+            error('not_mounted', src: source, target: target)
+          end
         end
 
-        def ask(key, *args)
-          @env[:ui].ask(i18n("ask.#{key}", *args), :new_line => true)
+        def host
+          machine.config.sshfs.host_addr
         end
 
-        def error(key, *args)
-          @env[:ui].error(i18n("error.#{key}", *args))
-          raise Error, :base
+        def username
+          `whoami`.strip
         end
 
-        def i18n(key, *args)
-          I18n.t("vagrant.config.sshfs.#{key}", *args)
+        def password
+          Shellwords.escape(@env[:ui].ask(i18n("ask.pass", :user => "#{username}@#{host}"), :echo => false))
         end
       end
 
@@ -105,7 +143,15 @@ module Vagrant
         end
 
         def call(env)
-          Builder.new(env).mount!
+          get_builder(env).mount! if @machine.config.sshfs.enabled
+        end
+
+        def get_builder(env)
+          if @machine.config.sshfs.mount_on_guest
+            GuestBuilder.new(env)
+          else
+            HostBuilder.new(env)
+          end
         end
       end
     end

data/lib/vagrant-sshfs/config.rb

@@ -3,10 +3,14 @@ module Vagrant
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :paths
       attr_accessor :username
+      attr_accessor :enabled
+      attr_accessor :mount_on_guest
+      attr_accessor :host_addr
 
       def initialize
         @paths = {}
         @username = nil
+        @enabled = true
       end
 
       def merge(other)

data/lib/vagrant-sshfs/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module SshFS
-    VERSION = "0.0.4"
+    VERSION = "0.0.5.beta1"
   end
 end

data/lib/vagrant-sshfs.rb

@@ -1,7 +1,7 @@
 begin
   require "vagrant"
 rescue LoadError
-  raise "The Vagrant bindfs plugin must be run within Vagrant"
+  raise "The Vagrant sshfs plugin must be run within Vagrant"
 end
 
 require "vagrant-sshfs/version"

data/locales/en.yml

@@ -10,8 +10,10 @@ en:
         ask:
           create_src: "Source folder `%{src}` does not exist, create?"
           create_target: "Target folder `%{target}` does not exist, create?"
+          pass: "Password for `%{user}`:"
         error:
           base: "vagrant-sshfs failed and couldn't proceed"
           non_empty_target: "Non empty target folder `%{target}`"
           not_created_src: "Source folder `%{src}` was not created"
           not_created_target: "Target folder `%{target}` was not created"
+          not_mounted: "Error when mounting `%{src}` to `%{target}`"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sshfs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5.beta1
 platform: ruby
 authors:
 - fabiokr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11