vagrant-skytap 0.1.11 → 0.2.0

data/_patches-20160118a/parallelization-maybe

@@ -0,0 +1,198 @@
+# HG changeset patch
+# Parent a6021cf61035f4ba44b4af13c9b2a1c17c1ea278
+diff -r a6021cf61035 -r bfcc25828768 lib/vagrant-skytap/command/start_mixins.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/command/start_mixins.rb	Fri Oct 23 19:10:56 2015 -0700
+@@ -0,0 +1,52 @@
++# How do you access the source of another plugin?
++# It's possible that they deliberately prevent this
++#require 'plugins/commands/up/start_mixins'
++module VagrantPlugins
++  module Skytap
++    module Command
++      module StartMixins
++
++        # Would be nice to just extend this, then alias #build_start_options
++        # and add default options flag.
++        #include VagrantPlugins::CommandUp::StartMixins
++
++        # This adds the standard `start` command line flags to the given
++        # OptionParser, storing the result in the `options` dictionary.
++        #
++        # @param [OptionParser] parser
++        # @param [Hash] options
++        def build_start_options(parser, options)
++          # Setup the defaults
++          options[:provision_types] = nil
++
++          # Add the options
++          parser.on("--[no-]provision", "Enable or disable provisioning") do |p|
++            options[:provision_enabled] = p
++            options[:provision_ignore_sentinel] = true
++          end
++
++          parser.on("--provision-with x,y,z", Array,
++                  "Enable only certain provisioners, by type.") do |list|
++            options[:provision_types] = list.map { |type| type.to_sym }
++            options[:provision_enabled] = true
++            options[:provision_ignore_sentinel] = true
++          end
++
++          options[:parallel] = false ### the only substantive change
++        end
++
++        # This validates the provisioner flags and raises an exception
++        # if there are invalid ones.
++        def validate_provisioner_flags!(options)
++          (options[:provision_types] || []).each do |type|
++              klass = Vagrant.plugin("2").manager.provisioners[type]
++              if !klass
++                raise Vagrant::Errors::ProvisionerFlagInvalid,
++                  name: type.to_s
++              end
++          end
++        end
++      end
++    end
++  end
++end
+diff -r a6021cf61035 -r bfcc25828768 lib/vagrant-skytap/command/up.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/command/up.rb	Fri Oct 23 19:10:56 2015 -0700
+@@ -0,0 +1,110 @@
++require 'optparse'
++require_relative 'start_mixins'
++
++module VagrantPlugins
++  module Skytap
++    module Command
++      class Up < Vagrant.plugin("2", :command)
++        include StartMixins
++
++        def self.synopsis
++          "hi mom starts and provisions the vagrant environment"
++        end
++
++        def execute
++          options = {}
++          options[:destroy_on_error] = true
++          options[:parallel] = true
++          options[:provision_ignore_sentinel] = false
++
++          opts = OptionParser.new do |o|
++            o.banner = "Usage: vagrant up [options] [name]"
++            o.separator ""
++            o.separator "Options:"
++            o.separator ""
++
++            build_start_options(o, options)
++
++            o.on("--[no-]destroy-on-error",
++                 "Destroy machine if any fatal error happens (default to true)") do |destroy|
++              options[:destroy_on_error] = destroy
++            end
++
++            o.on("--[no-]parallel",
++                 "Enable or disable parallelism if provider supports it") do |parallel|
++              options[:parallel] = parallel
++            end
++
++            o.on("--provider PROVIDER", String,
++                 "Back the machine with a specific provider") do |provider|
++              options[:provider] = provider
++            end
++          end
++
++          # Parse the options
++          argv = parse_options(opts)
++          return if !argv
++
++          # Validate the provisioners
++          validate_provisioner_flags!(options)
++
++          # Go over each VM and bring it up
++          @logger.debug("'Up' each target VM...")
++
++          # Build up the batch job of what we'll do
++          machines = []
++          @env.batch(options[:parallel]) do |batch|
++            names = argv
++            if names.empty?
++              autostart = false
++              @env.vagrantfile.machine_names_and_options.each do |n, o|
++                autostart = true if o.key?(:autostart)
++                o[:autostart] = true if !o.key?(:autostart)
++                names << n.to_s if o[:autostart]
++              end
++
++              # If we have an autostart key but no names, it means that
++              # all machines are autostart: false and we don't start anything.
++              names = nil if autostart && names.empty?
++            end
++
++            if names
++              with_target_vms(names, provider: options[:provider]) do |machine|
++                @env.ui.info(I18n.t(
++                  "vagrant.commands.up.upping",
++                  name: machine.name,
++                  provider: machine.provider_name))
++
++                machines << machine
++
++                batch.action(machine, :up, options)
++              end
++            end
++          end
++
++          if machines.empty?
++            @env.ui.info(I18n.t("vagrant.up_no_machines"))
++            return 0
++          end
++
++          # Output the post-up messages that we have, if any
++          machines.each do |m|
++            next if !m.config.vm.post_up_message
++            next if m.config.vm.post_up_message == ""
++
++            # Add a newline to separate things.
++            @env.ui.info("", prefix: false)
++
++            m.ui.success(I18n.t(
++              "vagrant.post_up_message",
++              name: m.name.to_s,
++              message: m.config.vm.post_up_message))
++          end
++
++          # Success, exit status 0
++          0
++        end
++      end
++    end
++  end
++end
+diff -r a6021cf61035 -r bfcc25828768 lib/vagrant-skytap/plugin.rb
+--- a/lib/vagrant-skytap/plugin.rb	Fri Oct 23 19:10:47 2015 -0700
++++ b/lib/vagrant-skytap/plugin.rb	Fri Oct 23 19:10:56 2015 -0700
+@@ -24,7 +24,7 @@
+         Config
+       end
+ 
+-      provider(:skytap, parallel: true) do
++      provider(:skytap, parallel: false) do
+         # Setup logging and i18n
+         setup_logging
+         setup_i18n
+@@ -34,6 +34,13 @@
+         Provider
+       end
+ 
++      # only used for this provider, right? when you call vagrant up,
++      # the Vagrantfile tells it that skytap is the only allowable provider
++      command("up", primary: true) do
++        require_relative "command/up"
++        Command::Up
++      end
++
+       # This initializes the internationalization strings.
+       def self.setup_i18n
+         I18n.load_path << File.expand_path("locales/en.yml", Skytap.source_root)

