vagrant-azure 1.0.5 → 1.1.0

data/lib/vagrant-azure/action/stop_instance.rb

@@ -1,38 +1,42 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-
-# Barebones basic implemenation. This a work in progress in very early stages
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class StopInstance
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::stop_instance')
-        end
-
-        def call(env)
-          if env[:machine].state.id == :StoppedDeallocated
-            env[:ui].info(
-              I18n.t('vagrant_azure.already_status', :status => 'stopped.')
-            )
-          else
-            env[:machine].id =~ /@/
-            env[:ui].info(
-              I18n.t(
-                'vagrant_azure.stopping',
-                :vm_name => $`,
-                :cloud_service_name => $'
-              )
-            )
-            env[:azure_vm_service].shutdown_virtual_machine($`, $')
-          end
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+
+# Barebones basic implemenation. This a work in progress in very early stages
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class StopInstance
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::stop_instance')
+        end
+
+        def call(env)
+          if env[:machine].state.id == :StoppedDeallocated
+            env[:ui].info(
+              I18n.t('vagrant_azure.already_status', :status => 'stopped.')
+            )
+          else
+            env[:machine].id =~ /@/
+            VagrantPlugins::WinAzure::CLOUD_SERVICE_SEMAPHORE.synchronize do
+              env[:ui].info(
+                  I18n.t(
+                      'vagrant_azure.stopping',
+                      :vm_name => $`,
+                      :cloud_service_name => $'
+                  )
+              )
+              env[:azure_vm_service].shutdown_virtual_machine($`, $')
+            end
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/sync_folders.rb

@@ -1,63 +1,64 @@
-# Copyright (c) 2014 Mitchell Hashimoto
-# Under The MIT License (MIT)
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require "log4r"
-require "vagrant/util/subprocess"
-require "vagrant/util/scoped_hash_override"
-require "vagrant/util/which"
-require "#{Vagrant::source_root}/lib/vagrant/action/builtin/synced_folders"
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      # This middleware uses `rsync` to sync the folders
-      class SyncFolders < Vagrant::Action::Builtin::SyncedFolders
-        include Vagrant::Util::ScopedHashOverride
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_azure::action::sync_folders")
-        end
-
-        def call(env)
-          if env[:machine].config.vm.guest != :windows
-            super
-          else
-            @app.call(env)
-            env[:machine].config.vm.synced_folders.each do |id, data|
-              data = scoped_hash_override(data, :azure)
-
-              # Ignore disabled shared folders
-              next if data[:disabled]
-
-              hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-              guestpath = data[:guestpath]
-
-              env[:ui].info(I18n.t("vagrant_azure.copy_folder",
-                                  :hostpath => hostpath,
-                                  :guestpath => guestpath))
-
-              # Create the host path if it doesn't exist and option flag is set
-              if data[:create]
-                begin
-                  FileUtils::mkdir_p(hostpath)
-                rescue => err
-                  raise Errors::MkdirError,
-                    :hostpath => hostpath,
-                    :err => err
-                end
-              end
-
-              env[:machine].provider.driver.upload(hostpath, guestpath)
-
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
+# Copyright (c) 2014 Mitchell Hashimoto
+# Under The MIT License (MIT)
+#---------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require "log4r"
+require "vagrant/util/subprocess"
+require "vagrant/util/scoped_hash_override"
+require "vagrant/util/which"
+require "#{Vagrant::source_root}/lib/vagrant/action/builtin/synced_folders"
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      # This middleware uses `rsync` to sync the folders
+      class SyncFolders < Vagrant::Action::Builtin::SyncedFolders
+        include Vagrant::Util::ScopedHashOverride
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_azure::action::sync_folders")
+        end
+
+        def call(env)
+          if env[:machine].config.vm.guest != :windows
+            super
+          else
+            @app.call(env)
+            env[:machine].config.vm.synced_folders.each do |id, data|
+              data = scoped_hash_override(data, :azure)
+
+              # Ignore disabled shared folders
+              next if data[:disabled]
+
+              hostpath  = File.expand_path(data[:hostpath], env[:root_path])
+              guestpath = data[:guestpath]
+
+              env[:ui].info(I18n.t("vagrant_azure.copy_folder",
+                                  :hostpath => hostpath,
+                                  :guestpath => guestpath))
+
+              # Create the host path if it doesn't exist and option flag is set
+              if data[:create]
+                begin
+                  FileUtils::mkdir_p(hostpath)
+                rescue => err
+                  raise Errors::MkdirError,
+                    :hostpath => hostpath,
+                    :err => err
+                end
+              end
+
+              env[:machine].communicate.upload(hostpath, guestpath)
+
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/terminate_instance.rb

@@ -1,34 +1,34 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class TerminateInstance
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::terminate_instance')
-        end
-
-        def call(env)
-          env[:machine].id =~ /@/
-
-          vm = env[:azure_vm_service].get_virtual_machine($`, $')
-
-          if vm.nil?
-            # machine not found. assuming it was not created or destroyed
-            env[:ui].info (I18n.t('vagrant_azure.not_created'))
-          else
-            env[:azure_vm_service].delete_virtual_machine($`, $')
-            env[:machine].id = nil
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved. Licensed under the Apache 2.0 License.
+#--------------------------------------------------------------------------
+require 'log4r'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class TerminateInstance
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::terminate_instance')
+        end
+
+        def call(env)
+          env[:machine].id =~ /@/
+
+          vm = env[:azure_vm_service].get_virtual_machine($`, $')
+
+          if vm.nil?
+            # machine not found. assuming it was not created or destroyed
+            env[:ui].info (I18n.t('vagrant_azure.not_created'))
+          else
+            env[:azure_vm_service].delete_virtual_machine($`, $')
+            env[:machine].id = nil
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/vagrant_azure_service.rb

@@ -1,43 +1,44 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-# FIXME:
-# This is a stop gap arrangement until the azure ruby SDK fixes the exceptions
-# and gracefully fails.
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class VagrantAzureService
-        attr_reader :azure
-        def initialize(azure)
-          @azure = azure
-        end
-
-        # At times due to network latency the SDK raises SocketError, this can
-        # be rescued and re-try for three attempts.
-        def get_virtual_machine(*args)
-          vm = nil
-          attempt = 0
-          while true
-            begin
-              vm = azure.get_virtual_machine(*args)
-            rescue SocketError
-              attempt = attempt + 1
-              sleep 5
-              next if attempt < 3
-            end
-            break
-          end
-          vm
-        end
-
-        def method_missing(method, *args, &block)
-          azure.send(method, *args, &block)
-        end
-
-      end
-    end
-  end
-end
+#---------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+# FIXME:
+# This is a stop gap arrangement until the azure ruby SDK fixes the exceptions
+# and gracefully fails.
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class VagrantAzureService
+        attr_reader :azure
+        def initialize(azure)
+          @azure = azure
+        end
+
+        # At times due to network latency the SDK raises SocketError, this can
+        # be rescued and re-try for three attempts.
+        def get_virtual_machine(*args)
+          vm = nil
+          attempt = 0
+          while true
+            begin
+              vm = azure.get_virtual_machine(*args)
+            rescue SocketError
+              attempt = attempt + 1
+              sleep 5
+              next if attempt < 3
+            end
+            break
+          end
+          vm
+        end
+
+        def method_missing(method, *args, &block)
+          azure.send(method, *args, &block)
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/wait_for_communicate.rb

@@ -1,38 +1,39 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'timeout'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class WaitForCommunicate
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new("vagrant_azure::action::wait_for_communicate")
-        end
-
-        def call(env)
-
-          if !env[:interrupted]
-              # Wait for SSH to be ready.
-              env[:ui].info(I18n.t("vagrant_azure.waiting_for_ssh"))
-              while true
-                # If we're interrupted then just back out
-                break if env[:interrupted]
-                break if env[:machine].communicate.ready?
-                sleep 5
-              end
-
-            # Ready and booted!
-            env[:ui].info(I18n.t("vagrant_azure.ssh_ready"))
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'timeout'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class WaitForCommunicate
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::wait_for_communicate')
+        end
+
+        def call(env)
+
+          if !env[:interrupted]
+              # Wait for SSH to be ready.
+              env[:ui].info(I18n.t('vagrant_azure.waiting_for_comm'))
+              while true
+                # If we're interrupted then just back out
+                break if env[:interrupted]
+                break if env[:machine].communicate.ready?
+                sleep 5
+              end
+
+            # Ready and booted!
+            env[:ui].info(I18n.t('vagrant_azure.comm_ready'))
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/wait_for_state.rb

@@ -1,49 +1,50 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'timeout'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class WaitForState
-        def initialize(app, env, state)
-          @app = app
-          @state = state
-          @logger = Log4r::Logger.new("vagrant_azure::action::wait_for_state")
-        end
-
-        def call(env)
-          env[:result] = true
-
-          if env[:machine].state.id == @state
-            @logger.info(
-              I18n.t('vagrant_azure.already_status', :status => @state)
-            )
-          else
-            timeout = env[:machine].provider_config.state_read_timeout
-
-            env[:ui].info "Waiting for machine to reach state #{@state}"
-            @logger.info("Waiting for machine to reach state #{@state}")
-
-            begin
-              Timeout.timeout(timeout)  do
-                until env[:machine].state.id == @state
-                  sleep 30
-                end
-              end
-              env[:ui].success "Machine reached state #{@state}"
-            rescue Timeout::Error
-              env[:ui].error "Machine failed to reached state '#{@state}' in '#{timeout}' seconds."
-              env[:result] = false # couldn't reach state in time
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'timeout'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class WaitForState
+        def initialize(app, env, state)
+          @app = app
+          @state = state
+          @logger = Log4r::Logger.new("vagrant_azure::action::wait_for_state")
+        end
+
+        def call(env)
+          env[:result] = true
+
+          if env[:machine].state.id == @state
+            @logger.info(
+              I18n.t('vagrant_azure.already_status', :status => @state)
+            )
+          else
+            timeout = env[:machine].provider_config.state_read_timeout || env[:machine].config.vm.boot_timeout
+
+            env[:ui].info "Waiting for machine to reach state #{@state}"
+            @logger.info("Waiting for machine to reach state #{@state}")
+
+            begin
+              Timeout.timeout(timeout)  do
+                until env[:machine].state.id == @state
+                  sleep 30
+                end
+              end
+              env[:ui].success "Machine reached state #{@state}"
+            rescue Timeout::Error
+              env[:ui].error "Machine failed to reached state '#{@state}' in '#{timeout}' seconds."
+              env[:result] = false # couldn't reach state in time
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end