vagrant-hypconfigmgmt 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90bd5ff306b35e2bf425db3939e780bb8dff0595
-  data.tar.gz: 10aae1e915a238463a352c479d67cbca95b11075
+  metadata.gz: 5c35cc85aba9ab8744a0dbace26f2199da883ac4
+  data.tar.gz: 5a49e3025dbc978c7eb1a3320636c8bdb422d603
 SHA512:
-  metadata.gz: 270c7ebde3ea17f028c7094aed595ab3838a4c3546beeb4099e71e64496e570d725a026935019774f818fa7d7a112b5f9ca4ffa63338b88ef8ca70d47d2c56c4
-  data.tar.gz: bc95f48e4f18e6b55a7bef4c1b7cae959d3353f6be006f3e6a27912f8756bffe082534d6a57a29472047088a0a29dedf2ff77464772b4cebe535e9d8c3cab3c0
+  metadata.gz: 4fa29726ac01bcea9f248f33c17c02d9c28b319b9ef8fe6351e637119d8f804b6494f4e2b534a0a695c4b08500efea0014bdd5df9070a05aa22bb39a47370234
+  data.tar.gz: defae1c4cb0200e59d178bf8ee3118d354e3d5dff3b7335f48a33066df604331812ce64595ad596f32a5519feb0f8a53c2cfb9018a796aa4600a4d070cac51c5

data/Makefile

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

data/README.md

@@ -11,5 +11,33 @@ Create the gemfile (package)
 ```
 $ make
 rake build
-vagrant-hypconfigmgmt 0.0.10 built to pkg/vagrant-hypconfigmgmt-0.0.10.gem.
+vagrant-hypconfigmgmt 0.0.11 built to pkg/vagrant-hypconfigmgmt-0.0.11.gem.
 ```
+
+Installing a locally developed hypconfigmgmt
+============================================
+
+1. Bump the version to one later than the latest version
+
+Edit `Vagrantfile` and update `VAGRANT_HYPCONFIGMGMT_VERSION`
+
+Edit `vagrant/plugins/vagrant-hypconfigmgmt/README.md` and update the version there.
+
+Edit `vagrant/plugins/vagrant-hypconfigmgmt/lib/vagrant-hypconfigmgmt/version.rb` and update `VERSION`.
+
+2. Navigate to `vagrant/plugins/vagrant-hypconfigmgmt` and run `make && make install`
+
+
+Deploying a new vagrant-hypconfigmgmt
+=====================================
+
+1. Only for Byte staff members.
+
+2. Do the above, except the `make install` is not necessary
+
+3. Remove the previous latest gem from `vagrant/plugins/vagrant-hypconfigmgmt/pkg` so only your new version remains.
+
+4. Commit into your branch, make a PR, merge after review.
+
+5. Publish the new gem with `gem push vagrant-hypconfigmgmt-0.0.<YOURVERSION>.gem`, see http://guides.rubygems.org/publishing/ for details. Credentials are in the usual place.
+

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, 5.6, 7.0, 7.1]
+AVAILABLE_PHP_VERSIONS = [5.5, 5.6, 7.0, 7.1, 7.2]
 
 DEFAULT_VARNISH_STATE = false
 AVAILABLE_VARNISH_STATES = [true, false]
@@ -292,7 +292,7 @@ HEREDOC
         settings['vagrant']['box'] = 'hypernode_xenial'
         settings['vagrant']['box_url'] = 'http://vagrant.hypernode.com/customer/xenial/catalog.json'
       else
-        if [5.6, 7.1].include? settings['php']['version']
+        if [5.6, 7.1, 7.2].include? settings['php']['version']
           env[:ui].warning("The Precise Hypernodes don't have PHP#{settings['php']['version']}. Falling back to 5.5. Use the Xenial version of this box if you want PHP#{settings['php']['version']}")
           settings['php']['version'] = 5.5
         end

data/lib/vagrant-hypconfigmgmt/version.rb

@@ -3,6 +3,6 @@
 
 module Vagrant
   module Hypconfigmgmt 
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/spec/unit/command/ensure_vagrant_box_type_configured_spec.rb

@@ -218,6 +218,32 @@ describe VagrantHypconfigmgmt::Command do
     end
 
 
+    context "when php 7.2 is configured but no ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 7.2 }, "vagrant" => Hash.new } }
+      it "sets the box name and box url to the right values for PHP 7.2" do
+        expected_settings = { 
+          "ubuntu_version" => "precise",
+          "php" => { 
+            "version" => 5.5
+          },
+          "vagrant" => { 
+            # Falling back to php5.5, Precise Hypernodes have no PHP7.2
+            "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
@@ -244,7 +270,7 @@ describe VagrantHypconfigmgmt::Command do
     end
 
 
-    context "when php 5.6 is configured and precise ubuntu version specified" do
+    context "when php 7.1 is configured and precise ubuntu version specified" do
       let(:retrieved_settings) { { "php" => { "version" => 7.1 }, "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 = { 
@@ -270,6 +296,32 @@ describe VagrantHypconfigmgmt::Command do
     end
 
 
+    context "when php 7.2 is configured and precise ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 7.2 }, "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 PHP7.2
+            "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
@@ -320,6 +372,31 @@ describe VagrantHypconfigmgmt::Command do
     end
 
 
+    context "when php 7.2 is configured and xenial ubuntu version specified" do
+      let(:retrieved_settings) { { "php" => { "version" => 7.2 }, "vagrant" => Hash.new, "ubuntu_version" => "xenial" } }
+      it "sets the box name and box url to the right values for PHP 7.2" do
+        expected_settings = { 
+          "ubuntu_version" => "xenial",
+          "php" => { 
+            "version" => 7.2
+          }, 
+          "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 7.2
+        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, 5.6, 7.0, 7.1]) ).to eq("5.5 or 5.6 or 7.0 or 7.1")
+        expect( subject.get_options_string([5.5, 5.6, 7.0, 7.1]) ).to eq("5.5 or 5.6 or 7.0 or 7.1 or 7.2")
       end
     end
 

data/spec/unit/command/get_php_version_spec.rb

@@ -81,6 +81,21 @@ describe VagrantHypconfigmgmt::Command do
         expect( subject.get_php_version(env) ).to eq(7.1)
       end
     end
+
+
+    context "when PHP 7.2 is configured" do
+      it "it notifies the user that PHP 7.2 will be used and returns the value" do
+        # check if the setting is prompted for and pretend it returns a "PHP 7.2" 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("7.2")
+        # check if the user is notified about the PHP version
+        expect(ui).to receive(:info).once.with(/.*PHP 7.2*/)
+        # check if the function returns float 7.2 if a PHP 7.2 Vagrant is to be used
+        expect( subject.get_php_version(env) ).to eq(7.2)
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hypconfigmgmt
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Rick van de Loo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,7 @@ files:
 - lib/vagrant-hypconfigmgmt/command.rb
 - lib/vagrant-hypconfigmgmt/config.rb
 - lib/vagrant-hypconfigmgmt/version.rb
+- pkg/vagrant-hypconfigmgmt-0.0.10.gem
 - pkg/vagrant-hypconfigmgmt-0.0.9.gem
 - spec/spec_helper.rb
 - spec/unit/command/call_spec.rb