data/_patches-20160118a/port-forwarding-processes

@@ -0,0 +1,87 @@
+# HG changeset patch
+# Parent fe283b200076d7f296364e54d4426e3a9b643743
+processes host cap -- more harm than good?
+
+diff -r fe283b200076 -r ba1629d34236 lib/vagrant-skytap/hosts/common/cap/processes.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/hosts/common/cap/processes.rb	Mon Jan 18 13:38:12 2016 -0800
+@@ -0,0 +1,24 @@
++require 'log4r'
++
++module VagrantPlugins
++  module Skytap
++    module HostCommon
++      module Cap
++        class Processes
++          class << self
++            def create_logger
++              raise NotImplementedError
++            end
++
++            # Gets the name of the executable for the given pid.
++            #
++            # @return [String]
++            def get_comm_for_pid(pid)
++              raise NotImplementedException
++            end
++          end
++        end
++      end
++    end
++  end
++end
+diff -r fe283b200076 -r ba1629d34236 lib/vagrant-skytap/hosts/darwin/cap/processes.rb
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/lib/vagrant-skytap/hosts/darwin/cap/processes.rb	Mon Jan 18 13:38:12 2016 -0800
+@@ -0,0 +1,32 @@
++require "vagrant-skytap/hosts/common/cap/processes"
++require "vagrant/util/subprocess"
++
++module VagrantPlugins
++  module Skytap
++    module HostDarwin
++      module Cap
++        class Processes < VagrantPlugins::Skytap::HostCommon::Cap::Processes
++          class << self
++            def create_logger
++              Log4r::Logger.new("vagrant::hosts::darwin")
++            end
++
++            # Gets the name of the executable for the given pid.
++            #
++            # @return [String]
++            def get_comm_for_pid(env, pid)
++              logger = create_logger
++              result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
++              if result.exit_code == 0
++                result.stdout.split("\n").last
++              else
++                logger.debug(result.inspect)
++                ''
++              end
++            end
++          end
++        end
++      end
++    end
++  end
++end
+diff -r fe283b200076 -r ba1629d34236 lib/vagrant-skytap/plugin.rb
+--- a/lib/vagrant-skytap/plugin.rb	Mon Jan 18 13:37:48 2016 -0800
++++ b/lib/vagrant-skytap/plugin.rb	Mon Jan 18 13:38:12 2016 -0800
+@@ -49,6 +49,15 @@
+         Cap::PublicAddress
+       end
+ 
++      %w[get_comm_for_pid].each do |cap|
++        # We're only registering this cap for OSes that
++        # we know return the correct result.
++        host_capability("darwin", cap) do
++          require_relative "hosts/darwin/cap/processes"
++          HostDarwin::Cap::Processes
++        end
++      end
++
+       %w[start_ssh_tunnel kill_ssh_tunnel kill_forwarded_ports].each do |cap|
+         host_capability("bsd", cap) do
+           require_relative "hosts/bsd/cap/ssh_tunnel"

