vagrant-bindfs 0.1.7 → 0.1.8

data/LICENSE.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2010 Folken Laëneck
+The MIT License
+
+Copyright (c) 2010-2012 Folken Laëneck
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,8 +11,25 @@ Vagrant-bindfs is distributed as a Ruby gem. You can install it as any other gem
 
 ## Configure your VM
 
-In your VagrantFile, you can use `config.bindfs.bind_folder` to configure folders that will be binded on VM startup.  
-Its basic syntax is `config.bindfs.bind_folder "source/dir", "mount/point"`.
+In your VagrantFile, you can use `config.bindfs.bind_folder` to configure folders that will be binded on VM startup.
+
+    # In your Vagrantfile
+    Vagrant::Config.run do |config|
+    
+        [...] # Your VM configuration
+    
+        # Basic usage
+        config.bindfs.bind_folder "source/dir", "mount/point"
+        
+        # Advanced options
+        config.bindfs.bind_folder "source/dir", "mount/point", :perms => "u=rw:g=r:o=r", :create_as_user => true
+        
+        # Complete example for a NFS shared folder
+        config.vm.network :hostonly, "33.33.33.10" # (required to use NFS shared folder)
+        config.vm.share_folder "nfs-share", "/vagrant-nfs", "host/source/dir", :nfs => true 
+        config.bindfs.bind_folder "/vagrant-nfs", "guest/mount/point"
+        
+    end
 
 bind_folder support following arguments...
 
@@ -45,7 +62,7 @@ bind_folder support following arguments...
 - `:'xattr-rw'`
 - `:'ctime-from-mtime'`
     
-Ex: `config.bindfs.bind_folder "source/dir", "mount/point", :perms => "u=rw:g=r:o=r", :create_as_user => true`.
+Ex: ``.
 
 You can overwrite default options _via_ `config.bindfs.default_options`.
 

data/lib/vagrant-bindfs/config.rb

@@ -2,24 +2,25 @@ module VagrantBindfs
   # A configuration class to configure defaults which are used for
   # the `vagrant-bindfs` plugin.
   class Config < Vagrant::Config::Base
-    configures :bindfs
 
-    attr_accessor :default_options
-    attr_reader :binded_folders
-
-    def initialize
-      @binded_folders = []
-      @default_options = nil
+    attr_writer :default_options,
+                :binded_folders
+    
+    def default_options
+      @default_options || {}
+    end
+    
+    def binded_folders
+      @binded_folders || []
     end
 
-    def bind_folder(path, bindpath, opts=nil)
+    def bind_folder(path, bindpath, opts = {})
+      @binded_folders = [] unless instance_variable_defined?(:@binded_folders)
       @binded_folders << {
-        :path => path,
+        :path     => path,
         :bindpath => bindpath
-      }.merge(opts || {})
-    end
-
-    def validate(errors)
+      }.merge(opts)
     end
+    
   end
 end

data/lib/vagrant-bindfs/error.rb

@@ -0,0 +1,5 @@
+module VagrantBindfs
+  class Error < Vagrant::Errors::VagrantError
+    error_namespace("vagrant.guest.linux.bindfs")
+  end
+end

data/lib/vagrant-bindfs/middleware.rb

@@ -42,62 +42,51 @@ module VagrantBindfs
     end
 
     def call(env)
-      @env = env
       @app.call(env)
-      bind_folders unless binded_folders.empty?
+      @env = env
+      
+      bind_folders if !binded_folders.empty? and bindfs_supported?
     end
 
     def binded_folders
-      @env.env.config.bindfs.binded_folders
+      @env[:vm].config.bindfs.binded_folders
     end
 
     def default_options
-      @@options.merge(@@flags).merge(@env.env.config.bindfs.default_options || {})
+      @@options.merge(@@flags).merge(@env[:vm].config.bindfs.default_options)
+    end
+    
+    def bindfs_supported?
+      @env[:vm].channel.execute("bindfs --help", :error_class => Error, :error_key => :not_installed)
+    end
+    
+    def normalize_options opts
+      
+      path     = opts.delete(:path)
+      bindpath = opts.delete(:bindpath)
+      opts     = default_options.merge(opts)
+
+      args = []
+      opts.each do |key, value|
+        args << "--#{key.to_s}" if @@flags.key?(key) and !!value 
+        args << "--#{key.to_s}=#{value}" if @@options.key?(key) and !value.nil?
+      end
+      
+      [ path, bindpath, " #{args.join(" ")}" ]
     end
 
     def bind_folders
-      @env["vm"].ssh.execute do |ssh|
+      @env[:ui].info I18n.t("vagrant.guest.linux.bindfs.status.binding")
+      binded_folders.each do |opts|
+          
+        path, bindpath, args = normalize_options opts
         
