vagrant-hypconfigmgmt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e7f327afb4448aae5bd838e9a482cb0ca29f45
-  data.tar.gz: 7e990e3cee352ca9448da59794d3e977d05735ce
+  metadata.gz: 6730a56af721c8c091198340255a2333d919e72e
+  data.tar.gz: beba82b76a65bc87f9df90facfee55053520ab11
 SHA512:
-  metadata.gz: ff807968290422145ade5a92a499f6656f96e7e41eced9c693814de75b277016a86d3d2dbd90dc3541b42c6ab700c30e518af87e90982cae830f7723ff0a3f09
-  data.tar.gz: 679fe375389edba8d9b293954dc2f38a2571f316d6df8f0638e5702f7746c80ed16bdaa65b3c8c04ebe15aac1a8731d4d11976d08d10c982c77b0ce2f32e7fda
+  metadata.gz: 67044b50e77eddcbc5ef8ad55f2b7c9e3c0a68fe03fa0d9d65a983ab1f3fd32db6414f9c763cccf6af0364f6d279ce058fa82f626b1e8395245c98aa64f3904d
+  data.tar.gz: 4191d683a66dbd775d84315279d1ccb6f8a6d8aff15442a39484017a53369a88b65961731d79ef53a6bf6bde445c08a99ae205b3eb2e5d7f6162a5f1e91d3184

data/README.md

@@ -11,5 +11,5 @@ Create the gemfile (package)
 ```
 $ make
 rake build
-vagrant-hypconfigmgmt 0.0.7 built to pkg/vagrant-hypconfigmgmt-0.0.7.gem.
+vagrant-hypconfigmgmt 0.0.8 built to pkg/vagrant-hypconfigmgmt-0.0.8.gem.
 ```

data/lib/vagrant-hypconfigmgmt/command.rb

@@ -36,6 +36,9 @@ AVAILABLE_FS_TYPES = ['nfs', 'nfs_guest', 'virtualbox', 'rsync']
 # Perhaps we should consider using a different default on different platforms.
 DEFAULT_FS_TYPE = 'virtualbox'
 
+AVAILABLE_UBUNTU_VERSIONS = ['xenial', 'precise']
+DEFAULT_UBUNTU_VERSION = 'xenial'
+
 
 module VagrantHypconfigmgmt
   class Command
@@ -187,6 +190,20 @@ module VagrantHypconfigmgmt
     end
 
 
+    def get_ubuntu_version(env)
+      ask_message = "What Ubuntu version do you want to use? Options: xenial, precise (deprecated) [default #{DEFAULT_UBUNTU_VERSION}]: "
+      ubuntu_version = get_setting(env, AVAILABLE_UBUNTU_VERSIONS, DEFAULT_UBUNTU_VERSION, ask_message)
+      case ubuntu_version
+        when "xenial"
+          message = ("Will use the Xenial version. This is the default.")
+        when "precise"
+          message = ("Will use the Precise version (will soon be deprecated)")
+      end 
+      env[:ui].info(message)
+      return ubuntu_version
+    end
+
+
     # Make sure we don't link /data/web/public on Magento 2 Vagrants
     # because that dir will be a symlink to /data/web/magento2/pub and 
     # we mount that. On Magento 1 Vagrants we need to make sure we don't
@@ -268,9 +285,9 @@ HEREDOC
       end
     end
 
-
     def ensure_vagrant_box_type_configured(env)
       settings = retrieve_settings()
+      settings['ubuntu_version'] ||= get_ubuntu_version(env)
       if settings['ubuntu_version'] == 'xenial'
         settings['vagrant']['box'] = 'hypernode_xenial'
         settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/xenial/catalog.json'
@@ -289,7 +306,6 @@ HEREDOC
       update_settings(settings)
     end
 
-
     def ensure_default_domain_configured(env)
       settings = retrieve_settings()
       settings['hostmanager']['default_domain'] ||= DEFAULT_DOMAIN

data/lib/vagrant-hypconfigmgmt/version.rb

@@ -3,6 +3,6 @@
 
 module Vagrant
   module Hypconfigmgmt 
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/spec/unit/command/ensure_vagrant_box_type_configured_spec.rb

