vagrant-skytap 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e80355442d175c31c247c1e440e82e19311bb28
-  data.tar.gz: 86662fe7894e137edeef1252af62059c98422a48
+  metadata.gz: 24c83e15798abd9dd2e7df78bd984c2768dae164
+  data.tar.gz: 0198f2146818c63d8ef7fc0bf9808a20fdea288e
 SHA512:
-  metadata.gz: 187ee028f6abb5fcc5b15124ca72fe98fe3902d82216243d4e0ff72291460c7b7c507f9544bb2c7dbc529aa80ea4f24deb147700d028af9afc9f55c56127a4a1
-  data.tar.gz: 5afbffe84d4f5f3c4873941d5e8dae1eb7a717c8b3bdf112f4d4e8c8b1b37ac95d95813562eef08c22e788f1aa877e6d8a74b64a8256a5029ed8d15f05914246
+  metadata.gz: 533b0663bcd1ceee2c749db4cc4bc95a77bb2a1a940d90422fdb118ae182b72dcf10dfc84ccde3510590193511eec4d24ae9421dbbeb4cd2c601db6a5d402804
+  data.tar.gz: 231290cdc514f59aa84187f951a47b13742447a7a5fcfa78af9c1675c1e1efd02a4a2522c5e1f74817b39090ad10cc408b2c8c8fca031766b7ec6bbf30c8abb1

data/.gitignore

@@ -19,3 +19,11 @@ Vagrantfile
 # RVM files for gemset/ruby setting
 .ruby-*
 .rvmrc
+.ruby-version
+
+# other source control
+.hg
+.hgignore
+.byebug_history
+.project
+.rspec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.5 (February 3, 2016)
+
+* Initial push to GitHub. Random cleanup, including getting rid of some unused test files.
+
 # 0.2.4 (February 3, 2016)
 
 * Fix bug which caused updating hardware to take effect for the first VM only.

data/Gemfile

@@ -9,11 +9,8 @@ group :development do
   if File.exist?(File.expand_path("../../vagrant", __FILE__))
     gem 'vagrant', path: "../vagrant"
   else
-    # TODO test against tip
     gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.7.2'
   end
-  gem "byebug"
-
 
   if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
     gem 'vagrant-spec', path: "../vagrant-spec"

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

@@ -93,9 +93,6 @@ module VagrantPlugins
         end
 
         # Fetch the source VMs for the given machines.
-        # TODO Optimize by downloading unique parent objects, and pick
-        # the VM child objects; Set the VMs' parent object so Vm#region
-        # doesn't require another GET.
         #
         # @param [Array] machines Set of [Vagrant::Machine] objects
         # @return [Hash] mapping of machine names to [API::Vm] objects

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

@@ -29,7 +29,6 @@ module VagrantPlugins
           @app = app
         end
 
-        # This logic is based on the VirtualBox provider
         def call(env)
           # Get the forwarded ports used by other virtual machines and
           # consider those in use as well.

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

@@ -29,8 +29,9 @@ module VagrantPlugins
       # Creates a list of vm ids from all Skytap VMs in Vagrant's global machine
       # index. Any Vagrant machine not on this list will have its NFS entry
       # pruned by the SyncedFolderCleanup action.
-      # NOTE: Unfortunately, Vagrant providers have no way to know about each
-      # other's machines. https://github.com/mitchellh/vagrant/issues/6439
+      # NOTE: Unfortunately Vagrant providers have no way to know about each
+      # other's machines, so there's an impact on NFS mounts for machines
+      # from other providers. https://github.com/mitchellh/vagrant/issues/6439
       class PrepareNFSValidIds
         include MixinMachineIndex
 

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

@@ -52,7 +52,6 @@ module VagrantPlugins
             Timeout.timeout(env[:machine].config.vm.boot_timeout) do
               while true do
                 begin
-                  # TODO Is there a clean way to just invoke the built-in action?
                   break builtin_action_call(env)
                 rescue Errno::ENETUNREACH
                   @logger.info("Rescued Errno::ENETUNREACH and retrying original WaitForCommunicator action.")

data/lib/vagrant-skytap/action.rb

@@ -143,7 +143,6 @@ module VagrantPlugins
       def self.action_read_state
         Vagrant::Action::Builder.new.tap do |b|
           b.use action_fetch_environment
-          #TODO:NLA Can this whole action be removed?
           b.use ReadState
         end
       end

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

@@ -41,7 +41,7 @@ module VagrantPlugins
           begin
             Timeout.timeout(timeout) do
               loop do
-                break if env[:interrupted] # is this right?
+                break if env[:interrupted]
                 begin
                   yield
                 rescue Errors::ResourceBusy

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

@@ -38,7 +38,6 @@ module VagrantPlugins
           uri = URI.parse(config.base_url)
           @http = Net::HTTP.new(uri.host, uri.port)
 
-          #TODO:NLA Turn this on conditionally based on configuration value.
           @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
           @http.use_ssl = uri.port == 443 || uri.scheme == 'https'

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

@@ -121,7 +121,6 @@ module VagrantPlugins
         end
 
         def create_published_service(internal_port)
