vagrant-skytap 0.2.2 → 0.2.3

data/spec/unit/environment_spec.rb

@@ -3,7 +3,6 @@ require_relative 'base'
 describe VagrantPlugins::Skytap::API::Environment do
   include_context "unit"
   include_context "rest_api"
-  Errors = VagrantPlugins::Skytap::Errors
 
   let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
   let(:vm1_attrs) { read_json(json_path, 'vm1.json') }
@@ -60,71 +59,53 @@ describe VagrantPlugins::Skytap::API::Environment do
   end
 
   describe "check_vm_before_adding class method" do
-    after(:each) do
-      allow(subject).to receive(:runstate).and_call_original
-    end
-
-    subject do
-      instance.vms.first
-    end
+    let(:template_vm)    {double(:template_vm,    id: 1, :stopped? => true,  parent_url: "https://example.com/templates/1")}
+    let(:environment_vm) {double(:environment_vm, id: 2, :stopped? => true,  parent_url: "https://example.com/configurations/1")}
+    let(:running_vm)     {double(:running_vm,     id: 3, :stopped? => false, parent_url: "https://example.com/templates/1", url: "https://example.com/vms/1")}
 
-    it "raises SourceVmNotStopped if the vm is running" do
-      allow(subject).to receive(:runstate).and_return('running')
-      expect {described_class.check_vm_before_adding(env, subject)}.to raise_error(Errors::SourceVmNotStopped)
-    end
+    let(:vm_in_different_template)        {double(:vm_in_different_template, id: 4, :stopped? => true, parent_url: "https://example.com/templates/2")}
+    let(:vm_in_different_environment)     {double(:vm_in_different_environment, id: 5, :stopped? => true, parent_url: "https://example.com/configurations/2")}
+    let(:environment_in_different_region) {double(:environment_in_different_region, region: "EMEA")}
+    let(:vm_in_different_region)          {double(:vm_in_different_region, id: 6, :stopped? => true, parent_url: "https://example.com/templates/3", parent: environment_in_different_region)}
 
-    it "raises SourceVmNotStopped if the vm is suspended" do
-      allow(subject).to receive(:runstate).and_return('suspended')
-      expect {described_class.check_vm_before_adding(env, subject)}.to raise_error(Errors::SourceVmNotStopped)
+    it "raises SourceVmNotStopped if the vm is not stopped" do
+      expect {described_class.check_vms_before_adding([running_vm])}.to raise_error(Errors::SourceVmNotStopped)
     end
 
     it "raises nothing if the vm is stopped" do
-      allow(subject).to receive(:runstate).and_return('stopped')
-      expect {described_class.check_vm_before_adding(env, subject)}.to_not raise_error
+      expect {described_class.check_vms_before_adding([template_vm])}.to_not raise_error
     end
 
-    it "raises nothing if the vm is part of an environment" do
-      vm = VagrantPlugins::Skytap::API::Vm.new(config_vm_attrs, nil, env)
-      expect {described_class.check_vm_before_adding(env, vm)}.to_not raise_error
+    it "raises nothing if the vm is part of a template" do
+      expect {described_class.check_vms_before_adding([template_vm])}.to_not raise_error
     end
 
-    it "raises SourceVmNotStopped if the environment vm is running" do
-      vm = VagrantPlugins::Skytap::API::Vm.new(config_vm_attrs, nil, env)
-      allow(vm).to receive(:runstate).and_return('running')
-      expect {described_class.check_vm_before_adding(env, vm)}.to raise_error(Errors::SourceVmNotStopped)
+    it "raises nothing if the vm is part of an environment" do
+      expect {described_class.check_vms_before_adding([environment_vm])}.to_not raise_error
     end
 
-    it "raises SourceVmNotStopped if the environment vm is suspended" do
-      vm = VagrantPlugins::Skytap::API::Vm.new(config_vm_attrs, nil, env)
-      allow(vm).to receive(:runstate).and_return('suspended')
-      expect {described_class.check_vm_before_adding(env, vm)}.to raise_error(Errors::SourceVmNotStopped)
+    it "raises nothing if both vms are part of same template" do
+      expect {described_class.check_vms_before_adding([template_vm, template_vm])}.to_not raise_error
     end
