vagrant-skytap 0.2.4 → 0.2.5

data/spec/unit/forwarded_port_spec.rb

@@ -24,8 +24,6 @@ require_relative 'base'
 require "vagrant-skytap/model/forwarded_port"
 
 describe VagrantPlugins::Skytap::Model::ForwardedPort do
-  include_context "unit"
-
   let(:fp1) { VagrantPlugins::Skytap::Model::ForwardedPort.new("tcp9000", 9000, 80, protocol: 'tcp') }
   let(:fp2) { VagrantPlugins::Skytap::Model::ForwardedPort.new("tcp80", 80, 80, protocol: 'tcp') }
   let(:fp3) { VagrantPlugins::Skytap::Model::ForwardedPort.new("tcp2222", 2222, 22, protocol: 'tcp') }

data/spec/unit/prepare_collision_params_spec.rb

@@ -24,8 +24,6 @@ require_relative 'base'
 require "vagrant-skytap/model/forwarded_port"
 
 describe VagrantPlugins::Skytap::Model::ForwardedPort do
-  include_context "unit"
-
   let(:fp1) { VagrantPlugins::Skytap::Model::ForwardedPort.new("tcp9000", 9000, 80, protocol: 'tcp') }
   let(:fp2) { VagrantPlugins::Skytap::Model::ForwardedPort.new("tcp80", 80, 80, protocol: 'tcp') }
   let(:fp3) { VagrantPlugins::Skytap::Model::ForwardedPort.new("tcp2222", 2222, 22, protocol: 'tcp') }
@@ -65,15 +63,3 @@ describe VagrantPlugins::Skytap::Model::ForwardedPort do
     end
   end
 end
-
-
-#- [ ] Set up a “real" environment & machine
-#- [ ] Give it a Vagrantfile with a collision
-#- [ ] Provide matching machine folders.
-#- [ ] read_used_ports and read_forwarded_ports will have natural return values.
-#- [ ] Check that :port_collision_extra_in_use and :port_collision_remap are correct.
-#- [ ] Case where read_forwarded_ports returns []. :port_collision_remap should be {}.
-#- [ ] Case where read_forwarded_ports returns an object with the same id as something
-#      in env[:machine].config.vm.networks: :port_collision_remap should be
-#      {<config hostport> => FP hostport}
-#    - [ ] observe what virtualbox does

data/spec/unit/publish_set_spec.rb

@@ -23,7 +23,6 @@
 require_relative 'base'
 
 describe VagrantPlugins::Skytap::API::PublishSet do
-  include_context "unit"
   include_context "rest_api"
 
   let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
@@ -38,14 +37,12 @@ describe VagrantPlugins::Skytap::API::PublishSet do
     end
   end
 
-  let(:iso_env) do
-    # We have to create a Vagrantfile so there is a root path
-    env = isolated_environment
-    env.vagrantfile("")
-    env.create_vagrant_env
+  let(:provider_config) do
+    double(:provider_config, vm_url: "/vms/1", username: "jsmith", api_token: "123123", base_url: base_url)
   end
-  let(:machine)    { iso_env.machine(iso_env.machine_names[0], :dummy) }
-  let(:env)        {{ machine: machine, api_client: api_client }}
+  let(:api_client) { API::Client.new(provider_config) }
+  let(:machine)    { double(:machine, name: "vm1", id: nil, :id= => nil, provider_config: provider_config) }
+  let(:env)        { { machine: machine, api_client: api_client } }
 
   let(:environment) do
     VagrantPlugins::Skytap::API::Environment.new(env_attrs, env)
@@ -60,16 +57,11 @@ describe VagrantPlugins::Skytap::API::PublishSet do
   end
   let(:instance) { described_class.new(attrs, environment, env) }
 
-  let(:api_client) do
-    # By default, all GET requests will return an environment with VM1, VM2, and 1 network
-    double('api_client',
-      get: double('resp', body: JSON.dump(attrs))
-    )
-  end
-
   # Ensure tests are not affected by Skytap credential environment variables
   before :each do
     ENV.stub(:[] => nil)
