vagrant-hypconfigmgmt 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcdc33fece45adb733b862dbc4187237f4e174d4
-  data.tar.gz: c6fd87ee4876d7124d13a2f933174e3241152030
+  metadata.gz: 37e5a7641e42c8af9f12aae45a852020ceaf1c8a
+  data.tar.gz: efaa3f9988ad512b94ad777d515b6742d7548061
 SHA512:
-  metadata.gz: 5b51824b6737089497a1cb1d9047d48cb6e9917a74be2b6ae8440c55c8c47074654920ad57d17f2e7b8477a285d00e655885f83b0a990a08c1a0e28b3ecb349d
-  data.tar.gz: eb793c0fcc241b43dc41af702f92f7aea9bf883ce53179e68f09ec771993c09bd69cb8e16b6d3f47f081da84dad188836ec0bbf51a2ea70366f93b09543e2ee1
+  metadata.gz: 3712a2116da7bc8bd03966c7d57002010e2abcb7f83ad9d46ae02a83982b8333178555c55a8607035d3e51cd89590c83b9afe9b443a1188f66012471a394e0ec
+  data.tar.gz: ce7b39b7ea26cc1e5757efd4b9e53ec4b4153575eb13c8a549b730caef398d269b1ecbe4b29a73d82d5b9caca7d8aefa9a923ae66b9adbc0e5b31f66b95cae03

data/Makefile

@@ -10,7 +10,7 @@ all:
 test:
 	bundle exec rspec spec/
 install:
-	find pkg/ -name '*.gem' | head -n 1 | xargs vagrant plugin install
+	find pkg/ -name '*.gem' | tail -n 1 | xargs vagrant plugin install
 clean:
 	git clean -xfd
 

data/README.md

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

data/lib/vagrant-hypconfigmgmt/command.rb

@@ -19,6 +19,8 @@ AVAILABLE_CGROUP_STATES = [true, false]
 DEFAULT_XDEBUG_STATE = false
 AVAILABLE_XDEBUG_STATES = [true, false]
 
+DEFAULT_DOMAIN = 'hypernode.local'
+
 # paths to local settings file
 H_V_SETTINGS_FILE = "local.yml"
 H_V_BASE_SETTINGS_FILE = ".local.base.yml"
@@ -269,19 +271,31 @@ HEREDOC
 
     def ensure_vagrant_box_type_configured(env)
       settings = retrieve_settings()
-      case settings['php']['version']
-        when 5.5
-          env[:ui].info("Will use PHP 5.5. If you want PHP 7 instead change the php version in local.yml.")
-          settings['vagrant']['box'] = 'hypernode_php5'
-          settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/php5/catalog.json'
-        when 7.0
-          env[:ui].info("Will use PHP 7. If you want PHP 5.5 instead change the php version in local.yml.")
-          settings['vagrant']['box'] = 'hypernode_php7'
-          settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/php7/catalog.json'
+      if settings['ubuntu_version'] == 'xenial'
+        settings['vagrant']['box'] = 'hypernode'
+        settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/xenial/catalog.json'
+      else
+        case settings['php']['version']
+          when 5.5
+            env[:ui].info("Will use PHP 5.5. If you want PHP 7 instead change the php version in local.yml.")
+            settings['vagrant']['box'] = 'hypernode_php5'
+            settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/php5/catalog.json'
+          when 7.0
+            env[:ui].info("Will use PHP 7. If you want PHP 5.5 instead change the php version in local.yml.")
+            settings['vagrant']['box'] = 'hypernode_php7'
+            settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/php7/catalog.json'
+        end
       end
       update_settings(settings)
     end
 
+
+    def ensure_default_domain_configured(env)
+      settings = retrieve_settings()
+      settings['hostmanager']['default_domain'] ||= DEFAULT_DOMAIN
+      update_settings(settings)
+    end
+
       
     def ensure_firewall_disabled_for_incompatible_fs_types(env)
       settings = retrieve_settings()
@@ -368,6 +382,12 @@ HEREDOC
       ensure_setting_exists('vagrant')
       ensure_vagrant_box_type_configured(env)
     end
+
+
+    def configure_hostmanager(env)
+      ensure_setting_exists('hostmanager')
+      ensure_default_domain_configured(env)
+    end
     
     
     def ensure_settings_configured(env)