data/_patches-20160118a/read-state

@@ -0,0 +1,23 @@
+# HG changeset patch
+# Parent 8bcd0f98359d1e6e85b806f457755cbcc85255e4
+diff -r 8bcd0f98359d -r 22788fec55a7 lib/vagrant-skytap/action/read_state.rb
+--- a/lib/vagrant-skytap/action/read_state.rb	Thu Nov 19 11:24:44 2015 -0800
++++ b/lib/vagrant-skytap/action/read_state.rb	Thu Nov 19 11:24:49 2015 -0800
+@@ -22,14 +22,10 @@
+           @app.call(env)
+         end
+ 
++        # Assumes FetchEnvironment was called to populate env[:environment].
+         def read_state(machine)
+-          if VmProperties.read(machine.data_dir)
+-            if environment = env[:environment]
+-              environment.reload
+-            elsif props = API::Environment.properties(env)
+-              @logger.info("env[:environment] was not set!")
+-            end
+-
++          if environment = env[:environment]
++            environment.reload
+             if vm = environment.try(:current_vm)
+               return vm.runstate.to_sym
+             end

data/_patches-20160118a/refactor-to-use-public_address-cap

@@ -0,0 +1,25 @@
+# HG changeset patch
+# Parent 37bcd8389c3f5d6e1d618b020c7decf7949a2f25
+diff -r 37bcd8389c3f -r febe6d83e803 lib/vagrant-skytap/action/prepare_nfs_settings.rb
+--- a/lib/vagrant-skytap/action/prepare_nfs_settings.rb	Wed Dec 02 17:37:41 2015 -0800
++++ b/lib/vagrant-skytap/action/prepare_nfs_settings.rb	Wed Dec 02 17:37:46 2015 -0800
+@@ -15,7 +15,7 @@
+ 
+           if using_nfs?
+             env[:nfs_host_ip] = read_host_ip
+-            env[:nfs_machine_ip] = read_machine_ip
++            env[:nfs_machine_ip] = machine.provider.capability(:public_address)
+           end
+ 
+           @app.call(env)
+@@ -35,10 +35,6 @@
+             @logger.debug "read_host_ip returning #{ret}"
+           end
+         end
+-
+-        def read_machine_ip
+-          machine.ssh_info[:host]
+-        end
+       end
+     end
+   end

data/_patches-20160118a/series

@@ -0,0 +1,62 @@
+gem-pre-version
+local-configs-ignore
+debug-changes
+acceptance-test-runner
+gems-old
+vagrantfile
+vagrantfile-for-acceptance-tests
+CR-ABOVE-THIS-LINE
+CR-BELOW-THIS-LINE
+COMPLETED-ABOVE-THIS-LINE
+COMPLETED-BELOW-THIS-LINE
+WIP-ABOVE-THIS-LINE
+eng-10256
+eng-10256-cr
+foo
+bar
+guestport-madness
+port-forwarding-processes
+eng-13040
+eng-12720
+eng-10256-ubuntu-testing
+eng-12843
+test-vagrantfile-vm1
+eng-12235-override-refactor
+eng-12232-command-spec
+eng-12235
+frickin-vagrant-spec
+eng-12249
+cache-api-client-in-up
+eng-12301
+vagrantfiles-to-forget-what-they-are-for
+eng-12240
+vagrantfile-for-nick
+refactor-to-use-public_address-cap
+eng-10269-test-stuff
+demo-rails-app
+read-state
+eng-11616
+eng-11616-2
+eng-11616-actual
+eng-10269-wtf
+parallelization-maybe
+eng-10369
+vm-vanished
+eng-10369-tmp
+eng-11625a
+eng-11711
+network-unreachable
+eng-11442
+WIP-BELOW-THIS-LINE
+new-boxfile
+ansible-1
+misc
+vagrant-spec-mock-api
+eng-10919
+env-source
+eng-11177-fix-actions-requires
+dead-code-in-actions
+eng-10166-halt-spec
+vagrant-vmware-plugin
+test-move-env-data
+googles-specs

data/_patches-20160118a/status

