vagrant-nfs_guest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce3470eb4d34a59abc8737fa5163830ab382f2f
-  data.tar.gz: b81fd5ff295c881ec9c6ee377010970bdca3bc5a
+  metadata.gz: 3c362cefceea2b475c4b63eda88bb57e7c4197e7
+  data.tar.gz: c1cb2d3eadd42cdd4c6a1aad1a34939963e333eb
 SHA512:
-  metadata.gz: 7a32e270cbdb9481d83a7f213986b6927ac7c3c28cbad7a7cea979ba1969b0076cab824f7255418e8927140bca1a410a6fea9fb447839e6802668dee69d46d46
-  data.tar.gz: b5b32a5a565c58420ad3c2d733740f073f208914c25a8c2d3d3a4f44ad9f3968dbb915e02c1b964096e527e9d8b705ac14a4504f1d03dce78ce86e00426ecb2b
+  metadata.gz: 227d93bd2efd6be64ed95ec9eac1dbbeee06a02164b08ffc846cfc25faba334f37e254b1437012cd37c9d632b22a02446da39b1e188b3d53b06fbe6c268ebd01
+  data.tar.gz: 514f46fd8dec9dcf515d73d241d42757e7e96fb3b0cc93fa3ae23818f14305582da4ae100a4fa12e8617c504b3a6211bb0c39d8b157ac5d07d9b11a1a1c46ad5

data/.gitignore

@@ -16,4 +16,3 @@ test/tmp
 test/version_tmp
 tmp
 .vagrant
-Vagrantfile

data/Gemfile

@@ -1,8 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in vagrant-nfs_guest.gemspec
-#gemspec
-
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the

data/README.md

@@ -3,7 +3,7 @@
 ## What's New?
 
 - Supports Vagrant 1.6!
-- Handles actions 'up', 'halt', 'destroy', 'suspend', 'resume' and 'package' properly
+- Handles actions ```up```, ```halt```, ```destroy```, ```suspend```, ```resume``` and ```package``` properly
 - Uses retryable() for host to guest communications allow more fault tolerance
 - Better error messages and handling
 - Re-organisation of modules and class to better match Vagrant proper
@@ -17,24 +17,31 @@ Basically it's just the usual NFS synced folders in Vagrant but the roles are re
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    vagrant plugin install vagrant-nfs_guest
 
-    gem 'vagrant-nfs_guest'
+## Install from sources
 
-And then execute:
+    git clone https://github.com/Learnosity/vagrant-nfs_guest.git
+    cd vagrant-nfs_guest
+    bundle install
+    bundle exec rake build
+    vagrant plugin install pkg/vagrant-nfs_guest-VERSION.gem
 
-    $ bundle
-
-Or install it yourself as:
+## Usage
 
-    $ gem install vagrant-nfs_guest
+To enable for example put similar in the Vagrantfile:
 
-## Usage
+    config.vm.synced_folder 'srv', '/srv', type: 'nfs_guest'
 
-To enable for example:
+## Building
 
-```config.vm.synced_folder 'srv', '/srv', type: 'nfs_guest'```
+We use 'chruby' to allow a virtual ruby environment for developement. The 'bundle' gem is needed to build and run
 
+    git clone https://github.com/Learnosity/vagrant-nfs_guest.git
+    cd vagrant-nfs_guest
+    bundle install
+    bundle exec vagrant
+    
 ## Contributing
 
 1. Fork it

data/example_box/Vagrantfile

