vagrant-guests-solaris11 0.0.1a → 0.0.1.dev

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQwZjFmMGY4OTMwOWEzZDdmYjk1NTdmN2I0ZDIwYTc1NzhmYTNhYw==
+    YjNlMmFjMDg3MGU5ODI4ODdlMzRiYjQxZmE3Mjc0MWY3NzZmNDE1Yg==
   data.tar.gz: !binary |-
-    Y2UzYWVjYTNjZTljMDA1NDU4MjIzZjVlMGM4NjM2ZDgzYjdmZGEwZA==
+    ZTNmZGUxZGZmZWUxMjBjZmYzZGEzM2FhOTY0MjllYzMwOTUxOTRjYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmUxNDg1OWRkYWM4Mzg0MWQyZjg4N2M1YzZhMGVhMmM0NjIxNmYxOWI1OGM2
-    MmRkNTE0YWNlYTM0MmFlZTlmZTM0NjQxNWFlNTQ0MGMwZTIzMzhkNThkZWUz
-    MGM5ZDEzZDA5NGI3MjJiNGZhYjgxNjQxMjY5NWRiM2JmNzk5Nzk=
+    YWE1ZWE2MjE0ZTE3ZjI0ZDc3MDg1ZDYwYWQ3MmEyYjhhMmIyZjJlNGRhNWFk
+    MTdmYTIzODU3MTY2YWQyODdmZmE4ZTM1ZTAyOGQwNjcwZGQ2ZWQ0ZmQwZmI2
+    ZjcxNDc3YjM5MTYzY2Y1YjVjYzFkMjcxOThhNTdmZDM5YjQ1MjE=
   data.tar.gz: !binary |-
-    ZjEzNjNlMDhjMjY3M2ExODU1YmZiNmY3NWFiODcxM2U1YzM0ZWMwNTY0ZjE2
-    ZjVhMWNhN2MwNjU0YjViZGY1ZDRhYjU1ZTZiMjUwYzY5ZjkyZTM2MzNjYjZi
-    OTRiMTM3NTNhMmE5M2JlZTk0NzFlNDg0NzE2NGNmZjYwMDkwZjQ=
+    NWI3YmJmMTE4MzhkMGQxMTY1ZDBmOTY3YzJlYzEyNGJjM2FmNjRjNzczNjQy
+    NGRkMzZkNWViZDJlZjhjZDE5OWFhZTg4M2VlYTEzMjg2OTYyYzQzOWE3NWQ5
+    M2IzZTkyNGU5MmFiNTVkNGQzOWIxMDVlODUzOWMwNDY2ZTBiY2M=

data/Gemfile

@@ -8,10 +8,4 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
-
-  gem "shoulda", ">= 0"
-  gem "rdoc"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.8.7"
-  gem "version"
 end

data/README.md