@@ -380,6 +400,7 @@ HEREDOC
       configure_cgroup(env)
       configure_xdebug(env)
       configure_vagrant(env)
+      configure_hostmanager(env)
       new_settings = retrieve_settings()
       return new_settings.to_yaml != old_settings.to_yaml
     end

data/lib/vagrant-hypconfigmgmt/version.rb

@@ -3,6 +3,6 @@
 
 module Vagrant
   module Hypconfigmgmt 
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/spec/unit/command/configure_hostmanager_spec.rb

@@ -0,0 +1,33 @@
+# -*- 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) { }
+
+  # Call the method under test after every 'it'. Similar to setUp in Python TestCase
+  after do
+    subject.configure_hostmanager(env)
+  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 "#configure_hostmanager" do
+
+    context "when env is passed" do
+      it "configures the settings for the hostmanager" do
+	# check the hostmanager settings is ensured to exist in the configuration file
+        expect(subject).to receive(:ensure_setting_exists).with('hostmanager')
+	# check the default domain is configured for the hostmanager
+	expect(subject).to receive(:ensure_default_domain_configured).with(env)
+      end
+    end
+  end
+end
+

data/spec/unit/command/configure_vagrant_spec.rb

@@ -24,7 +24,7 @@ describe VagrantHypconfigmgmt::Command do
       it "configures the settings for vagrant" do
 	# check the vagrant settings is ensured to exist in the configuration file
         expect(subject).to receive(:ensure_setting_exists).with('vagrant')
-	# check the vagrant box type is set to the right box for the pPHP version
+	# check the vagrant box type is set to the right box for the PHP version
 	expect(subject).to receive(:ensure_vagrant_box_type_configured).with(env)
       end
     end

data/spec/unit/command/ensure_default_domain_configured_spec.rb

@@ -0,0 +1,50 @@
+# -*- 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) { { } }
+
+  # Call the method under test after every 'it'. Similar to setUp in Python TestCase
+  after do
+    subject.ensure_default_domain_configured(env)
+  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 "#ensure_default_domain_configured" do
+
+    context "when a default domain is configured" do
+      let(:retrieved_settings) { { "hostmanager" => { "default_domain" => "example.com" } } }
+      it "does not change the retrieved settings" do
+        # check if settings are retrieved from disk and pretend they return a configuration for domain configured
+        expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+        # check if the settings that are written back to disk contain the same data
+        expect(subject).to receive(:update_settings).once.with(retrieved_settings)
+      end
+    end
+
+    context "when no default domain is configured" do
+      let(:retrieved_settings) { { "hostmanager" => Hash.new } }
+      it "sets the default domain to the default domain" do
+      expected_settings = { 
+          "hostmanager" => { 
+          "default_domain" => "hypernode.local"
+        }
+      }
+      # check if settings are retrieved from disk and pretend they return a configuration for domain not configured
+      expect(subject).to receive(:retrieve_settings).once.with(no_args).and_return(retrieved_settings)
+      # check if the settings that are written back to disk contain the default domain
+      expect(subject).to receive(:update_settings).once.with(expected_settings)
+      end
+    end
+  end
+end
+
+

data/spec/unit/command/ensure_settings_are_configured_spec.rb

@@ -49,6 +49,8 @@ describe VagrantHypconfigmgmt::Command do
         expect(subject).to receive(:configure_xdebug).with(env)
 	# check the vagrant settings are configured
         expect(subject).to receive(:configure_vagrant).with(env)
+	# check the hostmanager settings are configured
+        expect(subject).to receive(:configure_hostmanager).with(env)
 	# check true is returned when settings are updated
 	expect( subject.ensure_settings_configured(env) ).to eq(true)
       end
@@ -74,6 +76,8 @@ describe VagrantHypconfigmgmt::Command do
         expect(subject).to receive(:configure_xdebug).with(env)
 	# check the vagrant settings are configured
         expect(subject).to receive(:configure_vagrant).with(env)
+	# check the hostmanager settings are configured
+        expect(subject).to receive(:configure_hostmanager).with(env)
 	# check false is returned when settings are not updated
 	expect( subject.ensure_settings_configured(env) ).to eq(false)
       end

data/spec/unit/command/ensure_vagrant_box_type_configured_spec.rb

