vagrant-skytap 0.1.6 → 0.1.7

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

@@ -78,6 +78,10 @@ module VagrantPlugins
           super
         end
 
+        def run!(vm_ids = nil)
+          set_runstate :running, vm_ids: vm_ids
+        end
+
         def delete
           retry_while_resource_busy do
             api_client.delete(url)

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

@@ -20,12 +20,17 @@ module VagrantPlugins
         end
 
         def poweroff!
-          set_runstate :halted, :stopped
+          set_runstate :halted, completed_runstate: :stopped
         end
 
-        def set_runstate(new_runstate, completed_runstate = nil)
-          completed_runstate ||= new_runstate
-          update_with_retry(runstate: new_runstate)
+        def set_runstate(new_runstate, opts = {})
+          completed_runstate = opts.delete(:completed_runstate) || new_runstate
+
+          params = {runstate: new_runstate}.tap do |ret|
+            ret[:multiselect] = opts[:vm_ids] if opts[:vm_ids]
+          end
+          update_with_retry(params)
+
           wait_for_runstate(completed_runstate) unless runstate == completed_runstate
         end
 

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

@@ -0,0 +1,47 @@
+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
+        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

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

@@ -0,0 +1,126 @@
+require 'optparse'
+
+require "vagrant"
+
+require_relative 'start_mixins'
+
+# This is a modified copy of the built-in "up" command, which alters 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.
+
+module VagrantPlugins
+  module Skytap
+    module Command
+      class Up < Vagrant.plugin("2", :command)
+        include StartMixins
+
+        def self.synopsis
+          "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...")
+
+          machines = []
+          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
+              machine.action(:create, options)
+              machine.action(:update_hardware, options)
+            end
+
+            initial_states = machines.inject({}) {|acc, m| acc[m.id] = m.state.id ; acc }
+
+            machines.each_with_index do |machine, i|
+              machine.action(:run_vm, options.merge(
+                first_machine:  i == 0,
+                machines:       machines,
+                initial_states: initial_states
+              ))
+            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
+

data/lib/vagrant-skytap/plugin.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
         Config
       end
 
-      provider(:skytap, parallel: false) do
+      provider(:skytap, parallel: true) do
         # Setup logging and i18n
         setup_logging
         setup_i18n
@@ -34,6 +34,11 @@ module VagrantPlugins
         Provider
       end
 
+      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/lib/vagrant-skytap/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Skytap
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/locales/en.yml

@@ -3,8 +3,8 @@ en:
     already_status: |-
       The machine is already %{status}.
 
-    launching_instance: |-
-      Launching an instance with the following settings...
+    running_environment: |-
+      Starting VMs ...
     launching_vm: |-
       Launching a VM with the following settings...
     not_created: |-
@@ -22,6 +22,8 @@ en:
       Stopping the instance...
     terminating: |-
       Terminating the instance...
+    resuming: |-
+      Resuming the suspended instance ...
     waiting_for_ready: |-
       Waiting for instance to become "ready"...
     waiting_for_ssh: |-

data/spec/acceptance/provider/up_spec.rb

@@ -0,0 +1,40 @@
+# This tests that an instance can be upped correctly
+shared_examples 'provider/up' do |provider, options|
+  if !options[:box]
+    raise ArgumentError,
+          "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('generic')
+    #assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'should bring up the machine and halt it' do
+    status("Test: machine can be brought up, parallel by default")
+    up_result = execute("vagrant", "up")
+    expect(up_result).to exit_with(0)
+
+    status("Test: machine is running after up")
+    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(echo_result).to exit_with(0)
+    expect(echo_result.stdout).to match(/foo\n$/)
+  end
+
+  it 'should bring up the machine and halt it' do
+    status("Test: machine can be brought up no parallel")
+    up_result = execute("vagrant", "up", "--no-parallel")
+    expect(up_result).to exit_with(0)
+
+    status("Test: machine is running after up")
+    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(echo_result).to exit_with(0)
+    expect(echo_result.stdout).to match(/foo\n$/)
+  end
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: vagrant-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.20'
 description: Enables Vagrant to manage Skytap machines.
@@ -114,28 +114,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".hgignore"
-- ".project"
-- ".rspec"
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- boxes/README.md
+- bar
 - boxes/empty.box
 - boxes/metadata.json
+- boxes/README.md
+- CHANGELOG.md
+- eng-10269-cleanup.diff
+- eng-10269-tmp.diff
+- eng-10269.diff
+- eng-10269.diff.1
 - eng-10369.diff
-- lib/vagrant-skytap.rb
-- lib/vagrant-skytap/action.rb
+- Gemfile
 - lib/vagrant-skytap/action/add_vm_to_environment.rb
 - lib/vagrant-skytap/action/create_environment.rb
 - lib/vagrant-skytap/action/delete_environment.rb
 - lib/vagrant-skytap/action/delete_vm.rb
 - lib/vagrant-skytap/action/existence_check.rb
 - lib/vagrant-skytap/action/fetch_environment.rb
+- lib/vagrant-skytap/action/initial_state.rb
 - lib/vagrant-skytap/action/initialize_api_client.rb
+- lib/vagrant-skytap/action/is_parallelized.rb
 - lib/vagrant-skytap/action/is_running.rb
 - lib/vagrant-skytap/action/is_stopped.rb
 - lib/vagrant-skytap/action/is_suspended.rb
@@ -143,6 +141,7 @@ files:
 - lib/vagrant-skytap/action/message_already_running.rb
 - lib/vagrant-skytap/action/message_environment_url.rb
 - lib/vagrant-skytap/action/message_not_created.rb
+- lib/vagrant-skytap/action/message_resuming.rb
 - lib/vagrant-skytap/action/message_will_not_destroy.rb
 - lib/vagrant-skytap/action/mixin_machine_index.rb
 - lib/vagrant-skytap/action/prepare_nfs_settings.rb
@@ -161,6 +160,7 @@ files:
 - lib/vagrant-skytap/action/timed_provision.rb
 - lib/vagrant-skytap/action/update_hardware.rb
 - lib/vagrant-skytap/action/wait_for_communicator.rb
+- lib/vagrant-skytap/action.rb
 - lib/vagrant-skytap/api/busyable.rb
 - lib/vagrant-skytap/api/client.rb
 - lib/vagrant-skytap/api/credentials.rb
@@ -175,6 +175,8 @@ files:
 - lib/vagrant-skytap/api/vm.rb
 - lib/vagrant-skytap/api/vpn.rb
 - lib/vagrant-skytap/api/vpn_attachment.rb
+- lib/vagrant-skytap/command/start_mixins.rb
+- lib/vagrant-skytap/command/up.rb
 - lib/vagrant-skytap/config.rb
 - lib/vagrant-skytap/core_ext/object/blank.rb
 - lib/vagrant-skytap/core_ext/object/tap.rb
@@ -190,9 +192,14 @@ files:
 - lib/vagrant-skytap/util/timer.rb
 - lib/vagrant-skytap/version.rb
 - lib/vagrant-skytap/vm_properties.rb
+- lib/vagrant-skytap.rb
+- LICENSE
 - 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
@@ -219,6 +226,11 @@ files:
 - tasks/test.rake
 - vagrant-skytap.gemspec
 - vagrant-spec.config.rb
+- .byebug_history
+- .gitignore
+- .hgignore
+- .project
+- .rspec
 homepage: http://www.skytap.com
 licenses:
 - MIT
@@ -229,17 +241,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-skytap
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Skytap machines.