@@ -28,9 +28,73 @@ Vagrant.configure("2") do |config|
    config.vm.guest = :solaris11
 ```
 
+### Development
+
+To work on the `vagrant-guests-solaris11` plugin, clone [this repository
+out](https://github.com/janth/vagrant-guests-solaris11), and use
+[Bundler](http://gembundler.com) to get the dependencies:
+
+```bash
+bundle
+```
+
+Once you have the dependencies, verify the unit tests pass with `rake`:
+
+```bash
+bundle exec rake 
+```
+
+Other rake commands:
+```bash
+bundle exec rake --tasks
+bundle exec rake --trace build
+bundle exec rake --trace install
+bundle exec rake --trace release
+```
+
+
+If those pass, you're ready to start developing the plugin. You can test
+the plugin without installing it into your Vagrant environment by just
+creating a `Vagrantfile` in the top level of this directory (it is gitignored)
+and add the following line to your `Vagrantfile` 
+```ruby
+Vagrant.require_plugin "vagrant-guests-solaris11"
+```
+Use bundler to execute Vagrant:
+```bash
+bundle exec vagrant up <vagranthost>
+```
+### Cleanup
+
+```bash
+bundle exec rake clobber
+```
+
 ### Changelog
 
 ##### 0.0.1 (2013-08-25)
 
  * Initial release
 
+### Similar projects
+
+* [vagrant-guests-openbsd](https://github.com/nabeken/vagrant-guests-openbsd.git)
+
+### Fork
+
+<!--
+https://github.com/jamesflorentino/fork-ribbons/blob/master/README.md
+https://github.com/aral/fork-me-on-github-retina-ribbons/blob/master/readme.md
+https://github.com/simonwhitaker/github-fork-ribbon-css
+https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
+-->
+
+   <a href="https://github.com/janth/vagrant-guests-solarsi11/"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>
+   <a href="https://github.com/janth/vagrant-guests-solaris11"><img style="position: absolute; top: 0; right: 30px; border: 0;" src="https://github.com/jamesflorentino/fork-ribbons/raw/master/ribbons/green-white.png" alt="Fork me on GitHub"></a>
+
+   <!-- BOTTOM RIGHT RIBBON: START COPYING HERE -->
+   <div class="github-fork-ribbon-wrapper right-bottom">
+   <div class="github-fork-ribbon">
+   <a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on GitHub</a>
+   </div>
+   </div>

data/Rakefile

@@ -1,34 +1,19 @@
-# encoding: utf-8
+require 'rubygems'
+require 'bundler/setup'
+# For gem creation and bundling
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-# Immediately sync all stdout so that tools like buildbot can immediately load in the output.
+# Immediately sync all stdout so that tools like buildbot can
+# immediately load in the output.
 $stdout.sync = true
 $stderr.sync = true
 
 # Change to the directory of this file.
 Dir.chdir(File.expand_path("../", __FILE__))
 
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'bundler/setup'
-
-# For gem creation and bundling
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-require 'rake'
-require 'rake/clean'
-require 'rake/version_task'
-Rake::VersionTask.new
-
 # This installs the tasks that help with gem creation and publishing.
-Bundler::GemHelper.install_tasks
+#Bundler::GemHelper.install_tasks
 
 
 # Install the `spec` task so that we can run tests.

data/lib/vagrant-guests-solaris11/guest.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
   module GuestSolaris11
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test('[ "$(uname -s)" = "SunOS" ]')
+        machine.communicate.test("uname -s | grep SunOS")
       end
     end
   end

data/lib/vagrant-guests-solaris11/version.rb

@@ -0,0 +1,11 @@
+# A general Vagrant system implementation for "solaris 11".
+#
+# Contributed by Jan Thomas Moldung <janth@moldung.no>
+
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSolaris11
+     VERSION = "0.0.1.dev"
+  end
+end

data/spec/cap/change_host_name_spec.rb

@@ -5,19 +5,19 @@ describe VagrantPlugins::GuestSolaris11::Cap::ChangeHostName do
   include_context 'machine'
 
   it "should change hostname when hostname is differ from current" do
-    name = 'vagrant-solaris11'
+    hostname = 'vagrant-solaris11'
     communicate.stub(:test).and_return(false)
     communicate.should_receive(:sudo).with("/usr/sbin/svccfg -s system/identity:node setprop config/nodename=\"#{name}\"")
     communicate.should_receive(:sudo).with("/usr/sbin/svccfg -s system/identity:node setprop config/loopback=\"#{name}\"")
     communicate.should_receive(:sudo).with("/usr/sbin/svccfg -s system/identity:node refresh ")
     communicate.should_receive(:sudo).with("/usr/sbin/svcadm restart system/identity:node ")
-    described_class.change_host_name(machine, name)
+    described_class.change_host_name(machine, hostname)
   end
 
   it "should not change hostname when hostname equals current" do
-    name = 'vagrant-solaris11'
+    hostname = 'vagrant-solaris11'
     communicate.stub(:test).and_return(true)
     communicate.should_not_receive(:sudo)
-    described_class.change_host_name(machine, name)
+    described_class.change_host_name(machine, hostname)
   end
 end

data/spec/cap/configure_networks_spec.rb

@@ -0,0 +1,29 @@
+require 'vagrant-guests-solaris11/cap/configure_networks'
+require 'spec_helper'
+
+describe VagrantPlugins::GuestSolaris11::Cap::ConfigureNetworks do
+  include_context 'machine'
+
+  it "should configure networks using hostname.in(5)" do
+    networks = [
+      {:type => :static, :ip => '192.168.10.10', :netmask => '255.255.255.0', :interface => 1},
+      {:type => :dhcp, :interface => 2},
+      {:type => :static, :ip => '10.168.10.10', :netmask => '255.255.0.0', :interface => 3},
+    ]
+    communicate.should_receive(:sudo).with("[ -f /etc/hostname.em0 ] && mv /etc/hostname.em0 /tmp")
+    communicate.should_receive(:sudo).with("rm /etc/hostname.em* || :")
+    communicate.should_receive(:sudo).with("[ -f /tmp/hostname.em0 ] && mv /tmp/hostname.em0 /etc")
+
+    communicate.should_receive(:sudo).with(
+      "su -m root -c 'echo inet #{networks[0][:ip]} #{networks[0][:netmask]} > /etc/hostname.em#{networks[0][:interface]}'")
+    communicate.should_receive(:sudo).with("sh /etc/netstart em#{networks[0][:interface]}")
+    communicate.should_receive(:sudo).with(
+      "su -m root -c 'echo dhcp > /etc/hostname.em#{networks[1][:interface]}'")
+    communicate.should_receive(:sudo).with("sh /etc/netstart em#{networks[1][:interface]}")
+    communicate.should_receive(:sudo).with(
+      "su -m root -c 'echo inet #{networks[2][:ip]} #{networks[2][:netmask]} > /etc/hostname.em#{networks[2][:interface]}'")
+    communicate.should_receive(:sudo).with("sh /etc/netstart em#{networks[2][:interface]}")
+
+    described_class.configure_networks(machine, networks)
+  end
+end

data/spec/cap/mount_virtualbox_shared_folder_spec.rb

@@ -0,0 +1,19 @@
+require 'vagrant-guests-solaris11/cap/mount_nfs_folder'
+require 'spec_helper'
+
+describe VagrantPlugins::GuestSolaris11::Cap::MountVirtualBoxSharedFolder do
+  include_context 'machine'
+
+  it "should mount nfs folders" do
+    ip = "192.168.1.1"
+    folders = {
+      'folder1' => {:guestpath => '/guest1', :hostpath => '/host1'},
+      'folder2' => {:guestpath => '/guest2', :hostpath => '/host2'}
+    }
+    folders.each do |name, opts|
+      communicate.should_receive(:sudo).with("mkdir -p #{opts[:guestpath]}")
+      communicate.should_receive(:sudo).with("mount '#{ip}:#{opts[:hostpath]}' '#{opts[:guestpath]}'")
+    end
+    described_class.mount_nfs_folder(machine, ip, folders)
+  end
+end

data/spec/guest_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 require 'vagrant-guests-solaris11/guest'
 
-describe VagrantPlugins::GuestSolaris11::Guest do
+describe VagrantPlugins::GuestSolaris::Guest do
   include_context 'machine'
 
-  it "should be detected with SunOS" do
+  it "should be detected with Solaris" do
     expect(communicate).to receive(:test).with('[ "$(uname -s)" = "SunOS" ]')
     guest.detect?(machine)
   end

data/spec/plugin_spec.rb

@@ -16,7 +16,7 @@ describe VagrantPlugins::GuestSolaris11::Plugin do
       :halt               => VagrantPlugins::GuestSolaris11::Cap::Halt,
       :change_host_name   => VagrantPlugins::GuestSolaris11::Cap::ChangeHostName,
       :configure_networks => VagrantPlugins::GuestSolaris11::Cap::ConfigureNetworks,
-      :mount_virtualbox_shared_folder   => VagrantPlugins::GuestSolaris11::Cap::MountVirtualBoxSharedFolder,
+      :mount_nfs_folder   => VagrantPlugins::GuestSolaris11::Cap::MountVirtualBoxSharedFolder,
       #:mount_nfs_folder   => VagrantPlugins::GuestSolaris11::Cap::MountNFSFolder,
     }.each do |cap, cls|
       it "should be capable of #{cap} with #{os}" do

data/vagrant-solaris11.gemspec

@@ -9,8 +9,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.name          = "vagrant-guests-solaris11"
   #spec.version       = VagrantPlugins::SOLARIS11::VERSION
-  #spec.version       = "0.0.2.dev"
-  spec.version       = File.read('VERSION')
+  spec.version       = "0.0.1.dev"
   #spec.platform      = Gem::Platform::RUBY
   spec.authors       = "Jan Thomas Moldung"
   spec.email         = "janth@moldung.no"
@@ -24,12 +23,11 @@ Gem::Specification.new do |spec|
 
   #spec.add_runtime_dependency "fog", "~> 1.10.0"
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "jeweler"
+  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-core"
-  spec.add_development_dependency "rspec-expectations"
-  spec.add_development_dependency "rspec-mocks"
+  spec.add_development_dependency "rspec-core", "~> 2.12.2"
+  spec.add_development_dependency "rspec-expectations", "~> 2.12.1"
+  spec.add_development_dependency "rspec-mocks", "~> 2.12.1"
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guests-solaris11
 version: !ruby/object:Gem::Version
-  version: 0.0.1a
+  version: 0.0.1.dev
 platform: ruby
 authors:
 - Jan Thomas Moldung
@@ -14,30 +14,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,44 +42,44 @@ dependencies:
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.1
 description: Enables Vagrant to manage Oracle Solaris 11 guests.
 email: janth@moldung.no
 executables: []
@@ -105,8 +91,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
-- develop.md
 - lib/vagrant-guests-solaris11.rb
 - lib/vagrant-guests-solaris11/cap/change_host_name.rb
 - lib/vagrant-guests-solaris11/cap/configure_networks.rb
@@ -114,8 +98,11 @@ files:
 - lib/vagrant-guests-solaris11/cap/mount_virtualbox_shared_folder.rb
 - lib/vagrant-guests-solaris11/guest.rb
 - lib/vagrant-guests-solaris11/plugin.rb
+- lib/vagrant-guests-solaris11/version.rb
 - spec/cap/change_host_name_spec.rb
+- spec/cap/configure_networks_spec.rb
 - spec/cap/halt_spec.rb
+- spec/cap/mount_virtualbox_shared_folder_spec.rb
 - spec/guest_spec.rb
 - spec/plugin_spec.rb
 - spec/spec_helper.rb
@@ -146,7 +133,9 @@ specification_version: 4
 summary: Enables Vagrant to manage Oracle Solaris 11 guests.
 test_files:
 - spec/cap/change_host_name_spec.rb
+- spec/cap/configure_networks_spec.rb
 - spec/cap/halt_spec.rb
+- spec/cap/mount_virtualbox_shared_folder_spec.rb
 - spec/guest_spec.rb
 - spec/plugin_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.1a

data/develop.md

@@ -1,64 +0,0 @@
-### Development
-
-To work on the `vagrant-guests-solaris11` plugin, clone [this repository
-out](https://github.com/janth/vagrant-guests-solaris11), and use
-[Bundler](http://gembundler.com) to get the dependencies:
-
-```bash
-bundle
-```
-
-Once you have the dependencies, verify the unit tests pass with `rake`:
-
-```bash
-bundle exec rake 
-```
-
-Other rake commands:
-```bash
-bundle exec rake --tasks
-bundle exec rake --trace build
-bundle exec rake --trace install
-bundle exec rake --trace release
-```
-
-
-If those pass, you're ready to start developing the plugin. You can test
-the plugin without installing it into your Vagrant environment by just
-creating a `Vagrantfile` in the top level of this directory (it is gitignored)
-and add the following line to your `Vagrantfile` 
-```ruby
-Vagrant.require_plugin "vagrant-guests-solaris11"
-```
-Use bundler to execute Vagrant:
-```bash
-bundle exec vagrant up <vagranthost>
-```
-### Cleanup
-
-```bash
-bundle exec rake clobber
-```
-
-### Similar projects
-
-* [vagrant-guests-openbsd](https://github.com/nabeken/vagrant-guests-openbsd.git)
-
-### Fork
-
-<!--
-https://github.com/jamesflorentino/fork-ribbons/blob/master/README.md
-https://github.com/aral/fork-me-on-github-retina-ribbons/blob/master/readme.md
-https://github.com/simonwhitaker/github-fork-ribbon-css
-https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
--->
-
-   <a href="https://github.com/janth/vagrant-guests-solarsi11/"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>
-   <a href="https://github.com/janth/vagrant-guests-solaris11"><img style="position: absolute; top: 0; right: 30px; border: 0;" src="https://github.com/jamesflorentino/fork-ribbons/raw/master/ribbons/green-white.png" alt="Fork me on GitHub"></a>
-
-   <!-- BOTTOM RIGHT RIBBON: START COPYING HERE -->
-   <div class="github-fork-ribbon-wrapper right-bottom">
-   <div class="github-fork-ribbon">
-   <a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on GitHub</a>
-   </div>
-   </div>