-        # Check if bindfs is installed on VM
-        begin
-          ssh.exec!("sudo bindfs --help")
-        rescue Vagrant::Errors::VagrantError => e
-          @env.ui.error e
-          @env.ui.error I18n.t("vagrant.actions.vm.bind_folders.bindfs_not_installed")
-          return
-        end
+        @env[:vm].channel.sudo("mkdir -p #{bindpath}")
+        @env[:vm].channel.sudo("sudo bindfs#{args} #{path} #{bindpath}", :error_class => Error, :error_key => :bindfs_command_fail)
+        @env[:ui].info I18n.t("vagrant.guest.linux.bindfs.status.binding_entry", :path => path, :bindpath => bindpath)
         
-        @env.ui.info I18n.t("vagrant.actions.vm.bind_folders.binding")
-        binded_folders.each do |opts|
-
-          path     = opts.delete(:path)
-          bindpath = opts.delete(:bindpath)
-          opts     = default_options.merge(opts)
-
-          args = []
-          opts.each do |key, value|
-            if @@flags.key?(key)
-              args << "--#{key.to_s}" if !!value 
-            else
-              args << "--#{key.to_s}=#{value}" if !value.nil?
-            end
-          end
-          args = " #{args.join(" ")}"
-          
-          begin
-            ssh.exec!("sudo mkdir -p #{bindpath}")
-            ssh.exec!("sudo bindfs#{args} #{path} #{bindpath}")
-            @env.ui.info I18n.t("vagrant.actions.vm.bind_folders.binding_entry",
-              :path     => path,
-              :bindpath => bindpath
-              )
-          rescue Vagrant::Errors::VagrantError => e
-            @env.ui.error e
-            @env.ui.error I18n.t("vagrant.actions.vm.bind_folders.bindfs_command_fail")
-          end
-          
-        end
       end
     end
+    
   end
 end

data/lib/vagrant-bindfs/version.rb

@@ -1,3 +1,3 @@
 module VagrantBindfs
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/vagrant-bindfs.rb

@@ -1,10 +1,14 @@
 require 'vagrant'
+require 'vagrant-bindfs/error'
 require 'vagrant-bindfs/config'
 require 'vagrant-bindfs/middleware'
 
+# Register Bindfs config
+Vagrant.config_keys.register(:bindfs) { VagrantBindfs::Config }
+
 # Insert Bindfs before the NFS middleware in the ":start" and ":up" Action stack
-Vagrant::Action[:start].insert Vagrant::Action::VM::NFS, VagrantBindfs::Middleware
-Vagrant::Action[:up].insert Vagrant::Action::VM::NFS, VagrantBindfs::Middleware
+Vagrant.actions[:start].insert Vagrant::Action::VM::NFS, VagrantBindfs::Middleware
+Vagrant.actions[:up].insert Vagrant::Action::VM::NFS, VagrantBindfs::Middleware
 
 # Add custom translations to the load path
 I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)

data/locales/en.yml

@@ -1,11 +1,13 @@
 en:
   vagrant:
-    actions:
-      vm:
-        bind_folders:
-          bindfs_not_installed: bindfs seems to not being installed on the virtual machine
-          binding: Binding folders...
-          binding_entry: "-- %{path} bind to %{bindpath}"
-          bindfs_command_fail: |-
-            Please check options values and compatibility.
-            For a complete documentation, run `sudo bindfs --help` on the VM or see bindfs man page at http://www.cs.helsinki.fi/u/partel/bindfs_docs/bindfs.1.html
+    guest:
+      linux:
+        bindfs:
+          errors:
+            not_installed: bindfs seems to not being installed on the virtual machine
+            bindfs_command_fail: |-
+              Please check options values and compatibility.
+              For a complete documentation, run `sudo bindfs --help` on the VM or see bindfs man page at http://www.cs.helsinki.fi/u/partel/bindfs_docs/bindfs.1.html
+          status:
+            binding: Binding folders...
+            binding_entry: "-- %{path} bind to %{bindpath}"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-bindfs
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - "Folken La\xC3\xABneck"
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
-default_executable: 
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vagrant
@@ -25,11 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
-        - 6
-        - 0
-        version: 0.6.0
+        - 9
+        - 4
+        version: 0.9.4
   type: :runtime
   version_requirements: *id001
 description: A Vagrant plugin to automate bindfs mount in the VM. This allow you to change owner, group and permissions on files and, for example, work around NFS share permissions issues.
@@ -42,15 +43,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/vagrant-bindfs.rb
-- lib/vagrant_init.rb
+- lib/vagrant-bindfs/version.rb
+- lib/vagrant-bindfs/error.rb
 - lib/vagrant-bindfs/config.rb
 - lib/vagrant-bindfs/middleware.rb
-- lib/vagrant-bindfs/version.rb
+- lib/vagrant_init.rb
+- lib/vagrant-bindfs.rb
 - locales/en.yml
 - README.md
 - LICENSE.txt
-has_rdoc: true
 homepage: https://github.com/folken-laeneck/vagrant-bindfs
 licenses: []
 
@@ -64,6 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,13 +74,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin to automate bindfs mount in the VM