vagrant-skytap 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9803dcd4a9599d58a78653c2feffcd9748441012
-  data.tar.gz: 9e22383d99a894143de9a12db928b8af9211e175
+  metadata.gz: ee9cca3ef03d038cdb2470d8311a73a4d8b2abd6
+  data.tar.gz: 8d8a3248ef15261b24731511665da4ae73ea90b4
 SHA512:
-  metadata.gz: a0266e176c96068c36c5133ab746c64cd4bada2febe1d9cfdd4241fa1888776a65d5013f82ab679e72b4d997123c3abacf609fecbfb4e5a0fc0847a44c58a9f7
-  data.tar.gz: 01ab3cedd7f84e7f6756d7f84d23ea714db1a48ee16cf8bea6c451a7ecf88c5786def1650a857d2364dc228516485a813db3477fa338cd84e9434267e795d986
+  metadata.gz: e8cfb11207527c5d94ce6b50b1c5735b24f2080b6565d6977173bdfa9317072b6173b2b42f672fbfe080f2fd2d331b68e59de0b523c82085253fb2b752a967fb
+  data.tar.gz: 88af9755df93f2e2a1514bc86b1c3600561aa25e0dff8adf2695563b7ecf23c82463d03a976783aca0a09e7c3565c5d7209913194d28710ea7ec3ada34307ce9

data/.byebug_history

@@ -1,256 +1,256 @@
 c
-s
-n
-args
-message
-finish
-object
-s
-args
-self
-@method_name
-method_name
 $!
-s
-machine
-fp
-c 58
-c
-expect(map.values.first).to be_a(Pathname)
 c
-map.values.first.is_a?(Pathname)
-map.values.first.class
-map.values.first
-c
-id
-(guest_port == 22 && host_port == 2222)
-self
-c
-self
-c
-id
-(guest_port == 22 && host_port == 2222) 
-self
-c
-up
-c
-display options
+@env[:initial_states]
+vm_ids
+n
+q
+env[:initial_states]
+vm_ids
+n
 c
-up
+environment.current_vm.id
+env[:machine].id
+environment.current_vm
+vm_ids = env[:machines].try(:collect, &:id)
+env[:vm_ids]
+env[:first_machine]
+env[:initial_states]
+env.keys
+env
+env.keys
 c
-up
-options
+initial_states
 c
-display fp
+machine
 c
-fp
-@env[:forwarded_ports].last
-@env[:forwarded_ports]
-fp.internal_ssh_port?
+machine
 c
-cc
+n
 c
-display fp
+finish
+n
 c
-env[:machine].config.vm.networks.first.class
-env[:machine].config.vm.networks.first
-ap env[:machine].config.vm.networks
+n
+machine.name
+c 89
 c
-ap env[:port_collision_extra_in_use]
-env[:port_collision_extra_in_use]
-ports
+names
 c
-ports
+n
 c
-ports
+display name
 c
-ports
-env[:machine].ssh_info
-env[:machine].name
+name
 c
-puts env[:port_collision_extra_in_use]
-env[:port_collision_extra_in_use]
+@env.default_provider
+finish
+s
+@env
+@sub_args
+n
+finish
+Skytap::Command::Up
 n
 c
-env[:port_collision_extra_in_use]
-c
-env[:host].capability(:read_forwarded_ports, env[:machine])
-c
-b 21
 n
+display opts
+display name
 c
-get_fp_from_directory(search_paths.first)
-search_paths
+name
 n
-s
-args
+name
 n
-s
-c
-ap resp
-resp.body
-c
-resp.body
-c
-ap resp
-c
-ap JSON.load(resp.body)
-resp.body
-ap resp
-c
-$!
+@ui.machine("metadata", "provider", provider_name)
+n
+finish
+result
+n
+name
 n
 c
