vagrant-hypconfigmgmt 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6730a56af721c8c091198340255a2333d919e72e
-  data.tar.gz: beba82b76a65bc87f9df90facfee55053520ab11
+  metadata.gz: d76a9d48cf7ce3ceb694c7feac30adb63563f762
+  data.tar.gz: d87cbd2b7618529cec72d8d3501ebef9cb9069f1
 SHA512:
-  metadata.gz: 67044b50e77eddcbc5ef8ad55f2b7c9e3c0a68fe03fa0d9d65a983ab1f3fd32db6414f9c763cccf6af0364f6d279ce058fa82f626b1e8395245c98aa64f3904d
-  data.tar.gz: 4191d683a66dbd775d84315279d1ccb6f8a6d8aff15442a39484017a53369a88b65961731d79ef53a6bf6bde445c08a99ae205b3eb2e5d7f6162a5f1e91d3184
+  metadata.gz: 437077e4c2ee8fa22904b1456cb956ee36d498b31f9aefa692bef483dcd6607b29e0563f03558d1d51752718ce29fd90599c74e0ba79dd859aa2805be3eee906
+  data.tar.gz: 45ccf4934e1280d519ca02ede7715a51f96d9a86e1e4c6c1012e02cad5b1b9bcb13836aa6d7695ad5ca77ff23fa504ea47320aae8f09fe1b41eaec7bd2ca5cdd

data/README.md

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

data/lib/vagrant-hypconfigmgmt/command.rb

@@ -5,7 +5,7 @@ DEFAULT_MAGENTO_VERSION = 2
 AVAILABLE_MAGENTO_VERSIONS = [1, 2]
 
 DEFAULT_PHP_VERSION = 7.0
-AVAILABLE_PHP_VERSIONS = [5.5, 7.0]
+AVAILABLE_PHP_VERSIONS = [5.5, 5.6, 7.0]
 
 DEFAULT_VARNISH_STATE = false
 AVAILABLE_VARNISH_STATES = [true, false]
@@ -292,6 +292,10 @@ HEREDOC
         settings['vagrant']['box'] = 'hypernode_xenial'
         settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/xenial/catalog.json'
       else
+        if settings['php']['version'] == 5.6
+          env[:ui].warning("The Precise Hypernodes don't have PHP5.6. Falling back to 5.5. Use the Xenial version of this box if you want PHP5.6")
+          settings['php']['version'] = 5.5
+        end
         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.")

data/lib/vagrant-hypconfigmgmt/version.rb

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

data/spec/unit/command/ensure_vagrant_box_type_configured_spec.rb

@@ -13,6 +13,7 @@ describe VagrantHypconfigmgmt::Command do
   let(:ui) do
     double('ui').tap do |ui|
       allow(ui).to receive(:info) { nil }
+      allow(ui).to receive(:warning) { nil }
     end
   end
 
@@ -159,6 +160,80 @@ describe VagrantHypconfigmgmt::Command do
       end
     end
 
+    context "when php 5.6 is configured but no ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 5.6 }, "vagrant" => Hash.new } }
+      it "sets the box name and box url to the right values for PHP 5.6" do
+	expected_settings = { 
+          "ubuntu_version" => "precise",
+          "php" => { 
+	    "version" => 5.5
+	  },
+	  "vagrant" => { 
+            # Falling back to php5.5, Precise Hypernodes have no PHP5.6
+	    "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 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)
+	# check if the user is warned about falling back to 5.5
+	expect(ui).to receive(:warning).once.with(/.*Falling back to 5.5*/)
+      end
+    end
+
+    context "when php 5.6 is configured and precise ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 5.6 }, "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" => { 
+            # Falling back to php5.5, Precise Hypernodes have no PHP5.6
+	    "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 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)
+	# check if the user is warned about falling back to 5.5
+	expect(ui).to receive(:warning).once.with(/.*Falling back to 5.5*/)
+      end
+    end
+
+    context "when php 5.6 is configured and xenial ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 5.6 }, "vagrant" => Hash.new, "ubuntu_version" => "xenial" } }
+      it "sets the box name and box url to the right values for PHP 5.6" do
+	expected_settings = { 
+          "ubuntu_version" => "xenial",
+          "php" => { 
+	    "version" => 5.6
+	  }, 
+	  "vagrant" => { 
+	    "box" => "hypernode_xenial", 
+	    "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)
+	# 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)
+	# check that the user is not warned about falling back because we do have 5.6 on Xenial
+	expect(ui).to receive(:warning).never
+      end
+    end
+
     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

data/spec/unit/command/get_options_string_spec.rb

@@ -34,7 +34,7 @@ describe VagrantHypconfigmgmt::Command do
 
     context "when the options are floats" do
       it "it casts the floats to strings and returns them separated by 'or'" do
-        expect( subject.get_options_string([5.5, 7.0]) ).to eq("5.5 or 7.0")
+        expect( subject.get_options_string([5.5, 5.6, 7.0]) ).to eq("5.5 or 5.6 or 7.0")
       end
     end
 

data/spec/unit/command/get_php_version_spec.rb

@@ -38,6 +38,21 @@ describe VagrantHypconfigmgmt::Command do
     end
 
 
+    context "when PHP 5.6 is configured" do
+      it "it notifies the user that PHP 5.6 will be used and returns the value" do
+	# check if the setting is prompted for and pretend it returns a "PHP 5.6" answer
+        expect(subject).to receive(:get_setting).with(
+	  env, AVAILABLE_PHP_VERSIONS, DEFAULT_PHP_VERSION,
+	  "Is this a PHP #{subject.get_options_string(AVAILABLE_PHP_VERSIONS)} Hypernode? [default #{DEFAULT_PHP_VERSION}]: "
+	).and_return("5.6")
+        # check if the user is notified about the PHP version
+        expect(ui).to receive(:info).once.with(/.*PHP 5.6*/)
+	# check if the function returns float 5.5 if a PHP 5.5 Vagrant is to be used
+        expect( subject.get_php_version(env) ).to eq(5.6)
+      end
+    end
+
+
     context "when PHP 7.0 is configured" do
       it "it notifies the user that PHP 7.0 will be used and returns the value" do
 	# check if the setting is prompted for and pretend it returns a "PHP 7.0" answer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hypconfigmgmt
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Rick van de Loo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-07-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.7.gem
+- pkg/vagrant-hypconfigmgmt-0.0.8.gem
 - spec/spec_helper.rb
 - spec/unit/command/call_spec.rb
 - spec/unit/command/configure_cgroup_spec.rb