vagrant-smartos-guest 0.0.1.pre.3 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f4eb30ed3fbf41a4f436fd0a53d94c4db53937
-  data.tar.gz: 9c491f9213f2c9c0bfe80bf359c943ef390a8eaa
+  metadata.gz: c5ce5d98205844ddbf7c2ee01efb4302dd62db42
+  data.tar.gz: 4822c9ef8fb73f4b89569a96594fc4402fd019c5
 SHA512:
-  metadata.gz: ea35ac58fd44905b45209ff3dc60f28bc1358404e4903c1e1809eb0797c2e0f43dce8f4f432b4401d631735bfc0308436ef1279ea899f9b1b4572ba32a45d72a
-  data.tar.gz: 50a5eaffa2d1601447b855cb4f9a36345f38bd96c9a1e87d0c33aa36a6e04f71f2b53a00946d222ff0c16e82bf338e25db0ddd6ce3bc69bfcb938779c33a7d84
+  metadata.gz: 5ad8fd641ce8719f381085ddb0e5c21a2a68498c1b27c5417355e15029134087aca31af1fc59d5c5c3872de28e763404acd59bac422b61c524dcb637b16033a7
+  data.tar.gz: 2274b99cb7f8270334f83dde4ecb18b0d67feaf668ff74db751e465203275b255ada68e77500ac1abba86c0313e7c3af0e3f8d4175c10433d05fbb774bfe0aa6

data/README.md

@@ -1,11 +1,10 @@
 vagrant-smartos-guest
 =====================
 