-          #TODO:NLA Move this into PublishedService::create! Same with other places.
           begin
             resp = api_client.post("#{url}/services", JSON.dump(internal_port: internal_port))
           rescue Errors::OperationFailed => ex

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

@@ -22,7 +22,6 @@
 
 require 'vagrant-skytap/api/resource'
 
-#TODO:NLA Move this to another class, properly namespaced.
 class PublicIpChoice
   attr_reader :env, :ip, :iface, :execution
 
@@ -47,7 +46,7 @@ class PublicIpChoice
     execution.execute
 
     host = ip.address
-    port = 22 #TODO:NLA Use constant.
+    port = 22
     [host, port]
   end
 

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

@@ -22,7 +22,6 @@
 
 require 'vagrant-skytap/api/resource'
 
-#TODO:NLA Move this to another class, properly namespaced.
 class PublishedServiceChoice
   attr_reader :env, :iface, :service, :execution
 
@@ -48,7 +47,7 @@ class PublishedServiceChoice
   end
 
   def valid?
-    service.nil? || service.internal_port == 22 #TODO:NLA Use constant
+    service.nil? || service.internal_port == 22
   end
 
   class ServiceExecution
@@ -85,7 +84,7 @@ class PublishedServiceChoice
     end
 
     def execute
-      @service = iface.create_published_service(22) #TODO:NLA Use constant
+      @service = iface.create_published_service(22)
     end
   end
 end

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

@@ -24,7 +24,6 @@ require 'vagrant-skytap/util/subnet'
 require 'vagrant-skytap/api/resource'
 require 'vagrant-skytap/api/vpn_attachment'
 
-#TODO:NLA Move this to another class, properly namespaced.
 class VpnChoice
   attr_reader :env, :vpn, :vm, :iface, :attachment, :execution
 
@@ -55,7 +54,7 @@ class VpnChoice
 
     @iface = vm.reload.interfaces.detect{|i| i.id == iface.id }
     host = iface.address_for(vpn)
-    port = 22 #TODO:NLA Use constant
+    port = 22
 
     [host, port]
   end

data/lib/vagrant-skytap/command/publish_url/root.rb

@@ -55,7 +55,7 @@ module VagrantPlugins
 
           def execute
             if @main_args.include?("-h") || @main_args.include?("--help")
-              # Print the help for all the box commands.
+              # Print the help for all the publish-url commands.
               return help
             end
 

data/lib/vagrant-skytap/command/up.rb

@@ -20,10 +20,13 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# We've subclassed the builtin "up" command to alter how
-# parallelization is implemented. Instead of making concurrent requests to run
-# individual VMs, we make a single REST call to update the runstates of
-# multiple VMs within the containing Skytap environment.
+# We've subclassed the "up" command that ships with Vagrant core to
+# implement parallelization with REST calls that operate on multiple
+# VMs simultaneously -- since the entire environment is locked while
+# VMs are created or run, the multithreaded approach does not work.
+# Unfortunately the #execute method contains a lot of duplicate code,
+# when all we need to modify is the #batch block which invokes
+# action_up. (See #bring_up_machines below.)
 
 require Vagrant.source_root.join("plugins/commands/up/command")
 
@@ -93,6 +96,9 @@ module VagrantPlugins
             names = nil if autostart && names.empty?
           end
 
+          # Collect the machines first so we know what their provider
+          # is, and decide whether to call the Vagrant core implementation
+          # of this command.
           with_target_vms(names, provider: options[:provider]) {|machine| machines << machine}
           unless machines.first.provider_name == :skytap
             @logger.debug("Calling default 'Up' implementation.")

data/lib/vagrant-skytap/core_ext/object/blank.rb

@@ -1,25 +1,3 @@
-# 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.
-
 # Copied from Rails ActiveSupport 2.3.18:
 # activesupport-2.3.18/lib/active_support/core_ext/object/blank.rb
 #

data/lib/vagrant-skytap/core_ext/try.rb

@@ -1,25 +1,3 @@
-# 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.
-
 # Copied from Rails ActiveSupport 2.3.18:
 # activesupport-2.3.18/lib/active_support/core_ext/try.rb
 #

data/lib/vagrant-skytap/hosts/common/cap/ssh_tunnel.rb

@@ -168,7 +168,6 @@ module VagrantPlugins
             # @return [Array] of [String]
             def ssh_args(fp, machine)
               ssh_info = machine.ssh_info