@@ -36,7 +36,48 @@ describe VagrantHypconfigmgmt::Command do
 	  }, 
 	  "vagrant" => { 
 	    "box" => "hypernode_php7", 
-	    "box_url" => "http://vagrant.hypernode.com/customer/php7/catalog.json" } 
+	    "box_url" => "http://vagrant.hypernode.com/customer/php7/catalog.json" 
+	  } 
+	}
+	# 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 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 7.0 is configured and precise ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 7.0 }, "vagrant" => Hash.new, "ubuntu_version" => "precise" } }
+      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
+	  }, 
+	  "vagrant" => { 
+	    "box" => "hypernode_php7", 
+	    "box_url" => "http://vagrant.hypernode.com/customer/php7/catalog.json" 
+	  } 
+	}
+	# 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 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 7.0 is configured and xenial ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 7.0 }, "vagrant" => Hash.new, "ubuntu_version" => "xenial" } }
+      it "sets the box name and box url to the right values for PHP 7.0" do
+	expected_settings = { 
+          "ubuntu_version" => "xenial",
+          "php" => { 
+	    "version" => 7.0
+	  }, 
+	  "vagrant" => { 
+	    "box" => "hypernode", 
+	    "box_url" => "http://vagrant.hypernode.com/customer/xenial/catalog.json" 
+	  } 
 	}
 	# 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)
@@ -54,7 +95,48 @@ describe VagrantHypconfigmgmt::Command do
 	  }, 
 	  "vagrant" => { 
 	    "box" => "hypernode_php5", 
-	    "box_url" => "http://vagrant.hypernode.com/customer/php5/catalog.json" } 
+	    "box_url" => "http://vagrant.hypernode.com/customer/php5/catalog.json" 
+	  } 
+	}
+	# 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 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 and precise ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 5.5 }, "vagrant" => Hash.new, "ubuntu_version" => "precise" } }
+      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 
+	  }, 
+	  "vagrant" => { 
+	    "box" => "hypernode_php5", 
+	    "box_url" => "http://vagrant.hypernode.com/customer/php5/catalog.json" 
+	  } 
+	}
+	# 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 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 and xenial ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 5.5 }, "vagrant" => Hash.new, "ubuntu_version" => "xenial" } }
+      it "sets the box name and box url to the right values for PHP 5.5" do
+	expected_settings = { 
+          "ubuntu_version" => "xenial",
+          "php" => { 
+	    "version" => 5.5 
+	  }, 
+	  "vagrant" => { 
+	    "box" => "hypernode", 
+	    "box_url" => "http://vagrant.hypernode.com/customer/xenial/catalog.json" 
+	  } 
 	}
 	# 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)
@@ -65,7 +147,17 @@ describe VagrantHypconfigmgmt::Command do
 
     context "when an unknown php version is configured" do
       let(:retrieved_settings) { { "php" => { "version" => 1.0 }, "vagrant" => Hash.new } }
-      it "do not set the box name and box url" do
+      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 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
+    end
+
+    context "when an unknown php version is configured and xenial ubuntu vreesion 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 settings we write back to disk have an unaltered box (name) and box_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hypconfigmgmt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rick van de Loo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,10 +98,12 @@ files:
 - lib/vagrant-hypconfigmgmt/command.rb
 - lib/vagrant-hypconfigmgmt/config.rb
 - lib/vagrant-hypconfigmgmt/version.rb
+- pkg/vagrant-hypconfigmgmt-0.0.5.gem
 - spec/spec_helper.rb
 - spec/unit/command/call_spec.rb
 - spec/unit/command/configure_cgroup_spec.rb
 - spec/unit/command/configure_firewall_spec.rb
+- spec/unit/command/configure_hostmanager_spec.rb
 - spec/unit/command/configure_magento_spec.rb
 - spec/unit/command/configure_php_spec.rb
 - spec/unit/command/configure_synced_folders_spec.rb
@@ -109,6 +111,7 @@ files:
 - spec/unit/command/configure_varnish_spec.rb
 - spec/unit/command/configure_xdebug_spec.rb
 - spec/unit/command/ensure_attribute_configured_spec.rb
+- spec/unit/command/ensure_default_domain_configured_spec.rb
 - spec/unit/command/ensure_firewall_disabled_for_incompatible_fs_types_spec.rb
 - spec/unit/command/ensure_fs_type_configured_spec.rb
 - spec/unit/command/ensure_magento_mounts_configured_spec.rb