@@ -27,10 +27,11 @@ describe VagrantHypconfigmgmt::Command do
   # the method that we are going to test
   describe "#ensure_vagrant_box_type_configured" do
 
-    context "when php 7.0 is configured" do
+    context "when php 7.0 is configured but no ubuntu version specified" do
       let(:retrieved_settings) { { "php" => { "version" => 7.0 }, "vagrant" => Hash.new } }
       it "sets the box name and box url to the right values for PHP 7.0" do
 	expected_settings = { 
+          "ubuntu_version" => "precise",
           "php" => { 
 	    "version" => 7.0
 	  }, 
@@ -41,6 +42,8 @@ describe VagrantHypconfigmgmt::Command do
 	}
 	# check if settings are retrieved from disk and pretend they return a configuration for php 7.0
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is gotten and pretend it returns precise
+	expect(subject).to receive(:get_ubuntu_version).once.with(env).and_return('precise')
 	# check if the settings that are written back to disk contain the right box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
@@ -61,6 +64,8 @@ describe VagrantHypconfigmgmt::Command do
 	}
 	# check if settings are retrieved from disk and pretend they return a configuration for php 7.0
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is not gotten because we already have it specified in the settings
+	expect(subject).to receive(:get_ubuntu_version).never
 	# check if the settings that are written back to disk contain the right box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
@@ -81,15 +86,18 @@ describe VagrantHypconfigmgmt::Command do
 	}
 	# check if settings are retrieved from disk and pretend they return a configuration for php 7.0
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is not gotten because we already have it specified in the settings
+	expect(subject).to receive(:get_ubuntu_version).never
 	# check if the settings that are written back to disk contain the right box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
     end
 
-    context "when php 5.5 is configured" do
+    context "when php 5.5 is configured but no ubuntu version specified" do
       let(:retrieved_settings) { { "php" => { "version" => 5.5 }, "vagrant" => Hash.new } }
       it "sets the box name and box url to the right values for PHP 5.5" do
 	expected_settings = { 
+          "ubuntu_version" => "precise",
           "php" => { 
 	    "version" => 5.5 
 	  }, 
@@ -100,6 +108,8 @@ describe VagrantHypconfigmgmt::Command do
 	}
 	# check if settings are retrieved from disk and pretend they return a configuration for php 5.5
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is gotten and pretend it returns precise
+	expect(subject).to receive(:get_ubuntu_version).once.with(env).and_return('precise')
 	# check if the settings that are written back to disk contain the right box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
@@ -120,6 +130,8 @@ describe VagrantHypconfigmgmt::Command do
 	}
 	# check if settings are retrieved from disk and pretend they return a configuration for php 5.5
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is not gotten because we already have it specified in the settings
+	expect(subject).to receive(:get_ubuntu_version).never
 	# check if the settings that are written back to disk contain the right box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
@@ -140,6 +152,8 @@ describe VagrantHypconfigmgmt::Command do
 	}
 	# check if settings are retrieved from disk and pretend they return a configuration for php 5.5
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is not gotten because we already have it specified in the settings
+	expect(subject).to receive(:get_ubuntu_version).never
 	# check if the settings that are written back to disk contain the right box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
@@ -148,18 +162,29 @@ describe VagrantHypconfigmgmt::Command do
     context "when an unknown php version is configured" do
       let(:retrieved_settings) { { "php" => { "version" => 1.0 }, "vagrant" => Hash.new } }
       it "does not set the box name and box url" do
+	expected_settings = { 
+          "ubuntu_version" => "precise",
+          "php" => { 
+	    "version" => 1.0
+	  }, 
+	  "vagrant" => Hash.new
+	}
 	# check if settings are retrieved from disk and pretend they return an invalid php version
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is gotten and pretend it returns precise
+	expect(subject).to receive(:get_ubuntu_version).once.with(env).and_return('precise')
 	# check if the settings we write back to disk have an unaltered box (name) and box_url
-        expect(subject).to receive(:update_settings).once.with(retrieved_settings)
+        expect(subject).to receive(:update_settings).once.with(expected_settings)
       end
     end
 