@@ -0,0 +1,14 @@
+813456f18a2d7810c0785efa925e2516a7fa5729:gem-pre-version
+7f14d802de4291b2efdc17b40fd0fe9c189e274d:local-configs-ignore
+f58d23763657d7390d29235fd709fc61ecc76490:debug-changes
+17a12e519015a5986884ee2bbeead0f7b3135ae7:acceptance-test-runner
+d1cb8fab445ff9d4913417f6cec1f399c8edda79:gems-old
+44e88c2d194ecc78aa8efdb55bea28d90bcc9147:vagrantfile
+6e203277c01d9617c0e124da8d2641f5ed0bfec2:vagrantfile-for-acceptance-tests
+5e5eb3471fc9f6c38f24b4f813a981063543f221:CR-ABOVE-THIS-LINE
+0237e8774c138da308c648254f00e3e1b69c3367:CR-BELOW-THIS-LINE
+ad1ff25e401370c9d1d974aac2d5795df27ca24f:COMPLETED-ABOVE-THIS-LINE
+40be46504011dabcf4bd458d9ecad34c48dcc8e0:COMPLETED-BELOW-THIS-LINE
+b669f28f24c6872c9a436d1673eea9be62f1f6b4:WIP-ABOVE-THIS-LINE
+c4f5983e2c63e1e0ca7b515308b5683f8d4c0967:eng-10256
+82e4386bb899141c5b7712207b63e01b1a765c6e:eng-10256-cr

data/_patches-20160118a/test-move-env-data