-Adds Vagrant guest detection and guest capabilities for SmartOS.
-
-This plugin is superceded by [this pull request](https://github.com/mitchellh/vagrant/pull/3102),
-which adds SmartOS guest detection directly into Vagrant. At the
-time of this writing (Vagrant 1.5), it has not yet been released.
+Adds some fixes to Vagrant for integrating with SmartOS. This gem
+is intended to package code fixes that have already been submitted to
+Vagrant as pull requests, before those fixes have been includes in an
+official release.
 
 ## Installation
 
@@ -28,32 +27,12 @@ Otherwise install the plugin into your omnibus installation of Vagrant:
 vagrant plugin install vagrant-smartos-guest
 ```
 
-## Usage
-
-This plugin allows Vagrant to recognize when a guest box is a SmartOS
-global zone or local zone.
-
-When connecting to a SmartOS global zone in VirtualBox without guest
-additions, very likely the default mountpoint will need to be disabled.
-
-To disable the default mountpoint, add this to your Vagrantfile inside
-your config block:
-
-```ruby
-config.vm.synced_folder ".", "/vagrant", disabled: true
-```
+## Current state
 
-When using a synced folder of type `rsync` in a global zone, you will
-almost certainly want to sync the folder into a persistent location.
+This gem is currently usable with Vagrant 1.6.3. It fixes some
+regressions in the way that Vagrant handles synced folders of type:
+'rsync'.
 
-```ruby
-config.vm.synced_folder ".", "/vagrant", disabled: true
-config.vm.synced_folder ".", "/zones/vagrant", type: 'rsync'
-```
-
-When sharing a folder via NFS, you can override the default mountpoint:
-
-```ruby
-config.vm.synced_folder ".", "/vagrant", type: "nfs"
-```
+* <https://github.com/mitchellh/vagrant/pull/4415>
+* <https://github.com/mitchellh/vagrant/pull/4274>
 

data/lib/vagrant/smartos/guest.rb

@@ -1,3 +1,4 @@
 require 'vagrant'
-require 'vagrant/smartos/guest/version'
-require 'vagrant/smartos/guest/plugin'
+require 'vagrant/smartos/guest/guest'
+require 'plugins/guests/smartos/cap/rsync'
+require 'vagrant/smartos/guest/cap/rsync'

data/lib/vagrant/smartos/guest/cap/rsync.rb

@@ -1,22 +1,25 @@
-module Vagrant
-  module Smartos
-    module Guest
-      module Cap
-        class RSync
-          def self.rsync_installed(machine)
-            machine.communicate.test("which rsync")
-          end
+module VagrantPlugins
+  module GuestSmartos
+    module Cap
+      class RSync
+        def self.rsync_installed(machine)
+          machine.communicate.test("which rsync")
+        end
 
-          def self.rsync_pre(machine, folder_opts)
-            username = machine.ssh_info[:username]
-            sudo = machine.config.smartos.suexec_cmd
+        def self.rsync_command(machine)
+          "#{machine.config.smartos.suexec_cmd} rsync"
+        end
 
-            machine.communicate.tap do |comm|
-              comm.execute("#{sudo} mkdir -p '#{folder_opts[:guestpath]}'")
-              comm.execute("#{sudo} chown -R #{username} '#{folder_opts[:guestpath]}'")
-            end
+        def self.rsync_pre(machine, opts)
+          machine.communicate.tap do |comm|
+            comm.execute("#{machine.config.smartos.suexec_cmd} mkdir -p '#{opts[:guestpath]}'")
           end
         end
+
+        def self.rsync_post(machine, opts)
+          machine.communicate.execute("#{machine.config.smartos.suexec_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
+              "#{machine.config.smartos.suexec_cmd} xargs -0 chown #{opts[:owner]}:#{opts[:group]}")
+        end
       end
     end
   end

data/lib/vagrant/smartos/guest/guest.rb

@@ -1,12 +1,24 @@
-require 'vagrant'
+module VagrantPlugins
+  module GuestSmartos
+    class Plugin < Vagrant.plugin('2')
+      guest_capability("smartos", "rsync_installed") do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability("smartos", "rsync_command") do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability("smartos", "rsync_post") do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
 
-module Vagrant
-  module Smartos
-    module Guest
-      class Guest < Vagrant.plugin("2", :guest)
-        def detect?(machine)
-          machine.communicate.test("cat /etc/release | grep -i SmartOS")
-        end
+      guest_capability("smartos", "rsync_pre") do
+        require_relative "cap/rsync"
+        Cap::RSync
       end
     end
   end

data/lib/vagrant/smartos/guest/version.rb

@@ -1,7 +1,7 @@
 module Vagrant
   module Smartos
     module Guest
-      VERSION = "0.0.1.pre.3"
+      VERSION = "0.0.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-smartos-guest
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.3
+  version: 0.0.1
 platform: ruby
 authors:
 - Eric Saxby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,14 +51,8 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant/smartos/guest.rb
-- lib/vagrant/smartos/guest/cap/change_host_name.rb
-- lib/vagrant/smartos/guest/cap/configure_networks.rb
-- lib/vagrant/smartos/guest/cap/halt.rb
-- lib/vagrant/smartos/guest/cap/mount_nfs.rb
 - lib/vagrant/smartos/guest/cap/rsync.rb
-- lib/vagrant/smartos/guest/config.rb
 - lib/vagrant/smartos/guest/guest.rb
-- lib/vagrant/smartos/guest/plugin.rb
 - lib/vagrant/smartos/guest/version.rb
 - vagrant-smartos-guest.gemspec
 homepage: ''
@@ -76,9 +70,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0
@@ -86,3 +80,4 @@ signing_key:
 specification_version: 4
 summary: Allow Vagrant to detect SmartOS guests and guest capabilities
 test_files: []
+has_rdoc: 

data/lib/vagrant/smartos/guest/cap/change_host_name.rb

@@ -1,19 +0,0 @@
-module Vagrant
-  module Smartos
-    module Guest
-      module Cap
-        class ChangeHostName
-          def self.change_host_name(machine, name)
-            su_cmd = machine.config.smartos.suexec_cmd
-
-            # Only do this if the hostname is not already set
-            if !machine.communicate.test("hostname | grep '#{name}'")
-              machine.communicate.execute("#{su_cmd} sh -c \"echo '#{name}' > /etc/nodename\"")
-              machine.communicate.execute("#{su_cmd} hostname #{name}")
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/smartos/guest/cap/configure_networks.rb

@@ -1,29 +0,0 @@
-module Vagrant
-  module Smartos
-    module Guest
-      module Cap
-        class ConfigureNetworks
-          def self.configure_networks(machine, networks)
-            su_cmd = machine.config.smartos.suexec_cmd
-
-            networks.each do |network|
-              device = "#{machine.config.smartos.device}#{network[:interface]}"
-              ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
-
-              machine.communicate.execute("#{ifconfig_cmd} plumb")
-
-              if network[:type].to_sym == :static
-                machine.communicate.execute("#{ifconfig_cmd} inet #{network[:ip]} netmask #{network[:netmask]}")
-                machine.communicate.execute("#{ifconfig_cmd} up")
-                machine.communicate.execute("#{su_cmd} sh -c \"echo '#{network[:ip]}' > /etc/hostname.#{device}\"")
-              elsif network[:type].to_sym == :dhcp
-                machine.communicate.execute("#{ifconfig_cmd} dhcp start")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-

data/lib/vagrant/smartos/guest/cap/halt.rb

@@ -1,24 +0,0 @@
-module Vagrant
-  module Smartos
-    module Guest
-      module Cap
-        class Halt
-          def self.halt(machine)
-            # There should be an exception raised if the line
-            #
-            #     vagrant::::profiles=Primary Administrator
-            #
-            # does not exist in /etc/user_attr. TODO
-            begin
-              machine.communicate.execute(
-                "#{machine.config.smartos.suexec_cmd} /usr/sbin/shutdown -y -i5 -g0")
-            rescue IOError
-              # Ignore, this probably means connection closed because it
-              # shut down.
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/smartos/guest/cap/mount_nfs.rb

@@ -1,21 +0,0 @@
-module Vagrant
-  module Smartos
-    module Guest
-      module Cap
-        class MountNFS
-          def self.mount_nfs_folder(machine, ip, folders)
-            sudo = machine.config.smartos.suexec_cmd
-
-            folders.each do |name, opts|
-              machine.communicate.tap do |comm|
-                comm.execute("#{sudo} mkdir -p #{opts[:guestpath]}", {:shell => "sh"})
-                comm.execute("#{sudo} /usr/sbin/mount -F nfs '#{ip}:#{opts[:hostpath]}' '#{opts[:guestpath]}'", {:shell => "sh"})
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-

data/lib/vagrant/smartos/guest/config.rb

@@ -1,22 +0,0 @@
-require 'vagrant'
-
-module Vagrant
-  module Smartos
-    module Guest
-      class Config < Vagrant.plugin("2", :config)
-        attr_accessor :halt_timeout
-        attr_accessor :halt_check_interval
-        # This sets the command to use to execute items as a superuser. sudo is default
-        attr_accessor :suexec_cmd
-        attr_accessor :device
-
-        def initialize
-          @halt_timeout = 30
-          @halt_check_interval = 1
-          @suexec_cmd = 'pfexec'
-          @device = "e1000g"
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/smartos/guest/plugin.rb

@@ -1,52 +0,0 @@
-require 'vagrant'
-
-module Vagrant
-  module Smartos
-    module Guest
-      class Plugin < Vagrant.plugin("2")
-        name "SmartOS guest."
-        description "SmartOS guest support."
-
-        config("smartos") do
-          require_relative 'config'
-          Config
-        end
-
-        guest("smartos")  do
-          require_relative 'guest'
-          ::Vagrant::Smartos::Guest::Guest
-        end
-
-        guest_capability("smartos", "change_host_name") do
-          require_relative "cap/change_host_name"
-          Cap::ChangeHostName
-        end
-
-        guest_capability("smartos", "configure_networks") do
-          require_relative "cap/configure_networks"
-          Cap::ConfigureNetworks
-        end
-
-        guest_capability("smartos", "halt") do
-          require_relative "cap/halt"
-          Cap::Halt
-        end
-
-        guest_capability("smartos", "mount_nfs_folder") do
-          require_relative "cap/mount_nfs"
-          Cap::MountNFS
-        end
-
-        guest_capability("smartos", "rsync_installed") do
-          require_relative "cap/rsync"
-          Cap::RSync
-        end
-
-        guest_capability("smartos", "rsync_pre") do
-          require_relative "cap/rsync"
-          Cap::RSync
-        end
-      end
-    end
-  end
-end