-  end
 
-  describe "check_vm_before_adding instance method" do
-    after(:each) do
-      allow(subject).to receive(:region).and_call_original
-      allow(subject).to receive(:runstate).and_call_original
+    it "raises nothing if both vms are part of same environment" do
+      expect {described_class.check_vms_before_adding([environment_vm, environment_vm])}.to_not raise_error
     end
 
-    subject do
-      instance.vms.first
+    it "raises VmParentMismatch if vms are from different environments" do
+      expect {described_class.check_vms_before_adding([environment_vm, vm_in_different_environment])}.to raise_error(Errors::VmParentMismatch)
     end
 
-    it "raises RegionMismatch if the vm is in a different region" do
-      allow(subject).to receive(:region).and_return('EMEA')
-      expect {subject.environment.check_vm_before_adding(env, subject)}.to raise_error(Errors::RegionMismatch)
+    it "raises VmParentMismatch if vms are from different templates" do
+      expect {described_class.check_vms_before_adding([template_vm, vm_in_different_template])}.to raise_error(Errors::VmParentMismatch)
     end
 
-    it "raises SourceVmNotStopped if the vm is in the same region but running" do
-      allow(subject).to receive(:region).and_return('US-West')
-      allow(subject).to receive(:runstate).and_return('running')
-      expect {subject.environment.check_vm_before_adding(env, subject)}.to raise_error(Errors::SourceVmNotStopped)
+    it "raises VmParentMismatch if vms are from an environment and template" do
+      expect {described_class.check_vms_before_adding([template_vm, environment_vm])}.to raise_error(Errors::VmParentMismatch)
     end
 
-    it "raises nothing if the vm is in the same region" do
-      allow(subject).to receive(:region).and_return('US-West')
-      expect {subject.environment.check_vm_before_adding(env, subject)}.to_not raise_error
+    it "raises RegionMismatch if vm is from a template in a different region from the given environment" do
+      expect {described_class.check_vms_before_adding([vm_in_different_region], instance)}.to raise_error(Errors::RegionMismatch)
     end
   end
 

data/spec/unit/support/shared/skytap_context.rb

@@ -1,4 +1,9 @@
+require "vagrant-skytap/api/client"
+
 shared_context "skytap" do
+  Errors = VagrantPlugins::Skytap::Errors
+  API = VagrantPlugins::Skytap::API
+
   def read_json(*args)
     JSON.load(File.read(File.join(args)))
   end

data/vagrant-skytap.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.version       = VagrantPlugins::Skytap::VERSION
   s.platform      = Gem::Platform::RUBY
   s.license       = "MIT"
-  s.authors       = "Nick Astete"
-  s.email         = "nastete@skytap.com"
+  s.authors       = ["Eric True", "Nick Astete"]
+  s.email         = ["etrue@skytap.com", "nastete@skytap.com"]
   s.homepage      = "http://www.skytap.com"
-  s.summary       = "Enables Vagrant to manage Skytap machines."
+  s.summary       = "Vagrant provider plugin for Skytap."
   s.description   = "Enables Vagrant to manage Skytap machines."
 
   s.required_rubygems_version = ">= 1.3.6"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
+- Eric True
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -109,316 +110,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.20'
 description: Enables Vagrant to manage Skytap machines.