-up
+env[:machines].collect(&:name)
+env[:machines]
+machines
+machines.keys
+vm.from_template?
+vm.configuration_url
+vm.configuration_id
+vm.id
+vm
+puts h
+h[:foo]
+puts h[:boo]
+puts h
+h[:boo] << 2
+puts h
+h
+h=Hash.new{|h, k| h[k] = []}
+new_machines.first.name
+machine.name
+vm.template_url
+vm.configuration_url
+vm.name
+vm = API::Vm.fetch(env, vm_url)
+vm_url
+vm.attrs
+vm = API::Vm.fetch(vm_url, env)
+vm = API::Vm.fetch(vm_url)
+vm = Vm.fetch(vm_url)
+vm_url = new_machines.first.provider_config.vm_url
+vm_url = machine.provider_config.vm_url
+env[:environment]
+active_machines
+new_machines
+c
+machines.first.provider_name
+machines.first.provider.name
+machines.first.provider.id
+machines.first.provider.to_s
+machines.first.provider
+machines
+@env.machines
 $!
-s
-ap resp
-args
-up
-url
-c
-ap body['vms']
-ap body.keys
-ap body
-body=JSON.load(resp.body)
 n
-attrs
+q
+env[:environment].url
+env[:environment]
+active_machines
+new_machines
 c
-finish
 n
 c
-new_vm_ids
-new_vms_ids
+Hash[@env.active_machines].values.first
+Hash[@env.active_machines].values
+Hash[@env.active_machines].first
+Hash[@env.active_machines]
+@env.active_machines.to_h
+@env.active_machines.first.last
+@env.active_machines
+@env
+env
+machines.first.provider.name
+machines.first.provider
+c
 n
 finish
-$!
 n
-s
-args
-ap vm.attrs
-ap vm
-args
-n
-vm_ids
-n
-finish
-vm.region
+machines
+$!
 finish
+result
 n
-ap vm.attrs
-finish
+entry
 n
-vm_url
+result
+$!
 finish
+options
 s
-vm_url
+names
+n
 c
-get_api_attribute('configuration_url')
+n
 c
-ap attrs
-attrs
-attributes
 n
-s
 c
-display pidfile
+q
 c
-display pidfile
+skytap_environment.class
 c
-pidfile
+q
 c