+    stub_request(:get, /.*/).to_return(body: '{}', status: 200)
+    stub_request(:get, %r{/configurations/\d+}).to_return(body: JSON.dump(attrs), status: 200)
   end
 
   describe "vms" do

data/spec/unit/setup_helper_spec.rb

@@ -25,9 +25,9 @@ require "vagrant-skytap/setup_helper"
 require "vagrant-skytap/api/environment"
 require "vagrant-skytap/api/vpn"
 require "vagrant-skytap/api/vpn_attachment"
+require "vagrant-skytap/config"
 
 describe VagrantPlugins::Skytap::SetupHelper do
-  include_context "unit"
   include_context "rest_api"
 
   let(:instance) { described_class.new }
@@ -39,7 +39,6 @@ describe VagrantPlugins::Skytap::SetupHelper do
   let(:vpn_attachment1_attrs) { read_json(json_path, 'vpn_attachment1.json') }
   let(:empty_environment_attrs) { read_json(json_path, 'empty_environment.json')}
 
-
   let(:network_attrs) do
     network1_attrs.dup.tap do |ret|
       ret['vpn_attachments'] = [vpn_attachment1_attrs]
@@ -69,47 +68,39 @@ describe VagrantPlugins::Skytap::SetupHelper do
 
   let(:vpn) {VagrantPlugins::Skytap::API::Vpn.new(vpn_attrs, env)}
 
-  let(:iso_env) do
-    # We have to create a Vagrantfile so there is a root path
-    env = isolated_environment
-    env.vagrantfile("")
-    env.create_vagrant_env
+  let(:ssh_config) do
+    double(:ssh, username: "foo", password: "bar", host: nil, port: nil)
   end
-
-  let(:machine)  { iso_env.machine(iso_env.machine_names[0], :dummy) }
-  let(:env)      {{ machine: machine, api_client: double(post: Net::HTTPOK) }}
-  let(:instance) { described_class.new(attrs, env) }
-
-  let(:api_client) do
-    # By default, all GET requests will return an environment with VM1, VM2, and 1 network
-    double('api_client',
-      get: double('resp', body: JSON.dump(attrs))
-    )
+  let(:machine_config) do
+    double(:machine_config, ssh: ssh_config)
   end
+  let(:provider_config) do
+    double(:provider_config, vm_url: "/vms/1", username: "jsmith", api_token: "123123", base_url: base_url)
+  end
+  let(:api_client) { API::Client.new(provider_config) }
+  let(:machine)    { double(:machine, name: "vm1", id: "6981850", config: machine_config, provider_config: provider_config) }
+  let(:env)        { { machine: machine, api_client: api_client, ui: ui } }
+  let(:instance)   { described_class.new(env, environment) }
 
   before :each do
     # Ensure tests are not affected by Skytap credential environment variables
     ENV.stub(:[] => nil)
-
-    machine.id = environment.vms.first.id
-  end
-
-  after(:each) do
-    allow(machine).to receive(:provider_config).and_call_original
+    stub_request(:get, /.*/).to_return(body: '{}', status: 200)
+    stub_request(:get, %r{/configurations/\d+}).to_return(body: JSON.dump(environment_attrs), status: 200)
+    stub_request(:get, %r{/vpns$}).to_return(body: JSON.dump([vpn_attrs]), status: 200)
   end
 
   describe "ask_routing" do
-    after(:each) do
-      allow_any_instance_of(VpnChoice).to receive(:choose).and_call_original
+    subject do
+      instance
     end
 
-    subject do
-      myenv = env.merge(
-        ui:         double(ask: '')
-      )
-      described_class.new(myenv, environment).tap do |ret|
-        allow(ret).to receive(:vpns).and_return([vpn])
-      end
+    before :each do
+      allow(subject).to receive(:vpns).and_return([vpn])
+    end
+
+    after(:each) do
+      allow_any_instance_of(VpnChoice).to receive(:choose).and_call_original
     end
 
     it "has connection_choices" do
@@ -120,31 +111,20 @@ describe VagrantPlugins::Skytap::SetupHelper do
     end
 
     it "does not show choices if vpn_url specified" do