-    context "when an unknown php version is configured and xenial ubuntu vreesion specified" do
+    context "when an unknown php version is configured and xenial ubuntu version specified" do
       let(:retrieved_settings) { { "php" => { "version" => 1.0 }, "vagrant" => Hash.new, "ubuntu_version" => "xenial" } }
       it "does not set the box name and box url" do
 	# check if settings are retrieved from disk and pretend they return an invalid php version
         expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+	# check if the ubuntu version is not gotten because we already have it specified in the settings
+	expect(subject).to receive(:get_ubuntu_version).never
 	# check if the settings we write back to disk have an unaltered box (name) and box_url
         expect(subject).to receive(:update_settings).once.with(retrieved_settings)
       end

data/spec/unit/command/get_ubuntu_version_spec.rb

@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+# vim: set fileencoding=utf-8
+
+require 'spec_helper'
+require "vagrant-hypconfigmgmt/command"
+
+describe VagrantHypconfigmgmt::Command do
+  # create a fake app and env to pass into the VagrantHypconfigmgmt::Command constructor
+  let(:app) { }
+  let(:env) { { :ui => ui } }
+
+  # pretend env contains the Vagrant ui element
+  let(:ui) do
+    double('ui').tap do |ui|
+      allow(ui).to receive(:info) { nil }
+    end
+  end
+
+
+  # instantiate class of which a method is to be tested
+  subject { described_class.new(app, env) }
+
+  # the method that we are going to test
+  describe "#ubuntu_version" do
+
+    context "when the user inputs ubuntu version precise" do
+      it "returns ubuntu version precise" do
+	# check if the setting is prompted for and pretend it returns a "precise" answer
+        expect(subject).to receive(:get_setting).with(
+	  env, AVAILABLE_UBUNTU_VERSIONS, DEFAULT_UBUNTU_VERSION,
+	  "What Ubuntu version do you want to use? Options: xenial, precise (deprecated) [default #{DEFAULT_UBUNTU_VERSION}]: "
+	).and_return("precise")
+        # check a message is printed about the ubuntu version
+        expect(ui).to receive(:info).once.with(/.*Precise.*deprecated.*/)
+	# check if the function returns "precise" 
+        expect( subject.get_ubuntu_version(env) ).to eq("precise")
+      end
+    end
+
+    context "when the user inputs ubuntu version xenial" do
+      it "returns ubuntu version xenial" do
+	# check if the setting is prompted for and pretend it returns a "virtualbox" answer
+        expect(subject).to receive(:get_setting).with(
+	  env, AVAILABLE_UBUNTU_VERSIONS, DEFAULT_UBUNTU_VERSION,
+	  "What Ubuntu version do you want to use? Options: xenial, precise (deprecated) [default #{DEFAULT_UBUNTU_VERSION}]: "
+	).and_return("xenial")
+        # check a message is printed about the ubuntu version
+        expect(ui).to receive(:info).once.with(/.*Xenial.*default.*/)
+	# check if the function returns "xenial" 
+        expect( subject.get_ubuntu_version(env) ).to eq("xenial")
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hypconfigmgmt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Rick van de Loo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ files:
 - lib/vagrant-hypconfigmgmt/command.rb
 - lib/vagrant-hypconfigmgmt/config.rb
 - lib/vagrant-hypconfigmgmt/version.rb
-- pkg/vagrant-hypconfigmgmt-0.0.6.gem
+- pkg/vagrant-hypconfigmgmt-0.0.7.gem
 - spec/spec_helper.rb
 - spec/unit/command/call_spec.rb
 - spec/unit/command/configure_cgroup_spec.rb
@@ -126,6 +126,7 @@ files:
 - spec/unit/command/get_options_string_spec.rb
 - spec/unit/command/get_php_version_spec.rb
 - spec/unit/command/get_setting_spec.rb
+- spec/unit/command/get_ubuntu_version_spec.rb
 - spec/unit/command/get_varnish_state_spec.rb
 - spec/unit/command/get_xdebug_state_spec.rb
 - spec/unit/command/inform_if_gatling_not_installed_spec.rb