@@ -0,0 +1,123 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "hashicorp/precise64"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  #config.vm.box_url = ""
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network", ip: "192.168.55.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # If true, then any SSH connections made will enable agent forwarding.
+  # Default value: false
+  # config.ssh.forward_agent = true
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+  config.vm.synced_folder '.', '/vagrant', disabled: true
+  config.vm.synced_folder './vagrant_share', '/vagrant', type: 'nfs_guest'
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Don't boot with headless mode
+  #   vb.gui = true
+  #
+  #   # Use VBoxManage to customize the VM. For example to change memory:
+  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
+  # end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # Enable provisioning with CFEngine. CFEngine Community packages are
+  # automatically installed. For example, configure the host as a
+  # policy server and optionally a policy file to run:
+  #
+  # config.vm.provision "cfengine" do |cf|
+  #   cf.am_policy_hub = true
+  #   # cf.run_file = "motd.cf"
+  # end
+  #
+  # You can also configure and bootstrap a client to an existing
+  # policy server:
+  #
+  # config.vm.provision "cfengine" do |cf|
+  #   cf.policy_server_address = "10.0.2.15"
+  # end
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file default.pp in the manifests_path directory.
+  #
+  # config.vm.provision "puppet" do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "site.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision "chef_solo" do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { mysql_password: "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision "chef_client" do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # If you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/lib/vagrant-nfs_guest/action/mount_nfs.rb

@@ -1,4 +1,3 @@
-require 'json'
 module VagrantPlugins
   module SyncedFolderNFSGuest
     module Action

data/lib/vagrant-nfs_guest/errors.rb

@@ -9,9 +9,20 @@ module VagrantPlugins
       end
 
       class GuestNFSError < Error
+        error_key(:nfs_server_missing)
         error_key(:nfs_start_failed)
         error_key(:nfs_apply_failed)
         error_key(:nfs_update_exports_failed)
+        error_key(:nfs_guest_clean)
+        error_key(:nfs_create_mounts_failed)
+      end
+
+      class NFSServerMissing < Error
+        error_key(:nfs_server_missing)
+      end
+
+      class NFSServerNotInstalledInGuest < Error
+        error_key(:nfs_server_not_installed)
       end
 
     end

data/lib/vagrant-nfs_guest/guests/linux/cap/nfs_export.rb

@@ -1,6 +1,3 @@
-require "log4r"
-
-require "vagrant/util"
 require "vagrant/util/retryable"
 
 module VagrantPlugins
@@ -22,14 +19,22 @@ module VagrantPlugins
             "/etc/init.d/nfs-kernel-server start"
           end
 
+          def self.nfs_check_command(env)
+            "/etc/init.d/nfs-kernel-server status"
+          end
+
+          def self.nfs_test_command(env)
+            "which exportfs"
+          end
+
           def self.nfs_exports_template(machine)
             VagrantPlugins::SyncedFolderNFSGuest.source_root.join(
               "templates/nfs_guest/guest_export_linux")
           end
 
           def self.nfs_capable?(machine)
-            nfs_check_command = machine.guest.capability(:nfs_check_command)
-            machine.communicate.test(nfs_check_command)
+            nfs_test_command = machine.guest.capability(:nfs_test_command)
+            machine.communicate.test(nfs_test_command)
           end
 
           def self.nfs_apply_changes!(machine)
@@ -48,7 +53,16 @@ module VagrantPlugins
                                     )
           end
 
+          def self.nfs_running?(machine)
+            nfs_test_command = machine.guest.capability(:nfs_check_command)
+            machine.communicate.test(nfs_test_command)
+          end
+
           def self.nfs_export(machine, ip, folders)
+            if !nfs_capable?(machine)
+                raise Errors::NFSServerMissing
+            end
+
             nfs_exports_template = machine.guest.capability(:nfs_exports_template)
 
             nfs_opts_setup(machine, folders)
@@ -65,7 +79,7 @@ module VagrantPlugins
 
             nfs_cleanup(machine)
 
-            retryable(on: Errors::GuestNFSError, tries: 8, sleep: 3) do 
+            retryable(on: Errors::GuestNFSError, tries: 8, sleep: 3) do
               output.split("\n").each do |line|
                 machine.communicate.sudo(
                   %Q[echo '#{line}' >> /etc/exports],
@@ -74,7 +88,7 @@ module VagrantPlugins
                 )
               end
 
