vagrant-skytap 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480e7f83e5897c107eba4d963a38d2ee78f99c03
-  data.tar.gz: f16ac5755836f903b00b5e17fc869047fac346ba
+  metadata.gz: 92ab283292efba6720a6ae941f353a1810e9b9e2
+  data.tar.gz: f4ad9c240aa4a0f6ad2029a9e1db5864b4cd19df
 SHA512:
-  metadata.gz: 3d7d04b62bea856d4e2793959e8e1eda1e440ca448d76ef9d9d410d70ac6609bb8ea4533bf0852bc12bca49506036391871d06a807e418fdff8638fdc5cb1a36
-  data.tar.gz: 6bbdfa1364406c86af282ef10fee557d344376334d685b06576f9be9d55432b7956caa2a9705c781c954d29c1509be9b9be6896267ef7e9917b557676950b24f
+  metadata.gz: bc829f8e0f1b6124da4f00ffc4a5d18b4d3e0a4cad4e0247b4103e76f073129fdd7e4c0515a663b2a45735993397854f4f801193d255518210c4460406b81870
+  data.tar.gz: c7b1d5cc0400d3076c7a03bd78b9e9a4486085917a609edc0c321356355b5d2e99309227f3327ccdf615fa612b46fc27ddaecbc63e6e6c13e2a84b68d165a1a2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.2.9 (February 26, 2016)
+
+* Re-add User-Agent string.
+* Set NFS host/guest IP addresses for synced folders of unspecified type 
+  (Vagrant can choose NFS as the default type, which resulted in an
+  error).
+* Don't allow suspending stopped VMs. Don't allow halting suspended VMs
+  without the --force flag.
+
 # 0.2.8 (February 24, 2016)
 
 * Revert change to User-Agent string, which contained a bug.

data/lib/vagrant-skytap/action/prepare_nfs_settings.rb

@@ -43,14 +43,25 @@ module VagrantPlugins
           @app.call(env)
         end
 
+        # Determine whether there are enabled synced folders defined
+        # for this machine which are either of type :nfs, or of the
+        # default type (Vagrant may choose NFS as the default).
+        # https://github.com/mitchellh/vagrant/issues/4192
+        #
+        # @return [Boolean]
         def using_nfs?
-          @machine.config.vm.synced_folders.any? { |_, opts| opts[:type] == :nfs }.tap do |ret|
-            @logger.debug("PrepareNFSSettings#using_nfs? returning #{ret}. Synced folders: #{@machine.config.vm.synced_folders.inspect}")
+          machine.config.vm.synced_folders.any? do |_, opts|
+            (opts[:type] == :nfs || opts[:type].blank?) unless opts[:disabled]
+          end.tap do |ret|
+            @logger.debug("PrepareNFSSettings#using_nfs? returning #{ret}. "\
+              "Synced folders: #{machine.config.vm.synced_folders.inspect}")
           end
         end
 
-        # Returns the IP address of the host, preferring one on an interface which
-        # the client can route to.
+        # Returns the IP address of the host, preferring one on an interface
+        # which the client can route to.
+        #
+        # @return [String]
         def read_host_ip
           UDPSocket.open do |s|
             s.connect(machine.ssh_info[:host], 1)
@@ -60,6 +71,9 @@ module VagrantPlugins
           end
         end
 
+        # Returns the IP address of the guest VM.
+        #
+        # @return [String]
         def read_machine_ip
           machine.ssh_info[:host]
         end

data/lib/vagrant-skytap/action.rb

@@ -38,7 +38,20 @@ module VagrantPlugins
               b1.use MessageNotCreated
             else
               b1.use ClearForwardedPorts
-              b1.use StopVm
+              # May not halt suspended machines without --force flag
+              b1.use Call, IsSuspended do |env2, b2|
+                if env2[:result]
+                  b2.use Call, IsEnvSet, :force_halt do |env3, b3|
+                    if env3[:result]
+                      b3.use StopVm
+                    else
+                      b3.use Message, I18n.t("vagrant_skytap.commands.halt.not_allowed_if_suspended")
+                    end
+                  end
+                else
+                  b2.use StopVm
+                end
+              end
             end
           end
         end
@@ -53,8 +66,14 @@ module VagrantPlugins
             when :missing_environment, :missing_vm, :no_vms
               b1.use MessageNotCreated
             else
-              b1.use ClearForwardedPorts
-              b1.use SuspendVm
+              b1.use Call, IsRunning do |env2, b2|
+                if env2[:result]
+                  b2.use ClearForwardedPorts
+                  b2.use SuspendVm
+                else
+                  b2.use Message, I18n.t("vagrant_skytap.commands.suspend.only_allowed_if_running")
+                end
+              end
             end
           end
         end

data/lib/vagrant-skytap/api/client.rb

@@ -21,6 +21,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 require 'base64'
+require "vagrant-skytap/version"
 
 module VagrantPlugins
   module Skytap
@@ -129,12 +130,16 @@ module VagrantPlugins
 
         private
 
+        def user_agent_string
+          "Vagrant-Skytap/#{VagrantPlugins::Skytap::VERSION} Vagrant/#{Vagrant::VERSION}"
+        end
 
         def default_headers
           {
             'Authorization' => auth_header,
             'Content-Type' => 'application/json',
-            'Accept' => 'application/json'
+            'Accept' => 'application/json',
+            'User-Agent' => user_agent_string,
           }
         end
 