-      allow_any_instance_of(VpnChoice).to receive(:choose).and_return(['1.2.3.4', 22])
-
-      cfg = VagrantPlugins::Skytap::Config.new
-      cfg.vpn_url = vpn.url
-      cfg.finalize!
-      allow(machine).to receive(:provider_config).and_return cfg
-
+      allow(provider_config).to receive(:vpn_url).and_return(vpn.url)
+      vpn_choice = double(:choice, vpn: vpn, choose: ['1.2.3.4', 22], :valid? => true)
+      allow(vpn).to receive(:choice_for_setup).and_return(vpn_choice)
       expect(subject).not_to receive(:ask_from_list)
       subject.send(:ask_routing)
     end
 
     it "raises DoesNotExist if non-existent vpn_url specified" do
-      cfg = VagrantPlugins::Skytap::Config.new
-      cfg.vpn_url = 'bogus'
-      cfg.finalize!
-      allow(machine).to receive(:provider_config).and_return cfg
-
+      allow(provider_config).to receive(:vpn_url).and_return("bogus")
       expect{subject.send(:ask_routing)}.to raise_error(Errors::DoesNotExist)
     end
 
     it "shows choices if vpn_url unspecified" do
-      cfg = VagrantPlugins::Skytap::Config.new
-      cfg.finalize!
-      allow(machine).to receive(:provider_config).and_return cfg
-
+      allow(provider_config).to receive(:vpn_url).and_return(nil)
       expect(subject).to receive(:ask_from_list)
       subject.send(:ask_routing)
     end

data/spec/unit/support/api_responses/empty_environment.json

