vagrant-skytap 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455c4338ed9776d5761234cf88c9da64455933f6
-  data.tar.gz: 1a779c4508305cfcd5f7296e7bf925a84219318b
+  metadata.gz: a0db322bf151366b7a7410bb0259e88305eeb9dd
+  data.tar.gz: 7cb5849243b0593c061cd0755f673c56a9ed2d6e
 SHA512:
-  metadata.gz: bfa0615339c9a79646f4745be2022162faced96eaecf912905ecdd3783a44ef0cd6960e82e75504284ecdc11b1557e960df9e5a7043af38d08c90376cdc815e1
-  data.tar.gz: dd43ce83a69b30281f301c0db38ed8c044fdddce225dfa5281b7db0b64b94cc3d2bc54e1519b6674f88ad28db33d7d3cbec9ed6ad9945bb155270e0ee3553f13
+  metadata.gz: ac6feeb123dff79a296ebb4928c0d3304d0e11533e1e463ddee3aac1ab7af4e04d368afa2472a8698c2a99c3cd4ec3121d2814c490bdec4716a7c4ba46130ade
+  data.tar.gz: 30f7465992c8b4fda2b65083ba8521a20ac2a70c24b43a06afa00ee678e0c336e7f6a8975e182dad9dad96ff1574a5a08b0b67b0adf5ee57b929dce3ac48b32e

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

@@ -1,21 +1,9 @@
 require "log4r"
-require 'json'
-
-require 'vagrant/util/retryable'
-
-require 'vagrant-skytap/util/timer'
-require 'vagrant-skytap/api/environment'
-
-require 'net/https'
-require 'uri'
-require 'base64'
-require 'json'
-require 'timeout'
 
 module VagrantPlugins
   module Skytap
     module Action
-      # Runs the Skytap environment and waits until running.
+      # Runs the Skytap environment.
       class RunEnvironment
         include Vagrant::Util::Retryable
 
@@ -29,24 +17,14 @@ module VagrantPlugins
 
         def call(env)
           env[:ui].info(I18n.t("vagrant_skytap.launching_instance"))
-
           environment.run!
 
-          wait_for_ssh_ready
-
           @app.call(env)
         end
 
         def environment
           env[:environment]
         end
-
-        def wait_for_ssh_ready
-          loop do
-            break if env[:interrupted] || env[:machine].communicate.ready?
-            sleep 1
-          end
-        end
       end
     end
   end

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

@@ -1,21 +1,9 @@
 require "log4r"
-require 'json'
-
-require 'vagrant/util/retryable'
-
-require 'vagrant-skytap/util/timer'
-require 'vagrant-skytap/api/environment'
-
-require 'net/https'
-require 'uri'
-require 'base64'
-require 'json'
-require 'timeout'
 
 module VagrantPlugins
   module Skytap
     module Action
-      # Runs the Skytap VM and waits until running.
+      # Runs the Skytap VM.
       class RunVm
         include Vagrant::Util::Retryable
 
@@ -30,7 +18,6 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_skytap.launching_vm"))
           environment.current_vm.run!
-          wait_for_ssh_ready
 
           @app.call(env)
         end
@@ -38,13 +25,6 @@ module VagrantPlugins
         def environment
           env[:environment]
         end
-
-        def wait_for_ssh_ready
-          loop do
-            break if env[:interrupted] || env[:machine].communicate.ready?
-            sleep 1
-          end
-        end
       end
     end
   end

data/lib/vagrant-skytap/action.rb

@@ -90,7 +90,10 @@ module VagrantPlugins
             end
             b1.use Call, IsStopped do |env2, b2|
               b2.use Call, IsRunning do |env3, b3|
-                b3.use RunVm unless env3[:result]
+                unless env3[:result]
+                  b3.use RunVm
+                  b3.use WaitForCommunicator
+                end
               end
 
               was_stopped = env2[:result]
@@ -215,6 +218,7 @@ module VagrantPlugins
               end
 
               b2.use RunVm
+              b2.use WaitForCommunicator
             end
           end
         end

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

@@ -4,8 +4,8 @@ module VagrantPlugins
   module Skytap
     module API
       module Busyable
