vagrant-smartos-guest 0.0.1.pre.1 → 0.0.1.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae6b489bc2acfeaffc3aaa15ed83957d7be2e816
-  data.tar.gz: 6acc4e6487dc2d1e3b63e734fcdb1e4b77dd87df
+  metadata.gz: dee092fcabd9dfaf6d67050e20c22dc6ff4b905b
+  data.tar.gz: bf7bbca5e49a6165625955057517bab2eb02ac32
 SHA512:
-  metadata.gz: a91738cc7e676ab5c8000053e6e2f9124efe51ba32b28024d95be7ded349a3d72eca9bc5a229303ae2bb0e26c31be401add8f51092a31bd2eb44fea9d096edbb
-  data.tar.gz: f3e2866b278a7db8e8b4ac5db3a9ae8cd3f28f0e0336f21c53dcbd5b7ab7bb0de3dd6eceea0aea60c321c9e47a35409c424bcc2beb045ee4686522de4c24fe03
+  metadata.gz: eaabaeae218f672ca25b84c235459edf1e6cf55af501a62d318fe3d5d652d51c86b345e42ccb4d6f3c4dd1ce9852d0272758d48f6d0072768abfbc3cc4b4263d
+  data.tar.gz: e7d33aabf39a63b3eb0cd084ba3b7132dcffd72bb0b38b7398c5eceb2e49aad7860220c93f0a08230e2dbe831a1ee5bb8baacdbd013f45672b8c8913f715d851

data/lib/vagrant/smartos/guest.rb

@@ -1,2 +1,3 @@
+require 'vagrant'
 require 'vagrant/smartos/guest/version'
 require 'vagrant/smartos/guest/plugin'

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

@@ -1,14 +1,16 @@
 module Vagrant
   module Smartos
-    module Cap
-      class ChangeHostName
-        def self.change_host_name(machine, name)
-          su_cmd = machine.config.smartos.suexec_cmd
+    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}")
+            # 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

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

@@ -1,22 +1,24 @@
 module Vagrant
   module Smartos
-    module Cap
-      class ConfigureNetworks
-        def self.configure_networks(machine, networks)
-          su_cmd = machine.config.smartos.suexec_cmd
+    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}"
+            networks.each do |network|
+              device = "#{machine.config.smartos.device}#{network[:interface]}"
+              ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
 
-            machine.communicate.execute("#{ifconfig_cmd} plumb")
+              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")
+              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

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

@@ -1,19 +1,21 @@
 module Vagrant
   module Smartos
-    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.
+    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

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

@@ -1,14 +1,16 @@
 module Vagrant
   module Smartos
-    module Cap
-      class MountNFS
-        def self.mount_nfs_folder(machine, ip, folders)
-          sudo = machine.config.smartos.suexec_cmd
+    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"})
+            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

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

@@ -1,23 +1,25 @@
 module Vagrant
   module Smartos
-    module Cap
-      class RSync
-        def self.rsync_installed(machine)
-          machine.communicate.test("which rsync")
-        end
+    module Guest
+      module Cap
+        class RSync
+          def self.rsync_installed(machine)
+            machine.communicate.test("which rsync")
+          end
 
-        def self.rsync_install(machine, folder_opts)
-          username = machine.ssh_info[:username]
-          sudo = machine.config.smartos.suexec_cmd
+          def self.rsync_install(machine, folder_opts)
+            username = machine.ssh_info[:username]
+            sudo = machine.config.smartos.suexec_cmd
 
-          machine.communicate.tap do |comm|
-            comm.execute("#{sudo} mkdir -p '#{folder_opts[:guestpath]}'")
-            comm.execute("#{sudo} chown -R #{username} '#{folder_opts[:guestpath]}'")
+            machine.communicate.tap do |comm|
+              comm.execute("#{sudo} mkdir -p '#{folder_opts[:guestpath]}'")
+              comm.execute("#{sudo} chown -R #{username} '#{folder_opts[:guestpath]}'")
+            end
           end
-        end
 
-        def self.rsync_pre(machine, folder_opts)
-          rsync_install(machine, folder_opts)
+          def self.rsync_pre(machine, folder_opts)
+            rsync_install(machine, folder_opts)
+          end
         end
       end
     end

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

@@ -2,18 +2,20 @@ require 'vagrant'
 
 module Vagrant
   module Smartos
-    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
+    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"
+        def initialize
+          @halt_timeout = 30
+          @halt_check_interval = 1
+          @suexec_cmd = 'pfexec'
+          @device = "e1000g"
+        end
       end
     end
   end

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

@@ -2,9 +2,11 @@ require 'vagrant'
 
 module Vagrant
   module Smartos
-    class Guest < Vagrant.plugin("2", :guest)
-      def detect?(machine)
-        machine.communicate.test("cat /etc/release | grep -i SmartOS")
+    module Guest
+      class Guest < Vagrant.plugin("2", :guest)
+        def detect?(machine)
+          machine.communicate.test("cat /etc/release | grep -i SmartOS")
+        end
       end
     end
   end

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

@@ -2,53 +2,55 @@ require 'vagrant'
 
 module Vagrant
   module Smartos
-    class Plugin < Vagrant.plugin("2")
-      name "SmartOS guest."
-      description "SmartOS guest support."
-
-      config("smartos") do
-        require File.expand_path("../config", __FILE__)
-        Config
-      end
-
-      guest("smartos")  do
-        require File.expand_path("../guest", __FILE__)
-        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_install") do
-        require_relative "cap/rsync"
-        Cap::RSync
-      end
-
-      guest_capability("smartos", "rsync_pre") do
-        require_relative "cap/rsync"
-        Cap::RSync
+    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_install") do
+          require_relative "cap/rsync"
+          Cap::RSync
+        end
+
+        guest_capability("smartos", "rsync_pre") do
+          require_relative "cap/rsync"
+          Cap::RSync
+        end
       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.1"
+      VERSION = "0.0.1.pre.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-smartos-guest
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.1
+  version: 0.0.1.pre.2
 platform: ruby
 authors:
 - Eric Saxby