-              if nfs_capable?(machine)
+              if nfs_running?(machine)
                 nfs_apply_changes!(machine)
               else
                 nfs_start!(machine)
@@ -83,16 +97,20 @@ module VagrantPlugins
           end
 
           def self.nfs_cleanup(machine)
+            return if !nfs_capable?(machine)
+
             id = machine.id
             user = Process.uid
 
             # Use sed to just strip out the block of code which was inserted
             # by Vagrant
             #
-            machine_do(
-              machine,
+            machine.communicate.sudo(
               "sed -r -e '/^# VAGRANT-BEGIN:( #{user})? #{id}/,/^# " +
-              "VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports")
+              "VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports",
+              error_class: Errors::GuestNFSError,
+              error_key: :nfs_guest_clean
+            )
           end
 
           def self.nfs_opts_setup(machine, folders)
@@ -117,23 +135,27 @@ module VagrantPlugins
               # Expand the guest path so we can handle things like "~/vagrant"
               expanded_guest_path = machine.guest.capability(
                 :shell_expand_guest_path, opts[:guestpath])
-              
-              begin
-                retryable(on: Vagrant::Errors::VagrantError, tries: 8, sleep: 3) do 
-                  # Do the actual creating and mounting
-                  machine_do(machine, "mkdir -p #{expanded_guest_path}")
-                  machine_do(machine, "chown -R vagrant:vagrant #{expanded_guest_path}")
-                  machine_do(machine, "chmod 2775 #{expanded_guest_path}")
-                end
-              rescue Vagrant::Errors::VagrantError
-                raise Errors::CreateMountsFailed
+
+              retryable(on: Errors::GuestNFSError, tries: 8, sleep: 3) do
+                # Do the actual creating and mounting
+                machine.communicate.sudo(
+                  "mkdir -p #{expanded_guest_path}",
+                  error_class: Errors::GuestNFSError,
+                  error_key: :nfs_create_mounts_failed
+                )
+                machine.communicate.sudo(
+                  "chown -R vagrant:vagrant #{expanded_guest_path}",
+                  error_class: Errors::GuestNFSError,
+                  error_key: :nfs_create_mounts_failed
+                )
+                machine.communicate.sudo(
+                  "chmod 2775 #{expanded_guest_path}",
+                  error_class: Errors::GuestNFSError,
+                  error_key: :nfs_create_mounts_failed
+                )
               end
             end
           end
-
-          def self.machine_do(machine, command)
-              machine.communicate.sudo(command)
-          end
         end
       end
     end

data/lib/vagrant-nfs_guest/guests/ubuntu/cap/nfs_server.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module GuestUbuntu
+      module Cap
+        class NFSServer
+          def self.nfs_server_install(machine)
+            machine.communicate.sudo("apt-get update")
+            machine.communicate.sudo("apt-get -y install nfs-kernel-server")
+          end
+
+          def self.nfs_server_installed(machine)
+            machine.communicate.test("test -e /etc/init.d/nfs-kernel-server")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/hosts/bsd/cap/mount_nfs.rb

@@ -1,31 +1,31 @@
-require "log4r"
-
 module VagrantPlugins
-  module HostBSD
-    module Cap
-      class MountNFS
+  module SyncedFolderNFSGuest
+    module HostBSD
+      module Cap
+        class MountNFS
 
-        def self.nfs_mount(environment, ui, id, ips, folders)
-          folders.each do |name, opts|
-            if opts[:type] != :nfs_guest
-              next
-            end
+          def self.nfs_mount(environment, ui, id, ips, folders)
+            folders.each do |name, opts|
+              if opts[:type] != :nfs_guest
+                next
+              end
 
-            ips.each do |ip|
-              ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
-                               guestpath: opts[:guestpath],
-                               hostpath: opts[:hostpath]))
+              ips.each do |ip|
+                ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                                 guestpath: opts[:guestpath],
+                                 hostpath: opts[:hostpath]))
 