-        WAIT_TIMEOUT = 600
-        WAIT_ITERATION_PERIOD = 1
+        WAIT_TIMEOUT = 300
+        WAIT_ITERATION_PERIOD = 2
 
         def update_with_retry(attrs, path=nil)
           retry_while_resource_busy do

data/lib/vagrant-skytap/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Skytap
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Astete
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -123,10 +123,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- Vagrantfile.orig
-- bar/checksums.yaml
-- bar/data.tar
-- bar/metadata
 - dummy.box
 - example_box/README.md
 - example_box/metadata.json
@@ -191,7 +187,6 @@ files:
 - lib/vagrant-skytap/util/subnet.rb
 - lib/vagrant-skytap/util/timer.rb
 - lib/vagrant-skytap/version.rb
-- lib/vagrant-skytap/version.rb.orig
 - lib/vagrant-skytap/vm_properties.rb
 - locales/en.yml
 - skytap-dummy.box

data/Vagrantfile.orig

@@ -1,34 +0,0 @@
-$script = <<SCRIPT
-echo I am provisioning...
-sudo apt-get install -y rbenv make ruby-dev libssl-dev libreadline-dev zlib1g-dev git bundler
-  export PATH="$HOME/.rbenv/bin:$PATH"
-  eval "$(rbenv init -)"
-git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
-SCRIPT
-
-Vagrant.configure(2) do |config|
-  config.vm.box = "skytap/empty"
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.provision "shell", inline: $script
-
-  config.vm.provider :skytap do |skytap, override|
-    skytap.username = "etrue"
-    skytap.api_token = "fcb2620b72efddbc8239e25db9d812f510c7e166"
-  end
-
-  GENERIC_UBUNTU = 'https://cloud.skytap.com/vms/6869434'
-  UBUNTU1 = "https://cloud.skytap.com/vms/7285844"
-  UBUNTU2 = "https://cloud.skytap.com/vms/7285846"
-  UBUNTU_WITH_VAGRANT = "https://cloud.skytap.com/vms/7397734"
-
-
-  config.vm.define "vm1" do |ubuntu|
-    ubuntu.vm.hostname = "vm1"
-    ubuntu.vm.provider :skytap do |box|
-      box.vm_url = UBUNTU_WITH_VAGRANT
-    end
-    ubuntu.vm.synced_folder "~/test1", "/synced", type: :nfs
-    ubuntu.ssh.username = "skytap"
-    ubuntu.ssh.password = "ChangeMe!"
-  end
-end

data/bar/checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 24a1c03bc0e10db880d99fa3af00f067b4d13ea6
-  data.tar.gz: 92bf878a29425935dbc71fd9f7980915e3b36da9
-SHA512:
-  metadata.gz: 35aaa99e4ff841a64266ea41f96ce8dbf6966a55cf047be2ae8ff54650ac93044767a14ff8f625ec9be9e0afd69327f407b2464c4829e2db9040570da9a99c8c
-  data.tar.gz: 6f9f5299c9dc295e6d7ff1ffec8f1d939b025ea00e8f669be9b3bb63104189a8a8a295aa613b0c306cae240bfb33e3a0c0a76eeb4523ebd68c01f45ab153a6e7

data/bar/metadata