-email: nastete@skytap.com
+email:
+- etrue@skytap.com
+- nastete@skytap.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- _patches-20160112/0
-- _patches-20160112/1
-- _patches-20160112/2
-- _patches-20160112/acceptance-test-runner
-- _patches-20160112/ansible-1
-- _patches-20160112/cache-api-client-in-up
-- _patches-20160112/COMPLETED-ABOVE-THIS-LINE
-- _patches-20160112/COMPLETED-BELOW-THIS-LINE
-- _patches-20160112/CR-ABOVE-THIS-LINE
-- _patches-20160112/CR-BELOW-THIS-LINE
-- _patches-20160112/dead-code-in-actions
-- _patches-20160112/debug-changes
-- _patches-20160112/demo-rails-app
-- _patches-20160112/eng-10166-halt-spec
-- _patches-20160112/eng-10256
-- _patches-20160112/eng-10256-2
-- _patches-20160112/eng-10256-ubuntu-testing
-- _patches-20160112/eng-10269-test-stuff
-- _patches-20160112/eng-10269-wtf
-- _patches-20160112/eng-10369
-- _patches-20160112/eng-10369-tmp
-- _patches-20160112/eng-10919
-- _patches-20160112/eng-11177-fix-actions-requires
-- _patches-20160112/eng-11442
-- _patches-20160112/eng-11616
-- _patches-20160112/eng-11616-2
-- _patches-20160112/eng-11616-actual
-- _patches-20160112/eng-11625a
-- _patches-20160112/eng-11711
-- _patches-20160112/eng-12232-command-spec
-- _patches-20160112/eng-12235
-- _patches-20160112/eng-12235-override-refactor
-- _patches-20160112/eng-12240
-- _patches-20160112/eng-12249
-- _patches-20160112/eng-12301
-- _patches-20160112/eng-12843
-- _patches-20160112/env-source
-- _patches-20160112/frickin-vagrant-spec
-- _patches-20160112/gem-pre-version
-- _patches-20160112/gems-old
-- _patches-20160112/googles-specs
-- _patches-20160112/local-configs-ignore
-- _patches-20160112/misc
-- _patches-20160112/network-unreachable
-- _patches-20160112/new-boxfile
-- _patches-20160112/parallelization-maybe
-- _patches-20160112/read-state
-- _patches-20160112/refactor-to-use-public_address-cap
-- _patches-20160112/series
-- _patches-20160112/status
-- _patches-20160112/test-move-env-data
-- _patches-20160112/test-vagrantfile-vm1
-- _patches-20160112/the_version_in_0.1.13.pre1
-- _patches-20160112/vagrant-spec-mock-api
-- _patches-20160112/vagrant-vmware-plugin
-- _patches-20160112/vagrantfile
-- _patches-20160112/vagrantfile-for-acceptance-tests
-- _patches-20160112/vagrantfile-for-nick
-- _patches-20160112/vagrantfiles-to-forget-what-they-are-for
-- _patches-20160112/vm-vanished
-- _patches-20160112/WIP-ABOVE-THIS-LINE
-- _patches-20160112/WIP-BELOW-THIS-LINE
-- _patches-20160112a/01
-- _patches-20160112a/2
-- _patches-20160112a/acceptance-test-runner
-- _patches-20160112a/ansible-1
-- _patches-20160112a/cache-api-client-in-up
-- _patches-20160112a/COMPLETED-ABOVE-THIS-LINE
-- _patches-20160112a/COMPLETED-BELOW-THIS-LINE
-- _patches-20160112a/CR-ABOVE-THIS-LINE
-- _patches-20160112a/CR-BELOW-THIS-LINE
-- _patches-20160112a/dead-code-in-actions
-- _patches-20160112a/debug-changes
-- _patches-20160112a/demo-rails-app
-- _patches-20160112a/eng-10166-halt-spec
-- _patches-20160112a/eng-10256-ubuntu-testing
-- _patches-20160112a/eng-10269-test-stuff
-- _patches-20160112a/eng-10269-wtf
-- _patches-20160112a/eng-10369
-- _patches-20160112a/eng-10369-tmp
-- _patches-20160112a/eng-10919
-- _patches-20160112a/eng-11177-fix-actions-requires
-- _patches-20160112a/eng-11442
-- _patches-20160112a/eng-11616
-- _patches-20160112a/eng-11616-2
-- _patches-20160112a/eng-11616-actual
-- _patches-20160112a/eng-11625a
-- _patches-20160112a/eng-11711
-- _patches-20160112a/eng-12232-command-spec
-- _patches-20160112a/eng-12235
-- _patches-20160112a/eng-12235-override-refactor
-- _patches-20160112a/eng-12240
-- _patches-20160112a/eng-12249
-- _patches-20160112a/eng-12301
-- _patches-20160112a/eng-12843
-- _patches-20160112a/env-source
-- _patches-20160112a/frickin-vagrant-spec
-- _patches-20160112a/gem-pre-version
-- _patches-20160112a/gems-old
-- _patches-20160112a/googles-specs
-- _patches-20160112a/local-configs-ignore
-- _patches-20160112a/misc
-- _patches-20160112a/network-unreachable
-- _patches-20160112a/new-boxfile
-- _patches-20160112a/parallelization-maybe
-- _patches-20160112a/read-state
-- _patches-20160112a/refactor-to-use-public_address-cap
-- _patches-20160112a/series
-- _patches-20160112a/status
-- _patches-20160112a/test-move-env-data
-- _patches-20160112a/test-vagrantfile-vm1
-- _patches-20160112a/the_version_in_0.1.13.pre1
-- _patches-20160112a/then-copy-the-newer-files
-- _patches-20160112a/vagrant-spec-mock-api
-- _patches-20160112a/vagrant-vmware-plugin
-- _patches-20160112a/vagrantfile
-- _patches-20160112a/vagrantfile-for-acceptance-tests
-- _patches-20160112a/vagrantfile-for-nick
-- _patches-20160112a/vagrantfiles-to-forget-what-they-are-for
-- _patches-20160112a/vm-vanished
-- _patches-20160112a/WIP-ABOVE-THIS-LINE
-- _patches-20160112a/WIP-BELOW-THIS-LINE
-- _patches-20160113/acceptance-test-runner
-- _patches-20160113/ansible-1
-- _patches-20160113/cache-api-client-in-up
-- _patches-20160113/COMPLETED-ABOVE-THIS-LINE
-- _patches-20160113/COMPLETED-BELOW-THIS-LINE
-- _patches-20160113/CR-ABOVE-THIS-LINE
-- _patches-20160113/CR-BELOW-THIS-LINE
-- _patches-20160113/dead-code-in-actions
-- _patches-20160113/debug-changes
-- _patches-20160113/demo-rails-app
-- _patches-20160113/eng-10166-halt-spec
-- _patches-20160113/eng-10256
-- _patches-20160113/eng-10256-ubuntu-testing
-- _patches-20160113/eng-10269-test-stuff
-- _patches-20160113/eng-10269-wtf
-- _patches-20160113/eng-10369
-- _patches-20160113/eng-10369-tmp
-- _patches-20160113/eng-10919
-- _patches-20160113/eng-11177-fix-actions-requires
-- _patches-20160113/eng-11442
-- _patches-20160113/eng-11616
-- _patches-20160113/eng-11616-2
-- _patches-20160113/eng-11616-actual
-- _patches-20160113/eng-11625a
-- _patches-20160113/eng-11711
-- _patches-20160113/eng-12232-command-spec
-- _patches-20160113/eng-12235
-- _patches-20160113/eng-12235-override-refactor
-- _patches-20160113/eng-12240
-- _patches-20160113/eng-12249
-- _patches-20160113/eng-12301
-- _patches-20160113/eng-12720
-- _patches-20160113/eng-12843
-- _patches-20160113/env-source
-- _patches-20160113/frickin-vagrant-spec
-- _patches-20160113/gem-pre-version
-- _patches-20160113/gems-old
-- _patches-20160113/googles-specs
-- _patches-20160113/local-configs-ignore
-- _patches-20160113/misc
-- _patches-20160113/network-unreachable
-- _patches-20160113/new-boxfile
-- _patches-20160113/parallelization-maybe
-- _patches-20160113/read-state
-- _patches-20160113/refactor-to-use-public_address-cap
-- _patches-20160113/series
-- _patches-20160113/status
-- _patches-20160113/test-move-env-data
-- _patches-20160113/test-vagrantfile-vm1
-- _patches-20160113/vagrant-spec-mock-api
-- _patches-20160113/vagrant-vmware-plugin
-- _patches-20160113/vagrantfile
-- _patches-20160113/vagrantfile-for-acceptance-tests
-- _patches-20160113/vagrantfile-for-nick
-- _patches-20160113/vagrantfiles-to-forget-what-they-are-for
-- _patches-20160113/vm-vanished
-- _patches-20160113/WIP-ABOVE-THIS-LINE
-- _patches-20160113/WIP-BELOW-THIS-LINE
-- _patches-20160118/acceptance-test-runner
-- _patches-20160118/ansible-1
-- _patches-20160118/cache-api-client-in-up
-- _patches-20160118/COMPLETED-ABOVE-THIS-LINE
-- _patches-20160118/COMPLETED-BELOW-THIS-LINE
-- _patches-20160118/CR-ABOVE-THIS-LINE
-- _patches-20160118/CR-BELOW-THIS-LINE
-- _patches-20160118/dead-code-in-actions
-- _patches-20160118/debug-changes
-- _patches-20160118/demo-rails-app
-- _patches-20160118/eng-10166-halt-spec
-- _patches-20160118/eng-10256
-- _patches-20160118/eng-10256-cr
-- _patches-20160118/eng-10256-ubuntu-testing
-- _patches-20160118/eng-10269-test-stuff
-- _patches-20160118/eng-10269-wtf
-- _patches-20160118/eng-10369
-- _patches-20160118/eng-10369-tmp
-- _patches-20160118/eng-10919
-- _patches-20160118/eng-11177-fix-actions-requires
-- _patches-20160118/eng-11442
-- _patches-20160118/eng-11616
-- _patches-20160118/eng-11616-2
-- _patches-20160118/eng-11616-actual
-- _patches-20160118/eng-11625a
-- _patches-20160118/eng-11711
-- _patches-20160118/eng-12232-command-spec
-- _patches-20160118/eng-12235
-- _patches-20160118/eng-12235-override-refactor
-- _patches-20160118/eng-12240
-- _patches-20160118/eng-12249
-- _patches-20160118/eng-12301
-- _patches-20160118/eng-12720
-- _patches-20160118/eng-12843
-- _patches-20160118/eng-13040
-- _patches-20160118/env-source
-- _patches-20160118/frickin-vagrant-spec
-- _patches-20160118/gem-pre-version
-- _patches-20160118/gems-old
-- _patches-20160118/googles-specs
-- _patches-20160118/local-configs-ignore
-- _patches-20160118/misc
-- _patches-20160118/network-unreachable
-- _patches-20160118/new-boxfile
-- _patches-20160118/parallelization-maybe
-- _patches-20160118/port-forwarding-processes
-- _patches-20160118/read-state
-- _patches-20160118/refactor-to-use-public_address-cap
-- _patches-20160118/series
-- _patches-20160118/status
-- _patches-20160118/test-move-env-data
-- _patches-20160118/test-vagrantfile-vm1
-- _patches-20160118/vagrant-spec-mock-api
-- _patches-20160118/vagrant-vmware-plugin
-- _patches-20160118/vagrantfile
-- _patches-20160118/vagrantfile-for-acceptance-tests
-- _patches-20160118/vagrantfile-for-nick
-- _patches-20160118/vagrantfiles-to-forget-what-they-are-for
-- _patches-20160118/vm-vanished
-- _patches-20160118/WIP-ABOVE-THIS-LINE
-- _patches-20160118/WIP-BELOW-THIS-LINE
-- _patches-20160118a/acceptance-test-runner
-- _patches-20160118a/ansible-1
-- _patches-20160118a/bar
-- _patches-20160118a/cache-api-client-in-up
-- _patches-20160118a/COMPLETED-ABOVE-THIS-LINE
-- _patches-20160118a/COMPLETED-BELOW-THIS-LINE
-- _patches-20160118a/CR-ABOVE-THIS-LINE
-- _patches-20160118a/CR-BELOW-THIS-LINE
-- _patches-20160118a/dead-code-in-actions
-- _patches-20160118a/debug-changes
-- _patches-20160118a/demo-rails-app
-- _patches-20160118a/eng-10166-halt-spec
-- _patches-20160118a/eng-10256
-- _patches-20160118a/eng-10256-cr
-- _patches-20160118a/eng-10256-ubuntu-testing
-- _patches-20160118a/eng-10269-test-stuff
-- _patches-20160118a/eng-10269-wtf
-- _patches-20160118a/eng-10369
-- _patches-20160118a/eng-10369-tmp
-- _patches-20160118a/eng-10919
-- _patches-20160118a/eng-11177-fix-actions-requires
-- _patches-20160118a/eng-11442
-- _patches-20160118a/eng-11616
-- _patches-20160118a/eng-11616-2
-- _patches-20160118a/eng-11616-actual
-- _patches-20160118a/eng-11625a
-- _patches-20160118a/eng-11711
-- _patches-20160118a/eng-12232-command-spec
-- _patches-20160118a/eng-12235
-- _patches-20160118a/eng-12235-override-refactor
-- _patches-20160118a/eng-12240
-- _patches-20160118a/eng-12249
-- _patches-20160118a/eng-12301
-- _patches-20160118a/eng-12720
-- _patches-20160118a/eng-12843
-- _patches-20160118a/eng-13040
-- _patches-20160118a/env-source
-- _patches-20160118a/foo
-- _patches-20160118a/frickin-vagrant-spec
-- _patches-20160118a/gem-pre-version
-- _patches-20160118a/gems-old
-- _patches-20160118a/googles-specs
-- _patches-20160118a/guestport-madness
-- _patches-20160118a/local-configs-ignore
-- _patches-20160118a/misc
-- _patches-20160118a/network-unreachable
-- _patches-20160118a/new-boxfile
-- _patches-20160118a/parallelization-maybe
-- _patches-20160118a/port-forwarding-processes
-- _patches-20160118a/read-state
-- _patches-20160118a/refactor-to-use-public_address-cap
-- _patches-20160118a/series
-- _patches-20160118a/status
-- _patches-20160118a/test-move-env-data
-- _patches-20160118a/test-vagrantfile-vm1
-- _patches-20160118a/vagrant-spec-mock-api
-- _patches-20160118a/vagrant-vmware-plugin
-- _patches-20160118a/vagrantfile
-- _patches-20160118a/vagrantfile-for-acceptance-tests
-- _patches-20160118a/vagrantfile-for-nick
-- _patches-20160118a/vagrantfiles-to-forget-what-they-are-for
-- _patches-20160118a/vm-vanished
-- _patches-20160118a/WIP-ABOVE-THIS-LINE
-- _patches-20160118a/WIP-BELOW-THIS-LINE
 - boxes/empty.box
 - boxes/metadata.json
 - boxes/README.md