-              system("mkdir -p #{opts[:hostpath]}")
-              mount_command = "mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
-              if system(mount_command)
-                break
+                system("mkdir -p #{opts[:hostpath]}")
+                mount_command = "mount -t nfs -o noatime '#{ip}:#{opts[:guestpath]}' '#{opts[:hostpath]}'"
+                if system(mount_command)
+                  break
+                end
               end
-            end    
+            end
           end
-        end
 
-      end    
+        end
+      end
     end
   end
 end

data/lib/vagrant-nfs_guest/hosts/bsd/cap/unmount_nfs.rb

@@ -1,33 +1,33 @@
-require "log4r"
-
 module VagrantPlugins
-  module HostBSD
-    module Cap
-      class UnmountNFS
+  module SyncedFolderNFSGuest
+    module HostBSD
+      module Cap
+        class UnmountNFS
 
-        def self.nfs_unmount(environment, ui, folders)
-          folders.each do |name, opts|
-            if opts[:type] != :nfs_guest
-              next
-            end
+          def self.nfs_unmount(environment, ui, folders)
+            folders.each do |name, opts|
+              if opts[:type] != :nfs_guest
+                next
+              end
 
-            ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
-                             guestpath: opts[:guestpath],
-                             hostpath: opts[:hostpath]))
+              ui.detail(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                               guestpath: opts[:guestpath],
+                               hostpath: opts[:hostpath]))
 
-            expanded_host_path = `printf #{opts[:hostpath]}`
-            umount_msg = `umount '#{expanded_host_path}' 2>&1`
+              expanded_host_path = `printf #{opts[:hostpath]}`
+              umount_msg = `umount '#{expanded_host_path}' 2>&1`
 
-            if $?.exitstatus != 0
-              if not umount_msg.include? 'not currently mounted'
-                ui.info "NFS mounts still in use!"
-                exit(1)
+              if $?.exitstatus != 0
+                if not umount_msg.include? 'not currently mounted'
+                  ui.info "NFS mounts still in use!"
+                  exit(1)
+                end
               end
             end
           end
-        end
 
-      end    
+        end
+      end
     end
   end
 end

data/lib/vagrant-nfs_guest/plugin.rb

@@ -51,11 +51,26 @@ module VagrantPlugins
         GuestLinux::Cap::NFSExport
       end
 
+      guest_capability(:linux, :nfs_test_command) do
+        require_relative "guests/linux/cap/nfs_export"
+        GuestLinux::Cap::NFSExport
+      end
+
       guest_capability(:linux, :nfs_exports_template) do
         require_relative "guests/linux/cap/nfs_export"
         GuestLinux::Cap::NFSExport
       end
 
+      guest_capability(:ubuntu, "nfs_server_installed") do
+        require_relative "guests/ubuntu/cap/nfs_server"
+        GuestUbuntu::Cap::NFSServer
+      end
+
+      guest_capability(:ubuntu, :nfs_server_install) do
+        require_relative "guests/ubuntu/cap/nfs_server"
+        GuestUbuntu::Cap::NFSServer
+      end
+
       guest_capability(:linux, :read_uid) do
         require_relative "guests/linux/cap/read_user_ids"
         GuestLinux::Cap::ReadUserIDs
@@ -66,6 +81,16 @@ module VagrantPlugins
         GuestLinux::Cap::ReadUserIDs
       end
 