-              # TODO: tune these settings
               ssh_options = {
                 "ServerAliveInterval" => 10,
                 "ServerAliveCountMax" => 3,

data/lib/vagrant-skytap/plugin.rb

@@ -38,7 +38,7 @@ module VagrantPlugins
       name "Skytap"
       description <<-DESC
       This plugin installs a provider that allows Vagrant to manage
-      machines in Skytap (EC2/VPC).
+      machines in Skytap.
       DESC
 
       config(:skytap, :provider) do

data/lib/vagrant-skytap/util/compile_forwarded_ports.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
       module CompileForwardedPorts
         include Vagrant::Util::ScopedHashOverride
 
-        # This method compiles the forwarded ports into {ForwardedPort}
+        # This method compiles the forwarded ports into [ForwardedPort]
         # models.
         def compile_forwarded_ports(config)
           mappings = {}

data/lib/vagrant-skytap/version.rb

@@ -22,6 +22,6 @@
 
 module VagrantPlugins
   module Skytap
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

data/lib/vagrant-skytap.rb

@@ -20,8 +20,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# TODO:NLA To add the box initially:
-# $ bundle exec vagrant box add skytap-dummy.box --provider=skytap --name=skytap-dummy
 require "pathname"
 
 require "vagrant-skytap/core_ext/object/blank"

data/spec/unit/actions/compose_environment_spec.rb

@@ -23,16 +23,13 @@
 require File.expand_path("../../base", __FILE__)
 
 describe VagrantPlugins::Skytap::Action::ComposeEnvironment do
-  include_context "unit"
   include_context "rest_api"
 
   let(:app) { lambda { |env| } }
   let(:env) { { machine: machine, machines: [machine], environment: environment, ui: ui, api_client: api_client } }
-  let(:base_url) {"http://example.com/"}
   let(:provider_config) do
     double(:provider_config, vm_url: "/vms/1", username: "jsmith", api_token: "123123", base_url: base_url)
   end
-  let(:ui)         { double(:ui, info: nil) }
   let(:api_client) { API::Client.new(provider_config) }
 
   let(:machine)          { double(:machine, name: "vm1", id: nil, :id= => nil, provider_config: provider_config) }

data/spec/unit/actions/update_hardware_spec.rb

@@ -24,7 +24,6 @@ require File.expand_path("../../base", __FILE__)
 require "vagrant-skytap/action/update_hardware"
 
 describe VagrantPlugins::Skytap::Action::UpdateHardware do
-  include_context "unit"
   include_context "skytap"
 
   let(:app) { lambda { |env| } }

data/spec/unit/base.rb

@@ -39,12 +39,6 @@ require "vagrant-skytap"
 $:.unshift File.expand_path("../../", __FILE__)
 
 # Load in helpers
-require "unit/support/dummy_communicator"
-require "unit/support/dummy_provider"
-require "unit/support/shared/base_context"
-require "unit/support/shared/action_synced_folders_context"
-require "unit/support/shared/capability_helpers_context"
-require "unit/support/shared/plugin_command_context"
 require "unit/support/shared/skytap_context"
 require "unit/support/shared/rest_api_context"
 
@@ -67,8 +61,7 @@ end
 # Vagrantfile anywhere, or at least this minimizes those chances.
 ENV["VAGRANT_CWD"] = Dir.mktmpdir("vagrant")
 
-# Set the dummy provider to the default for tests
-ENV["VAGRANT_DEFAULT_PROVIDER"] = "dummy"
+ENV["VAGRANT_DEFAULT_PROVIDER"] = "skytap"
 
 # Unset all host plugins so that we aren't executing subprocess things
 # to detect a host for every test.

data/spec/unit/config_spec.rb

@@ -50,10 +50,6 @@ describe VagrantPlugins::Skytap::Config do
   end
 
   describe "overriding defaults" do
-    # I typically don't meta-program in tests, but this is a very
-    # simple boilerplate test, so I cut corners here. It just sets
-    # each of these attributes to "foo" in isolation, and reads the value
-    # and asserts the proper result comes back out.
     [:username, :api_token, :base_url, :vm_url,
       :vpn_url, :instance_ready_timeout,
       :cpus, :cpuspersocket, :ram, :guestos].each do |attribute|

data/spec/unit/environment_spec.rb

@@ -23,7 +23,6 @@
 require_relative 'base'
 
 describe VagrantPlugins::Skytap::API::Environment do
-  include_context "unit"
   include_context "rest_api"
 
   let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
@@ -57,27 +56,19 @@ describe VagrantPlugins::Skytap::API::Environment 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
-  end
-
-  let(:machine)  { iso_env.machine(iso_env.machine_names[0], :dummy) }
-  let(:env)      {{ machine: machine }}
-  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(: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: nil, :id= => nil, provider_config: provider_config) }
+  let(:env)        { { machine: machine, api_client: api_client } }
+  let(:instance)   { described_class.new(attrs, env) }
 
   # 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 "check_vm_before_adding class method" do
@@ -176,14 +167,14 @@ describe VagrantPlugins::Skytap::API::Environment do
   end
 
   describe "reload" do
+    before do
+      new_attrs = attrs.merge('name' => 'Environment with 2 vms')
+      stub_request(:get, %r{/configurations/\d+}).to_return(body: JSON.dump(new_attrs), status: 200)
+    end
+
     subject do
       old_attrs = attrs_one_vm.merge('networks' => [], 'publish_sets' => [])
-      new_attrs = attrs.merge('name' => 'Environment with 2 vms')
-      client = double('api_client',
-        get: double('resp', body: JSON.dump(new_attrs))
-      )
-      myenv = env.merge(api_client: client)
-      described_class.new(old_attrs, myenv)
+      described_class.new(old_attrs, env)
     end
 
     it "reloads the child objects" do