@@ -0,0 +1,231 @@
+# HG changeset patch
+# Parent b53e5fb4613bca1379e20e6d91ee14addfca153a
+tests for separating environment data
+
+diff --git a/lib/vagrant-skytap/action/create_environment.rb b/lib/vagrant-skytap/action/create_environment.rb
+--- a/lib/vagrant-skytap/action/create_environment.rb
++++ b/lib/vagrant-skytap/action/create_environment.rb
+@@ -28,7 +28,8 @@
+         def call(env)
+           environment = API::Environment.create!(env, template_url)
+           env[:environment] = environment
+-          environment.global_properties.write('url' => environment.url)
++          write_environment_url(environment.url)
++          #environment.global_properties.write('url' => environment.url)
+           environment.wait_until_ready
+ 
+           #TODO:NLA What's the right way to get this set? And where? Does it need to be set at all?
+@@ -42,6 +43,10 @@
+         def template_url
+           env[:machine].provider_config.template_url
+         end
++
++        def write_environment_url(url)
++          env[:environment].global_properties.write('url' => url)
++        end
+       end
+     end
+   end
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,1 +1,7 @@
+-
++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/virtualbox_context"
+diff --git a/spec/support/isolated_environment.rb b/spec/support/isolated_environment.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/support/isolated_environment.rb
+@@ -0,0 +1,45 @@
++require "fileutils"
++require "pathname"
++require "tmpdir"
++
++require "log4r"
++
++# This class manages an isolated environment for Vagrant to
++# run in. It creates a temporary directory to act as the
++# working directory as well as sets a custom home directory.
++#
++# This class also provides various helpers to create Vagrantfiles,
++# boxes, etc.
++class IsolatedEnvironment
++  attr_reader :homedir
++  attr_reader :workdir
++
++  # Initializes an isolated environment. You can pass in some
++  # options here to configure runing custom applications in place
++  # of others as well as specifying environmental variables.
++  #
++  # @param [Hash] apps A mapping of application name (such as "vagrant")
++  #   to an alternate full path to the binary to run.
++  # @param [Hash] env Additional environmental variables to inject
++  #   into the execution environments.
++  def initialize
++    @logger = Log4r::Logger.new("test::isolated_environment")
++
++    # Create a temporary directory for our work
++    @tempdir = Dir.mktmpdir("vagrant")
++    @logger.info("Initialize isolated environment: #{@tempdir}")
++
++    # Setup the home and working directories
++    @homedir = Pathname.new(File.join(@tempdir, "home"))
++    @workdir = Pathname.new(File.join(@tempdir, "work"))
++
++    @homedir.mkdir
++    @workdir.mkdir
++  end
++
++  # This closes the environment by cleaning it up.
++  def close
++    @logger.info("Removing isolated environment: #{@tempdir}")
++    FileUtils.rm_rf(@tempdir)
++  end
++end
+diff --git a/spec/vagrant-skytap/config_spec.rb b/spec/unit/config_spec.rb
+rename from spec/vagrant-skytap/config_spec.rb
+rename to spec/unit/config_spec.rb
+diff --git a/spec/unit/create_environment_spec.rb b/spec/unit/create_environment_spec.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/unit/create_environment_spec.rb
+@@ -0,0 +1,81 @@
++require 'spec_helper'
++require 'vagrant-skytap/action/create_environment'
++
++describe VagrantPlugins::Skytap::Action::CreateEnvironment do
++  include_context "unit"
++
++  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(:machine) do
++    iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
++      m.provider.stub(driver: driver)
++    end
++  end
++
++  #  let(:app) { nil }
++  #  let(:env) { {} }
++  #  subject(:action) { described_class.new(app, env) }
++  let(:env)    {{ machine: machine }}
++  let(:app)    { lambda { |*args| }}
++  let(:driver) { double("driver") }
++  let(:host)   { double("host") }
++
++  subject { described_class.new(app, env) }
++
++  before do
++    env[:test] = true
++    allow(machine.env).to receive(:host) { host }
++    allow(host).to receive(:capability).with(:nfs_installed) { true }
++  end
++
++
++  it "calls the next action in the chain" do
++    driver.stub(read_network_interfaces: {2 => {type: :hostonly, hostonly: "vmnet2"}})
++    driver.stub(read_host_only_interfaces: [{name: "vmnet2", ip: "1.2.3.4"}])
++    allow(driver).to receive(:read_guest_ip).with(1).and_return("2.3.4.5")
++
++    called = false
++    app = lambda { |*args| called = true }
++
++    action = described_class.new(app, env)
++    action.call(env)
++
++    expect(called).to eq(true)
++  end
++
++  #  describe '#template_url' do
++  #    subject(:args) { action.template_url }
++  #
++  #    context 'with no ssh options' do
++  #      let(:options) { [] }
++  #
++  #      it { should eql [] }
++  #    end
++  #
++  #    context 'with one option' do
++  #      let(:options) { ['StrictHostKeyChecking=no'] }
++  #      it { should eql ["-o 'StrictHostKeyChecking=no'"] }
++  #    end
++  #
++  #    context 'with multiple options' do
++  #      let(:options) { ['SHKC=no', 'Port=222'] }
++  #      it { should eql ["-o 'SHKC=no'", "-o 'Port=222'"] }
++  #    end
++  #  end
++
++  describe '#write_environment_url' do
++    subject(:args) { 'http://foo/bar' }
++
++    context 'whatever' do
++      #let(:options) { [] }
++
++      it { should eql 'http://foo/bar' }
++    end
++  end
++end
+diff --git a/spec/unit/environment_spec.rb b/spec/unit/environment_spec.rb
+new file mode 100644
+--- /dev/null
++++ b/spec/unit/environment_spec.rb
+@@ -0,0 +1,23 @@
++require 'vagrant-skytap/api/environment'
++
++describe VagrantPlugins::Skytap::API::Environment do
++  let(:attrs) { {} }
++  let(:env) { {} }
++  let(:instance) { described_class.new(attrs, env) }
++
++  describe "#busy?" do
++    context "it is busy" do
++      let(:runstate)  { 'busy' }
++
++      #instance.busy?.should be_true
++    end
++
++
++#    context "it is stopped" do
++#      let(:runstate)  { 'stopped' }
++#
++#      instance.busy?.should be_false
++#    end
++
++  end
++end
+diff --git a/spec/vagrant-skytap/unit/support/dummy_communicator.rb b/spec/unit/support/dummy_communicator.rb
+rename from spec/vagrant-skytap/unit/support/dummy_communicator.rb
+rename to spec/unit/support/dummy_communicator.rb
+diff --git a/spec/vagrant-skytap/unit/support/dummy_provider.rb b/spec/unit/support/dummy_provider.rb
+rename from spec/vagrant-skytap/unit/support/dummy_provider.rb
+rename to spec/unit/support/dummy_provider.rb
+diff --git a/spec/vagrant-skytap/unit/support/isolated_environment.rb b/spec/unit/support/isolated_environment.rb
+rename from spec/vagrant-skytap/unit/support/isolated_environment.rb
+rename to spec/unit/support/isolated_environment.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/action_synced_folders_context.rb b/spec/unit/support/shared/action_synced_folders_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/action_synced_folders_context.rb
+rename to spec/unit/support/shared/action_synced_folders_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/base_context.rb b/spec/unit/support/shared/base_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/base_context.rb
+rename to spec/unit/support/shared/base_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/capability_helpers_context.rb b/spec/unit/support/shared/capability_helpers_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/capability_helpers_context.rb
+rename to spec/unit/support/shared/capability_helpers_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/plugin_command_context.rb b/spec/unit/support/shared/plugin_command_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/plugin_command_context.rb
+rename to spec/unit/support/shared/plugin_command_context.rb
+diff --git a/spec/vagrant-skytap/unit/support/shared/virtualbox_context.rb b/spec/unit/support/shared/virtualbox_context.rb
+rename from spec/vagrant-skytap/unit/support/shared/virtualbox_context.rb
+rename to spec/unit/support/shared/virtualbox_context.rb