+      host_capability("bsd", "nfs_mount") do
+        require_relative "hosts/bsd/cap/mount_nfs"
+        HostBSD::Cap::MountNFS
+      end
+
+      host_capability("bsd", "nfs_unmount") do
+        require_relative "hosts/bsd/cap/unmount_nfs"
+        HostBSD::Cap::UnmountNFS
+      end
+
       action_hook(:nfs_guest, :machine_action_up) do |hook|
         require_relative "action/prepare_nfs_guest_settings"
         hook.after(

data/lib/vagrant-nfs_guest/synced_folder.rb

@@ -1,5 +1,4 @@
 require 'zlib'
-require 'json'
 
 module VagrantPlugins
   module SyncedFolderNFSGuest
@@ -11,7 +10,6 @@ module VagrantPlugins
           return false
         end
         return true if machine.env.host.capability(:nfs_installed)
-        return true if machine.guest.capability(:nfs_installed)
         return false if !raise_error
         raise Vagrant::Errors::NFSNotSupported
       end
@@ -20,6 +18,16 @@ module VagrantPlugins
         raise Vagrant::Errors::NFSNoHostIP if !nfsopts[:nfs_guest_host_ip]
         raise Vagrant::Errors::NFSNoGuestIP if !nfsopts[:nfs_guest_machine_ip]
 
+        if machine.guest.capability?(:nfs_server_installed)
+          installed = machine.guest.capability(:nfs_server_installed)
+          if !installed
+            can_install = machine.guest.capability?(:nfs_server_install)
+            raise Errors::NFSServerNotInstalledInGuest if !can_install
+            machine.ui.info I18n.t("vagrant_nfs_guest.guests.linux.nfs_server_installing")
+            machine.guest.capability(:nfs_server_install)
+          end
+        end
+
         machine_ip = nfsopts[:nfs_guest_machine_ip]
         machine_ip = [machine_ip] if !machine_ip.is_a?(Array)
 

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/vagrant-nfs_guest.rb

@@ -1,7 +1,6 @@
 require "pathname"
 
 require "vagrant-nfs_guest/plugin"
-require "vagrant-nfs_guest/hosts/bsd/plugin"
 
 module VagrantPlugins
   module SyncedFolderNFSGuest

data/templates/locales/en.yml

@@ -9,6 +9,7 @@ en:
     guests:
       linux:
         nfs_export: "Preparing to edit /etc/exports on the guest..."
+        nfs_server_installing: "Installing nfs server on the guest..."
 
     errors:
       nfs_update_exports_failed: |-
@@ -41,3 +42,9 @@ en:
 
         Stderr from the command:
         %{stderr}
+
+      nfs_server_missing: |-
+        Guest is missing the required NFS server daemon.
+
+      nfs_server_not_installed: |-
+        Guest cannot install the required NFS server daemon.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,6 +50,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- example_box/Vagrantfile
+- example_box/vagrant_share/.keep
 - lib/vagrant-nfs_guest.rb
 - lib/vagrant-nfs_guest/action/mount_nfs.rb
 - lib/vagrant-nfs_guest/action/prepare_nfs_guest_settings.rb
@@ -58,9 +60,9 @@ files:
 - lib/vagrant-nfs_guest/errors.rb
 - lib/vagrant-nfs_guest/guests/linux/cap/nfs_export.rb
 - lib/vagrant-nfs_guest/guests/linux/cap/read_user_ids.rb
+- lib/vagrant-nfs_guest/guests/ubuntu/cap/nfs_server.rb
 - lib/vagrant-nfs_guest/hosts/bsd/cap/mount_nfs.rb
 - lib/vagrant-nfs_guest/hosts/bsd/cap/unmount_nfs.rb
-- lib/vagrant-nfs_guest/hosts/bsd/plugin.rb
 - lib/vagrant-nfs_guest/plugin.rb
 - lib/vagrant-nfs_guest/synced_folder.rb
 - lib/vagrant-nfs_guest/version.rb

data/lib/vagrant-nfs_guest/hosts/bsd/plugin.rb

@@ -1,18 +0,0 @@
-require "vagrant"
-
-module VagrantPlugins
-  module HostBSD
-    class Plugin < Vagrant.plugin("2")
-
-      host_capability("bsd", "nfs_mount") do
-        require_relative "cap/mount_nfs"
-        Cap::MountNFS
-      end
-
-      host_capability("bsd", "nfs_unmount") do
-        require_relative "cap/unmount_nfs"
-        Cap::UnmountNFS
-      end
-    end
-  end
-end