-$1
-'w33' =~ /(\w+)/
-'w33' =~ /(\w+/
-$1
-'w33' =~ /\w+/
-$2
-$1
-/\w+/ =~ 'w33'
-$2
-$1
+API::Environment.properties(nil)
+API::Environment.properties
 n
-pidfile
 c
-machine
+s
+API::Environment.properties
+n
 c
-machine.data_dir
-machine
+props
+n
+env[:environment]
 c
-env.host.capability
-env.host
-env
+API::Environment.properties(env)
 c
-Object.const_get("VagrantPlugins::Skytap::HostDarwin::Cap::Processes")
-Object.const_get("HostDarwin::Cap::Processes")
-Object.const_get("HostDarwin")
-Object.const_get("Foo")
+API::Environment.properties(env)
+n
 c
-result.to_s
-result.exit_code == 0
-result.exit_code
-result = Vagrant::Util::Subprocess.execute("ps", "-p", pid.to_s, "-o", "comm")
+n
 c
+env[:environment]
 n
-finish
+c
+{'url' => 'foo'}
+{'url':'foo'}
+API::Environment.properties(env)
 n
-pid
+ap env.keys
+ap env
 c
-$!
+cc
 c
-$!
+machine2
+n
+machine1
+c
+display names
+c
+display names
 c
 n
-finish
+s
 n
+machine
 c
-result
-finish
-$!
-n
-pid
+display names
 c
-s
-pid
+machines.count
 c
-res
+b 101
+display names
+c
+names
+c
+environment
 n
 c
+display names
+c
+puts i
+c
+b 101
+puts i
+i
+c 101
 n
-autossh_pid?(pid)
-pid
+c
+display names
+c
+display names
+c
+c 96
 n
-machine.data_dir
+c 86
 n
+names
 c
-puts $!.backtrace
-puts $1.backtrace
-$!
-n
+names
 c
-pidfile_path
-File.read('foo')
-finish
-args
-finish
-$!
-s
-pidfile
-n
+names
 c
-Pathname.new('foo')
-Pathname
-Path
+names
 c
+b 96
+b
+names
+finish
 $!
 n
 c
-VagrantPlugins::Skytap::Model::ForwardedPort
-Skytap::Model::ForwardedPort
-forwarded_port
+n
+folders.count
 c
-VagrantPlugins::Skytap::Model::ForwardedPort
-require 'vagrant-skytap/model/forwarded_port'
-VagrantPlugins::Skytap::API
-VagrantPlugins::Skytap::sdf
-VagrantPlugins::Skytap
+folders.first
+folders.count

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.1 (January 26, 2016)
+
+* Handle error when the user tries to use --install-provider flag.
+
 # 0.2.0 (January 20, 2016)
 
 * Add support for port forwarding on Linux and BSD hosts using AutoSSH

data/README.md

@@ -111,7 +111,9 @@ Notes:
 * When the first VM is created, a Skytap environment will be created; when all VMs are deleted, the containing environment will also be deleted.
 * The timeout for graceful shutdown is currently set to 5 minutes.
 * Changes to hardware settings of an existing VM will take effect when the VM is being powered on; that is, when doing `vagrant reload`, or `vagrant up` when the machine is halted.
+* The `--install-provider` option for `vagrant up` is unsupported. The provider will be installed, but it will be necessary to run `vagrant up` again.
 
+will install the provider only. It will be necess
 
 ## Additional Supported Actions
 
@@ -207,3 +209,5 @@ To enable logging while troubleshooting, see [https://docs.vagrantup.com/v2/othe
 * Port forwarding is currently unsupported on Windows.
 * Although several Skytap public library VMs include credentials for the `root` login, its use is not recommended.
 * Once a VM has been created, it is not possible to change its connection method (i.e., connect using a different VPN). This is the case whether the VPN is specified in the Vagrantfile with the `vpn_url` setting, or selected interactively.
+* Installing the Skytap provider using the `--install-provider` flag is not supported.
+* The `vagrant port` command is currently not supported.

data/lib/vagrant-skytap/action.rb

@@ -184,6 +184,19 @@ module VagrantPlugins
         end
       end
 
+      # This is the action that the default "vagrant up" invokes.
+      # Since we don't call action_up, this will only be called
+      # if the user attempts to install the Skytap provider using
+      # the --install-provider flag.
+      def self.action_up
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Message, "You are seeing this message because the Skytap "\
+            "provider currently does not fully support the --install-provider "\
+            "flag. The provider has been installed successfully. Please run " \
+            "'vagrant up' again to continue."
+        end
+      end
+
       # The Skytap provider has a modified "vagrant up" command which
       # takes advantage of parallel runstate operations on Skytap
       # environments. The create and update_hardware actions are

data/lib/vagrant-skytap/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Skytap
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/unit/base.rb

@@ -11,6 +11,8 @@ require "webmock/rspec"
 require "vagrant"
 require "vagrant/util/platform"
 
+require "vagrant-skytap"
+
 # Add the test directory to the load path
 $:.unshift File.expand_path("../../", __FILE__)
 
@@ -22,8 +24,7 @@ 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 "vagrant-skytap"
+require "unit/support/shared/rest_api_context"
 
 # Do not buffer output
 $stdout.sync = true

data/spec/unit/environment_spec.rb

@@ -1,18 +1,20 @@
 require_relative 'base'
-require "vagrant-skytap/api/environment"
-require "vagrant-skytap/api/vm"
 
 describe VagrantPlugins::Skytap::API::Environment do
   include_context "unit"
+  include_context "rest_api"
   Errors = VagrantPlugins::Skytap::Errors
 
-  let(:vm1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vm1.json'))) }
+  let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
+  let(:vm1_attrs) { read_json(json_path, 'vm1.json') }
   let(:vm2_attrs) { vm1_attrs.merge("id" => "6981851", "name" => "VM2") }
-  let(:config_vm_attrs) { vm1_attrs.merge("configuration_url" => "https://example.com/configurations/5570024", "template_url" => nil) }
-  let(:network1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'network1.json'))) }
-  let(:vpn_attachment1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vpn_attachment1.json'))) }
-  let(:empty_environment_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_environment.json')))}
-  let(:empty_publish_set_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_publish_set.json')))}
+  let(:config_vm_attrs) do
+    vm1_attrs.merge("configuration_url" => "https://example.com/configurations/5570024", "template_url" => nil)
+  end
+  let(:network1_attrs) { read_json(json_path, 'network1.json') }
+  let(:vpn_attachment1_attrs) { read_json(json_path, 'vpn_attachment1.json') }
+  let(:empty_environment_attrs) { read_json(json_path, 'empty_environment.json') }
+  let(:empty_publish_set_attrs) { read_json(json_path, 'empty_publish_set.json') }
 
   let(:attrs_one_vm) do
     empty_environment_attrs.dup.tap do |ret|

data/spec/unit/publish_set_spec.rb

@@ -1,13 +1,14 @@
 require_relative 'base'
-require "vagrant-skytap/api/publish_set"
 
 describe VagrantPlugins::Skytap::API::PublishSet do
   include_context "unit"
+  include_context "rest_api"
 
-  let(:vm1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vm1.json'))) }
+  let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
+  let(:vm1_attrs) { read_json(json_path, 'vm1.json') }
   let(:vm2_attrs) { vm1_attrs.merge("id" => "6981851", "name" => "VM2") }
-  let(:empty_environment_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_environment.json')))}
-  let(:empty_publish_set_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_publish_set.json')))}
+  let(:empty_environment_attrs) { read_json(json_path, 'empty_environment.json')}
+  let(:empty_publish_set_attrs) { read_json(json_path, 'empty_publish_set.json')}
 
   let(:env_attrs) do
     empty_environment_attrs.dup.tap do |ret|

data/spec/unit/setup_helper_spec.rb

@@ -6,14 +6,16 @@ require "vagrant-skytap/api/vpn_attachment"
 
 describe VagrantPlugins::Skytap::SetupHelper do
   include_context "unit"
+  include_context "rest_api"
 
   let(:instance) { described_class.new }
+  let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
 
-  let(:vm1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vm1.json'))) }
-  let(:network1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'network1.json'))) }
-  let(:vpn1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vpn1.json'))) }
-  let(:vpn_attachment1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vpn_attachment1.json'))) }
-  let(:empty_environment_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_environment.json')))}
+  let(:vm1_attrs) { read_json(json_path, 'vm1.json') }
+  let(:network1_attrs) { read_json(json_path, 'network1.json') }
+  let(:vpn1_attrs) { read_json(json_path, 'vpn1.json') }
+  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

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

@@ -0,0 +1,14 @@
+require "vagrant-skytap/api/credentials"
+require "vagrant-skytap/api/environment"
+require "vagrant-skytap/api/interface"
+require "vagrant-skytap/api/network"
+require "vagrant-skytap/api/public_ip"
+require "vagrant-skytap/api/published_service"
+require "vagrant-skytap/api/resource"
+require "vagrant-skytap/api/vm"
+require "vagrant-skytap/api/vpn_attachment"
+require "vagrant-skytap/api/vpn"
+
+shared_context "rest_api" do
+  include_context "skytap"
+end

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

@@ -1,3 +1,5 @@
 shared_context "skytap" do
-  include_context "unit"
+  def read_json(*args)
+    JSON.load(File.read(File.join(args)))
+  end
 end

data/spec/unit/vm_spec.rb

@@ -1,13 +1,15 @@
 require_relative 'base'
-require "vagrant-skytap/api/vm"
 
 describe VagrantPlugins::Skytap::API::Vm do
   include_context "unit"
+  include_context "rest_api"
 
-  let(:vm1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'vm1.json'))) }
+  let(:json_path) { File.join(File.expand_path('..', __FILE__), 'support', 'api_responses') }
+
+  let(:vm1_attrs) { read_json(json_path, 'vm1.json') }
   let(:vm2_attrs) { vm1_attrs.merge("id" => "6981851", "name" => "VM2") }
-  let(:network1_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'network1.json'))) }
-  let(:empty_environment_attrs) { JSON.load(File.read(File.join(File.expand_path('..', __FILE__), 'skeletons', 'empty_environment.json')))}
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -525,12 +525,12 @@ files:
 - spec/unit/prepare_collision_params_spec.rb
 - spec/unit/publish_set_spec.rb
 - spec/unit/setup_helper_spec.rb
-- spec/unit/skeletons/empty_environment.json
-- spec/unit/skeletons/empty_publish_set.json
-- spec/unit/skeletons/network1.json
-- spec/unit/skeletons/vm1.json
-- spec/unit/skeletons/vpn1.json
-- spec/unit/skeletons/vpn_attachment1.json
+- spec/unit/support/api_responses/empty_environment.json
+- spec/unit/support/api_responses/empty_publish_set.json
+- spec/unit/support/api_responses/network1.json
+- 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
@@ -548,6 +548,7 @@ files:
 - 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
 - tasks/acceptance.rake
@@ -555,7 +556,6 @@ files:
 - tasks/test.rake
 - vagrant-skytap.gemspec
 - vagrant-spec.config.rb
-- Vagrantfile.rej
 - .byebug_history
 - .gitignore
 - .hgignore

data/Vagrantfile.rej

@@ -1,83 +0,0 @@
---- Vagrantfile
-+++ Vagrantfile
-@@ -85,6 +85,16 @@
-   environment_vm2: {
-     vm_url: "https://cloud.skytap.com/vms/8283794"
-   },
-+  test_vagrant_customer_template_vm_1: {
-+    vm_url: "https://test.skytap.com/vms/6863190",
-+    username: "autoadmin",
-+    password: "autoadmin",
-+  },
-+  test_vagrant_customer_env_vm_1: {
-+    vm_url: "https://test.skytap.com/vms/7088324",
-+    username: "autoadmin",
-+    password: "autoadmin",
-+  },
- }.tap do |ret|
-   ret.each do |key, vm|
-     vm[:username] ||= "skytap"
-@@ -97,7 +107,7 @@
- settings_key = :etrue_prod
- vm1_key = :golden
- vm2_key = :windows_winrm_configured
--vm3_key = :ubuntu2
-+vm3_key = :golden
- #############################
- 
- 
-@@ -120,7 +130,7 @@
-   #end
- 
-   config.vm.define "vm1" do |box|
--    #box.vm.hostname = "vm1"
-+    box.vm.hostname = "vm1"
-     box.vm.provider :skytap do |box|
-       box.vm_url = vms[vm1_key][:vm_url]
-       #box.cpus = 1
-@@ -132,10 +142,10 @@
-     #box.vm.synced_folder ".", "/vagrant-skytap", type: :nfs, mount_options: ['actimeo=1']
-     #box.vm.provision "shell", path: "provisioning/trivial.sh"
-     box.vm.provision "shell", path: "provisioning/apache.sh"
--    box.vm.provision "shell", path: "provisioning/vagrant.sh"
-+    #box.vm.provision "shell", path: "provisioning/vagrant.sh"
- 
--    box.vm.network :forwarded_port, guest: 80, host: 9000
--    #box.vm.network :forwarded_port, guest: 21, host: 9001
-+    box.vm.network :forwarded_port, guest: 80, host: 9000, auto_correct: true
-+    box.vm.network :forwarded_port, guest: 21, host: 9001, auto_correct: true
-   end
- 
- #  config.vm.define "vm2" do |box|
-@@ -149,17 +159,20 @@
- #    box.vm.synced_folder "vm2", "/synced", type: :nfs
- #  end
- #
--#  config.vm.define "vm3" do |box|
--#    box.vm.hostname = "vm3"
--#    box.vm.provider :skytap do |box|
--#      box.vm_url = vms[vm3_key][:vm_url]
--#    end
--#    box.ssh.username    = vms[vm3_key][:username]
--#    box.ssh.password    = vms[vm3_key][:password]
--#    box.vm.communicator = vms[vm3_key][:communicator]
--#    box.vm.synced_folder "vm3", "/synced", type: :nfs
--#    box.vm.provision "shell", path: "provisioning/trivial.sh"
--#  end
-+  config.vm.define "vm3" do |box|
-+    #box.vm.hostname = "vm3"
-+    box.vm.provider :skytap do |box|
-+      box.vm_url = vms[vm3_key][:vm_url]
-+    end
-+    box.ssh.username    = vms[vm3_key][:username]
-+    box.ssh.password    = vms[vm3_key][:password]
-+    box.vm.communicator = vms[vm3_key][:communicator]
-+    #box.vm.synced_folder "vm3", "/synced", type: :nfs
-+    box.vm.provision "shell", path: "provisioning/apache.sh"
-+
-+    box.vm.network :forwarded_port, guest: 80, host: 9000, auto_correct: true
-+    box.vm.network :forwarded_port, guest: 21, host: 9001, auto_correct: true
-+  end
- end
- 
- #ubuntu.vm.synced_folder "vm1", "/home/skytap/app", type: :nfs, :mount_options => ['actimeo=1']