@@ -1,6 +1,6 @@
 {
   "id": "5570024",
-  "url": "https://example.com/templates/5570024",
+  "url": "https://example.com/configurations/5570024",
   "name": "Environment 1",
   "error": "",
   "runstate": "running",

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

@@ -33,4 +33,7 @@ require "vagrant-skytap/api/vpn"
 
 shared_context "rest_api" do
   include_context "skytap"
+
+  let(:base_url) {"http://example.com/"}
+
 end

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

@@ -26,7 +26,21 @@ shared_context "skytap" do
   Errors = VagrantPlugins::Skytap::Errors
   API = VagrantPlugins::Skytap::API
 
+  let(:empty_action) {double(call: nil)}
+  let(:ui)           {Vagrant::UI::Silent.new}
+
   def read_json(*args)
     JSON.load(File.read(File.join(args)))
   end
+
+  # Bypass middleware actions, sort of, by stubbing the #call method
+  def stub_actions(*action_names)
+    if action_names.count == 1 && action_names.first.is_a?(Array)
+      action_names = action_names.first
+    end
+    action_names.each do |name|
+      classname = "VagrantPlugins::Skytap::Action::#{name}"
+      stub_const(classname, double(classname, call: nil))
+    end
+  end
 end

data/spec/unit/vm_spec.rb

@@ -23,7 +23,6 @@
 require_relative 'base'
 
 describe VagrantPlugins::Skytap::API::Vm do
-  include_context "unit"
   include_context "rest_api"
 
   let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
@@ -33,14 +32,13 @@ describe VagrantPlugins::Skytap::API::Vm do
   let(:network1_attrs) { read_json(json_path, 'network1.json') }
   let(:empty_environment_attrs) { read_json(json_path, 'empty_environment.json') }
 
-  let(:iso_env) do
-    # We have to create a Vagrantfile so there is a root path
-    env = isolated_environment
-    env.vagrantfile("")
-    env.create_vagrant_env
+  let(:provider_config) do
+    double(:provider_config, vm_url: "/vms/1", username: "jsmith", api_token: "123123", base_url: base_url)
   end
-  let(:machine)    { iso_env.machine(iso_env.machine_names[0], :dummy) }
-  let(:env)        {{ machine: machine, api_client: api_client }}
+  let(:api_client) { API::Client.new(provider_config) }
+  let(:machine)    { double(:machine, name: "vm1", id: nil, :id= => nil, provider_config: provider_config) }
+  let(:env)        { { machine: machine, api_client: api_client } }
+  let(:instance)   { described_class.new(attrs, env) }
 
   let(:environment) do
     env_attrs = empty_environment_attrs
@@ -50,16 +48,11 @@ describe VagrantPlugins::Skytap::API::Vm do
   let(:attrs)    { vm1_attrs }
   let(:instance) { described_class.new(attrs, environment, env) }
 
-  let(:api_client) do
-    # By default, all GET requests will return VM1
-    double('api_client',
-      get: double('resp', body: JSON.dump(attrs))
-    )
-  end
-
   # Ensure tests are not affected by Skytap credential environment variables
   before :each do
     ENV.stub(:[] => nil)
+    stub_request(:get, /.*/).to_return(body: '{}', status: 200)
+    stub_request(:get, %r{/vms/\d+}).to_return(body: JSON.dump(attrs), status: 200)
   end
 
   describe "reload" do

data/vagrant-skytap.gemspec

@@ -28,10 +28,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"
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   root_path      = File.dirname(__FILE__)
   all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
   all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  #TODO:NLA:
+
   gitignore_path = File.join(root_path, ".gitignore")
   gitignore      = File.readlines(gitignore_path)
   gitignore.map!    { |line| line.chomp.strip }

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
+- Eric True
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -109,7 +110,9 @@ 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: []
@@ -208,12 +211,7 @@ files:
 - locales/en.yml
 - Rakefile
 - README.md
-- spec/acceptance/base.rb
-- spec/acceptance/provider/halt_spec.rb
-- spec/acceptance/provider/up_spec.rb
-- spec/acceptance/shared/context_skytap.rb
 - spec/spec_helper.rb
-- spec/support/isolated_environment.rb
 - spec/unit/actions/compose_environment_spec.rb
 - spec/unit/actions/update_hardware_spec.rb
 - spec/unit/base.rb
@@ -230,8 +228,6 @@ files:
 - spec/unit/support/api_responses/vm1.json
 - spec/unit/support/api_responses/vpn1.json
 - spec/unit/support/api_responses/vpn_attachment1.json
-- spec/unit/support/dummy_communicator.rb
-- spec/unit/support/dummy_provider.rb
 - spec/unit/support/forwarded_ports/machines/vm1/skytap/id
 - spec/unit/support/forwarded_ports/machines/vm1/skytap/private_key
 - spec/unit/support/forwarded_ports/machines/vm1/skytap/tcp9000_tcp_9000_80.pid
@@ -242,11 +238,6 @@ files:
 - spec/unit/support/forwarded_ports/machines/vm3/virtualbox/id
 - spec/unit/support/forwarded_ports/machines/vm4/skytap/id
 - spec/unit/support/forwarded_ports/machines/vm4/skytap/tcp8888_tcp_8888_80.pid
-- spec/unit/support/isolated_environment.rb
-- spec/unit/support/shared/action_synced_folders_context.rb
-- spec/unit/support/shared/base_context.rb
-- spec/unit/support/shared/capability_helpers_context.rb
-- spec/unit/support/shared/plugin_command_context.rb
 - spec/unit/support/shared/rest_api_context.rb
 - spec/unit/support/shared/skytap_context.rb
 - spec/unit/vm_spec.rb
@@ -254,11 +245,7 @@ files:
 - tasks/bundler.rake
 - tasks/test.rake
 - vagrant-skytap.gemspec
-- vagrant-spec.config.rb
 - .gitignore
-- .hgignore
-- .project
-- .rspec
 homepage: http://www.skytap.com
 licenses:
 - MIT
@@ -282,5 +269,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: []

data/.hgignore

@@ -1,22 +0,0 @@
-Syntax: regexp
-
-# OS-specific
-^\.DS_Store$
-
-# editors
-\.swp$
-
-# Bundler/Rubygems
-\.gem$
-^\.bundle$
-pkg/
-^tags$
-^Gemfile\.lock$
-
-# Vagrant
-^\.vagrant$
-^Vagrantfile$
-#!example_box/Vagrantfile
-
-# RVM files for gemset/ruby setting
-\.ruby-version$

data/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>vagrant_skytap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

data/.rspec

@@ -1 +0,0 @@
---format doc --order random --color --fail-fast

data/spec/acceptance/base.rb

@@ -1,24 +0,0 @@
-# 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 "vagrant-spec/acceptance"
-require_relative "shared/context_skytap"