vagrant-guest-omnios 0.0.1 → 0.3.0

data/README.md

@@ -1,9 +1,11 @@
 vagrant-guest-omnios
 ========================
 
-A Vagrant 1.2.x plugin to provide support for the OmniOS operating system.
+A Vagrant 1.7+ plugin to provide support for the OmniOS operating system.
 
-This code is an unaltered fork of the omnios plugin by mitchellh at 
-https://github.com/mitchellh/vagrant/blob/master/plugins/guests/omnios/plugin.rb on June 24, 2013 at 4d26f01b7bc586ee2f558c8c32b9c1e4fe65713b .
+This code is a modified fork of the omnios plugin by mitchellh at https://github.com/mitchellh/vagrant/tree/1.7.2/plugins/guests/omnios/plugin.rb.  
+
+* It adds the support for the chef_install and chef_installed guest capabilities submitted in PR #5179.  Once that PR is merged, there is no need to use this plugin.
+* It adds support for the insert_public_key and remove_public_key guest capabilities submitted in PR #5182.  Once that PR is merged, there is no need to use this plugin.
 
 See LICENSE.

data/lib/vagrant-guest-omnios/cap/chef_install.rb

@@ -0,0 +1,19 @@
+# require_relative "../../omnibus"
+require Vagrant.source_root.to_s + '/plugins/provisioners/chef/omnibus'
+
+module VagrantPlugins
+  module GuestOmniOS
+    module Cap
+      module ChefInstall
+        def self.chef_install(machine, version, prerelease, download_path)
+          su_cmd = machine.config.solaris.suexec_cmd
+
+          machine.communicate.execute("#{su_cmd} pkg list --no-refresh web/curl > /dev/null 2>&1 || pkg install -q --accept web/curl")
+
+          command = VagrantPlugins::Chef::Omnibus.build_command(version, prerelease, download_path)
+          machine.communicate.execute(su_cmd + ' ' + command)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-omnios/cap/chef_installed.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module GuestOmniOS
+    module Cap
+      module ChefInstalled 
+        # Check if Chef is installed at the given version.
+        # @return [true, false]
+        def self.chef_installed(machine, version)
+          knife = "/opt/chef/bin/knife"
+          command = "test -x #{knife}"
+
+          if version != :latest
+            command << "&& #{knife} --version | grep 'Chef: #{version}'"
+          end
+
+          machine.communicate.test(command, sudo: true)         
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-omnios/cap/insert_public_key.rb

@@ -0,0 +1,21 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestOmniOS
+    module Cap
+      class InsertPublicKey
+        def self.insert_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            comm.execute("mkdir -p ~/.ssh")
+            comm.execute("chmod 0700 ~/.ssh")
+            comm.execute("printf '#{contents}\\n' >> ~/.ssh/authorized_keys")
+            comm.execute("chmod 0600 ~/.ssh/authorized_keys")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-omnios/cap/mount_nfs_folder.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module GuestOmniOS
+    module Cap
+      class MountNFSFolder
+        def self.mount_nfs_folder(machine, ip, folders)
+          su_cmd = machine.config.solaris.suexec_cmd
+          folders.each do |name, opts|
+            machine.communicate.execute("#{su_cmd} mkdir -p #{opts[:guestpath]}")
+            machine.communicate.execute("#{su_cmd} /sbin/mount '#{ip}:#{opts[:hostpath]}' '#{opts[:guestpath]}'")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-omnios/cap/remove_public_key.rb

@@ -0,0 +1,21 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestOmniOS
+    module Cap
+      class RemovePublicKey
+        def self.remove_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            if comm.test("test -f ~/.ssh/authorized_keys")
+              comm.execute(
+                "sed -i '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-omnios/plugin.rb

@@ -15,6 +15,32 @@ module VagrantPlugins
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
+
+      guest_capability("omnios", "mount_nfs_folder") do
+        require_relative "cap/mount_nfs_folder"
+        Cap::MountNFSFolder
+      end
+
+      guest_capability(:omnios, :chef_installed) do
+        require_relative "cap/chef_installed"
+        Cap::ChefInstalled
+      end
+
+      guest_capability(:omnios, :chef_install) do
+        require_relative "cap/chef_install"
+        Cap::ChefInstall
+      end
+
+      guest_capability(:omnios, :insert_public_key) do
+        require_relative "cap/insert_public_key"
+        Cap::InsertPublicKey
+      end
+
+      guest_capability(:omnios, :remove_public_key) do
+        require_relative "cap/remove_public_key"
+        Cap::RemovePublicKey
+      end
+
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guest-omnios
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
-- Mitchell Hashimoto
+- Mitchell Hashimoto, Mark Harrison, Clinton Wolfe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies: []
-description: Vagrant 1.2x plugin to provide guest support for omnios (interim prior
+description: Vagrant 1.7+ plugin to provide guest support for omnios (interim prior
   to core support), yep.
 email: info@hashicorp.com
 executables: []
@@ -19,10 +19,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/vagrant-guest-omnios.rb
 - lib/vagrant-guest-omnios/guest.rb
-- lib/vagrant-guest-omnios/cap/change_host_name.rb
 - lib/vagrant-guest-omnios/plugin.rb
+- lib/vagrant-guest-omnios/cap/mount_nfs_folder.rb
+- lib/vagrant-guest-omnios/cap/remove_public_key.rb
+- lib/vagrant-guest-omnios/cap/change_host_name.rb
+- lib/vagrant-guest-omnios/cap/chef_install.rb
+- lib/vagrant-guest-omnios/cap/insert_public_key.rb
+- lib/vagrant-guest-omnios/cap/chef_installed.rb
+- lib/vagrant-guest-omnios.rb
 homepage: http://github.com/clintoncwolfe/vagrant-guest-omnios
 licenses: []
 post_install_message: 
@@ -43,9 +48,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: vagrant-guest-omnios
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Vagrant 1.2x plugin to provide guest support for omnios (interim prior to
+summary: Vagrant 1.7+ plugin to provide guest support for omnios (interim prior to
   core support)
 test_files: []