@@ -426,6 +124,7 @@ files:
 - Gemfile
 - lib/vagrant-skytap/action/add_vm_to_environment.rb
 - lib/vagrant-skytap/action/clear_forwarded_ports.rb
+- lib/vagrant-skytap/action/compose_environment.rb
 - lib/vagrant-skytap/action/create_environment.rb
 - lib/vagrant-skytap/action/delete_environment.rb
 - lib/vagrant-skytap/action/delete_vm.rb
@@ -517,6 +216,7 @@ files:
 - spec/acceptance/shared/context_skytap.rb
 - spec/spec_helper.rb
 - spec/support/isolated_environment.rb
+- spec/unit/actions/compose_environment_spec.rb
 - spec/unit/base.rb
 - spec/unit/config_spec.rb
 - spec/unit/environment_spec.rb
@@ -556,10 +256,8 @@ files:
 - tasks/test.rake
 - vagrant-skytap.gemspec
 - vagrant-spec.config.rb
-- .byebug_history
 - .gitignore
 - .hgignore
-- .project
 - .rspec
 homepage: http://www.skytap.com
 licenses:
@@ -584,5 +282,5 @@ rubyforge_project: vagrant-skytap
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Enables Vagrant to manage Skytap machines.
+summary: Vagrant provider plugin for Skytap.
 test_files: []