data/lib/vagrant-skytap/version.rb

@@ -22,6 +22,6 @@
 
 module VagrantPlugins
   module Skytap
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

data/locales/en.yml

@@ -171,4 +171,16 @@ en:
           created through the Skytap UI) have been deleted. Users cannot
           manage these VMs, or access them through SmartClient, unless they
           have a Skytap user account with appropriate permissions.
-
+      halt:
+        not_allowed_if_suspended: |-
+          Suspended machines cannot be halted gracefully. Run `vagrant up`
+          or `vagrant resume` to run the machine before halting. Alternately,
+          you may power off the machine with `vagrant halt --force`, but
+          data corruption may occur.
+      suspend:
+        only_allowed_if_running: |-
+          Only running machines may be suspended. Run `vagrant up` before
+          suspending this machine.
+      resume:
+        only_allowed_if_suspended: |-
+          Only suspended machines may be resumed.

data/spec/unit/actions/prepare_nfs_settings_spec.rb

@@ -0,0 +1,106 @@
+# Copyright (c) 2014-2016 Skytap, Inc.
+#
+# The MIT License (MIT)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+require File.expand_path("../../base", __FILE__)
+require "vagrant-skytap/action/prepare_nfs_settings"
+
+describe VagrantPlugins::Skytap::Action::PrepareNFSSettings do
+  include_context "skytap"
+
+  let(:app) { lambda { |env| } }
+  let(:env) { { machine: machine} }
+
+  let(:machine)         { double(:machine, config: config, provider_config: provider_config, ssh_info: {host: guest_ip}) }
+  let(:config)          { double(:config, vm: vm_config) }
+  let(:vm_config)       { double(:vm_config, synced_folders: synced_folders) }
+  let(:provider_config) { double(:provider_config) }
+  let(:host_ip)         { '10.0.0.1' }
+  let(:guest_ip)        { '192.168.0.1' }
+  let(:using_nfs)       { false }
+
+  let(:default_folder_props) do
+    {guestpath: "/vagrant", hostpath: ".", disabled: false}
+  end
+  let(:synced_folders)  { { "/vagrant" => default_folder_props } }
+
+  let(:instance)        { described_class.new(app, env) }
+
+  before do
+    allow(instance).to receive(:machine).and_return(machine)
+    allow(subject).to receive(:using_nfs?).and_return(using_nfs)
+    allow(subject).to receive(:read_host_ip).and_return(host_ip)
+  end
+
+  describe "#call" do
+    subject {instance}
+
+    context "when not using nfs" do
+      it "does not set the host and guest ip addresses" do
+        expect(app).to receive(:call).with(env)
+        subject.call(env)
+        expect(env[:nfs_host_ip]).to be nil
+        expect(env[:nfs_machine_ip]).to be nil
+      end
+    end
+
+    context "when using nfs" do
+      let(:using_nfs) { true }
+      it "sets the host and guest ip addresses" do
+        expect(app).to receive(:call).with(env)
+        subject.call(env)
+        expect(env[:nfs_host_ip]).to eq host_ip
+        expect(env[:nfs_machine_ip]).to eq guest_ip
+      end
+    end
+  end
+
+  describe "using_nfs?" do
+    subject {instance.using_nfs?}
+
+    context "when there is only the default folder" do
+      context "when its type is unset" do
+        it {should be true }
+      end
+
+      context "when its type is rsync" do
+        let(:default_folder_props) do
+          {guestpath: "/vagrant", hostpath: ".", disabled: false, type: :rsync}
+        end
+        it {should be false }
+      end
+
+      context "when its type is nfs" do
+        let(:default_folder_props) do
+          {guestpath: "/vagrant", hostpath: ".", disabled: false, type: :nfs}
+        end
+        it {should be true }
+
+        context "when it is disabled" do
+          let(:default_folder_props) do
+            {guestpath: "/vagrant", hostpath: ".", disabled: true, type: :nfs}
+          end
+          it {should be false }
+        end
+      end
+    end
+  end
+end

data/spec/unit/api_client_spec.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2014-2016 Skytap, Inc.
+#
+# The MIT License (MIT)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+require_relative 'base'
+require "vagrant-skytap/api/client"
+
+describe VagrantPlugins::Skytap::API::Client do
+  include_context "rest_api"
+
+  let(:provider_config) do
+    double(:provider_config, vm_url: "/vms/1", username: "jsmith", api_token: "123123", base_url: base_url)
+  end
+  let(:instance)   { described_class.new(provider_config) }
+
+  before :each do
+    stub_request(:get, /.*/).to_return(body: "{}", status: 200)
+  end
+
+  describe "user_agent_string" do
+    subject do
+      instance.send(:user_agent_string)
+    end
+    it {should match %r{^Vagrant-Skytap/.* Vagrant/.*}}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Eric True
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -213,7 +213,9 @@ files:
 - README.md
 - spec/spec_helper.rb
 - spec/unit/actions/compose_environment_spec.rb
+- spec/unit/actions/prepare_nfs_settings_spec.rb
 - spec/unit/actions/update_hardware_spec.rb
+- spec/unit/api_client_spec.rb
 - spec/unit/base.rb
 - spec/unit/config_spec.rb
 - spec/unit/credentials_spec.rb