@@ -1,242 +0,0 @@
---- !ruby/object:Gem::Specification
-name: vagrant-skytap
-version: !ruby/object:Gem::Version
-  version: 0.0.5
-platform: ruby
-authors:
-- Nick Astete
-autorequire: 
-bindir: bin
-cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  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.
-email: nastete@skytap.com
-executables: []
-extensions: []
-extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".hgignore"
-- ".project"
-- ".rspec"
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- dummy.box
-- example_box/README.md
-- example_box/metadata.json
-- lib/vagrant-skytap.rb
-- lib/vagrant-skytap/action.rb
-- 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/initialize_api_client.rb
-- lib/vagrant-skytap/action/is_running.rb
-- lib/vagrant-skytap/action/is_stopped.rb
-- lib/vagrant-skytap/action/is_suspended.rb
-- lib/vagrant-skytap/action/message_already_created.rb
-- 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_will_not_destroy.rb
-- lib/vagrant-skytap/action/mixin_machine_index.rb
-- lib/vagrant-skytap/action/prepare_nfs_settings.rb
-- lib/vagrant-skytap/action/prepare_nfs_valid_ids.rb
-- lib/vagrant-skytap/action/read_ssh_info.rb
-- lib/vagrant-skytap/action/read_state.rb
-- lib/vagrant-skytap/action/run_environment.rb
-- lib/vagrant-skytap/action/run_vm.rb
-- lib/vagrant-skytap/action/set_hostname.rb
-- lib/vagrant-skytap/action/set_up_vm.rb
-- lib/vagrant-skytap/action/stop_environment.rb
-- lib/vagrant-skytap/action/stop_vm.rb
-- lib/vagrant-skytap/action/store_extra_data.rb
-- lib/vagrant-skytap/action/suspend_environment.rb
-- lib/vagrant-skytap/action/suspend_vm.rb
-- lib/vagrant-skytap/action/timed_provision.rb
-- lib/vagrant-skytap/action/update_hardware.rb
-- lib/vagrant-skytap/api/busyable.rb
-- lib/vagrant-skytap/api/client.rb
-- lib/vagrant-skytap/api/credentials.rb
-- lib/vagrant-skytap/api/environment.rb
-- lib/vagrant-skytap/api/interface.rb
-- lib/vagrant-skytap/api/network.rb
-- lib/vagrant-skytap/api/public_ip.rb
-- lib/vagrant-skytap/api/published_service.rb
-- lib/vagrant-skytap/api/resource.rb
-- lib/vagrant-skytap/api/runstate_operations.rb
-- lib/vagrant-skytap/api/specified_attributes.rb
-- lib/vagrant-skytap/api/vm.rb
-- lib/vagrant-skytap/api/vpn.rb
-- lib/vagrant-skytap/api/vpn_attachment.rb
-- lib/vagrant-skytap/config.rb
-- lib/vagrant-skytap/core_ext/object/blank.rb
-- lib/vagrant-skytap/core_ext/object/tap.rb
-- lib/vagrant-skytap/core_ext/try.rb
-- lib/vagrant-skytap/environment_properties.rb
-- lib/vagrant-skytap/errors.rb
-- lib/vagrant-skytap/plugin.rb
-- lib/vagrant-skytap/properties.rb
-- lib/vagrant-skytap/provider.rb
-- lib/vagrant-skytap/setup_helper.rb
-- lib/vagrant-skytap/util/ip_address.rb
-- lib/vagrant-skytap/util/subnet.rb
-- lib/vagrant-skytap/util/timer.rb
-- lib/vagrant-skytap/version.rb
-- lib/vagrant-skytap/vm_properties.rb
-- locales/en.yml
-- skytap-dummy.box
-- spec/acceptance/base.rb
-- spec/acceptance/provider/halt_spec.rb
-- spec/acceptance/shared/context_skytap.rb
-- spec/spec_helper.rb
-- spec/support/isolated_environment.rb
-- spec/unit/base.rb
-- spec/unit/config_spec.rb
-- spec/unit/environment_spec.rb
-- spec/unit/skeletons/empty_environment.json
-- spec/unit/skeletons/network1.json
-- spec/unit/skeletons/vm1.json
-- spec/unit/support/dummy_communicator.rb
-- spec/unit/support/dummy_provider.rb
-- 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/skytap_context.rb
-- spec/unit/vm_spec.rb
-- tasks/acceptance.rake
-- tasks/bundler.rake
-- tasks/test.rake
-- vagrant-skytap.gemspec
-- vagrant-spec.config.rb
-homepage: http://www.skytap.com
-licenses:
-- MIT
-metadata: {}
-post_install_message: 
-rdoc_options: []
-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
-signing_key: 
-specification_version: 4
-summary: Enables Vagrant to manage Skytap machines.
-test_files: []

data/lib/vagrant-skytap/version.rb.orig

@@ -1,5 +0,0 @@
-module VagrantPlugins
-  module Skytap
-    VERSION = "0.0.6"
-  end
-end