vagrant-azure 1.0.5 → 1.1.0

data/lib/vagrant-azure/version.rb

@@ -1,10 +1,11 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-
-module VagrantPlugins
-  module WinAzure
-    VERSION = '1.0.5'
-  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.
+#--------------------------------------------------------------------------
+
+module VagrantPlugins
+  module WinAzure
+    VERSION = '1.1.0'
+  end
+end

data/locales/en.yml

@@ -1,37 +1,37 @@
-en:
-  vagrant_azure:
-    not_created: |-
-      The machine does not exist. Please run `vagrant up` first.
-    will_not_destroy: |-
-      The machine '%{name}' will not be destroyed as the user declined confirmation.
-    already_status: |-
-      The machine is already %{status}.
-    stopping: |-
-      Stopping '%{vm_name}' in '%{cloud_service_name}'
-    rdp_not_ready: |-
-      RDP not ready
-    vm_started: |-
-      VM '%{name}' has been started
-    vm_stopped: |-
-      VM '%{name}' has been stopped
-    copy_folder: |-
-      Copying folder: %{hostpath} ==>
-      %{guestpath}
-    rsync_not_found_warning: |-
-      Warning! Folder sync disabled because the rsync binary is missing in the %{side}.
-      Make sure rsync is installed and the binary can be found in the PATH.
-    waiting_for_ssh: |-
-      Waiting for SSH
-    ssh_ready: |-
-      SSH Ready
-    read_attempt: |-
-     Failed to connect to Virtual Machine. Re-Connecting %{attempt}
-    errors:
-      win_rm_not_ready: |-
-        Vagrant failed to communicate to the VM using powershell. The operation failed
-        with the following message.
-        %{message}
-      server_not_created: |-
-        Server not created. Error is: %{message}
-      create_vm_failure: |-
-        There was some error in creating the VM.
+en:
+  vagrant_azure:
+    not_created: |-
+      The machine does not exist. Please run `vagrant up` first.
+    will_not_destroy: |-
+      The machine '%{name}' will not be destroyed as the user declined confirmation.
+    already_status: |-
+      The machine is already %{status}.
+    stopping: |-
+      Stopping '%{vm_name}' in '%{cloud_service_name}'
+    rdp_not_ready: |-
+      RDP not ready
+    vm_started: |-
+      VM '%{name}' has been started
+    vm_stopped: |-
+      VM '%{name}' has been stopped
+    copy_folder: |-
+      Copying folder: %{hostpath} ==>
+      %{guestpath}
+    rsync_not_found_warning: |-
+      Warning! Folder sync disabled because the rsync binary is missing in the %{side}.
+      Make sure rsync is installed and the binary can be found in the PATH.
+    waiting_for_comm: |-
+      Waiting for Communication
+    comm_ready: |-
+      Communication is Ready
+    read_attempt: |-
+     Failed to connect to Virtual Machine. Re-Connecting %{attempt}
+    errors:
+      win_rm_not_ready: |-
+        Vagrant failed to communicate to the VM using powershell. The operation failed
+        with the following message.
+        %{message}
+      server_not_created: |-
+        Server not created. Error is: %{message}
+      create_vm_failure: |-
+        There was some error in creating the VM.

data/templates/provisioners/chef-solo/solo.erb

@@ -1,51 +1,51 @@
-require 'chef/version_constraint'
-
-<% if node_name %>
-node_name "<%= node_name %>"
-<% end %>
-file_cache_path    "<%= file_cache_path %>"
-file_backup_path   "<%= file_backup_path %>"
-cookbook_path <%= cookbooks_path.inspect %>
-<% if roles_path %>
-if Chef::VersionConstraint.new("< 11.8.0").include?(Chef::VERSION)
-  role_path <%= roles_path.first.inspect %>
-else
-  role_path <%= roles_path.inspect %>
-end
-<% end %>
-log_level <%= log_level.inspect %>
-verbose_logging    <%= verbose_logging.inspect %>
-
-encrypted_data_bag_secret <%= encrypted_data_bag_secret.inspect %>
-
-<% if data_bags_path -%>
-data_bag_path <%= data_bags_path.inspect %>
-<% end %>
-
-<% if recipe_url -%>
-recipe_url "<%= recipe_url %>"
-<% end -%>
-
-<% if environments_path %>
-environment_path <%= environments_path.inspect %>
-<% end -%>
-
-<% if environment %>
-environment "<%= environment %>"
-<% end -%>
-
-http_proxy <%= http_proxy.inspect %>
-http_proxy_user <%= http_proxy_user.inspect %>
-http_proxy_pass <%= http_proxy_pass.inspect %>
-https_proxy <%= https_proxy.inspect %>
-https_proxy_user <%= https_proxy_user.inspect %>
-https_proxy_pass <%= https_proxy_pass.inspect %>
-no_proxy <%= no_proxy.inspect %>
-
-<% if formatter %>
-add_formatter "<%= formatter %>"
-<% end %>
-
-<% if custom_configuration -%>
-Chef::Config.from_file "<%= custom_configuration %>"
-<% end -%>
+require 'chef/version_constraint'
+
+<% if node_name %>
+node_name "<%= node_name %>"
+<% end %>
+file_cache_path    "<%= file_cache_path %>"
+file_backup_path   "<%= file_backup_path %>"
+cookbook_path <%= cookbooks_path.inspect %>
+<% if roles_path %>
+if Chef::VersionConstraint.new("< 11.8.0").include?(Chef::VERSION)
+  role_path <%= roles_path.first.inspect %>
+else
+  role_path <%= roles_path.inspect %>
+end
+<% end %>
+log_level <%= log_level.inspect %>
+verbose_logging    <%= verbose_logging.inspect %>
+
+encrypted_data_bag_secret <%= encrypted_data_bag_secret.inspect %>
+
+<% if data_bags_path -%>
+data_bag_path <%= data_bags_path.inspect %>
+<% end %>
+
+<% if recipe_url -%>
+recipe_url "<%= recipe_url %>"
+<% end -%>
+
+<% if environments_path %>
+environment_path <%= environments_path.inspect %>
+<% end -%>
+
+<% if environment %>
+environment "<%= environment %>"
+<% end -%>
+
+http_proxy <%= http_proxy.inspect %>
+http_proxy_user <%= http_proxy_user.inspect %>
+http_proxy_pass <%= http_proxy_pass.inspect %>
+https_proxy <%= https_proxy.inspect %>
+https_proxy_user <%= https_proxy_user.inspect %>
+https_proxy_pass <%= https_proxy_pass.inspect %>
+no_proxy <%= no_proxy.inspect %>
+
+<% if formatter %>
+add_formatter "<%= formatter %>"
+<% end %>
+
+<% if custom_configuration -%>
+Chef::Config.from_file "<%= custom_configuration %>"
+<% end -%>

data/vagrant-azure.gemspec

@@ -1,58 +1,59 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant-azure/version'
-
-Gem::Specification.new do |s|
-  s.name          = "vagrant-azure"
-  s.version       = VagrantPlugins::WinAzure::VERSION
-  s.authors       = ["MSOpenTech"]
-  s.description   = "Enable Vagrant to manage machines in Azure"
-  s.summary       = "Enable Vagrant to manage machines in Azure"
-  s.homepage      = "https://github.com/MSOpenTech/vagrant-azure"
-  s.license       = "Apache 2.0"
-
-  s.require_paths = ["lib"]
-
- # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  s.files         = unignored_files
-  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-
-  s.add_runtime_dependency "azure", "0.6.3"
-
-  s.add_development_dependency "bundler", "~> 1.3"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "minitest-reporters"
-  s.add_development_dependency "mocha"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vagrant-azure/version'
+
+Gem::Specification.new do |s|
+  s.name          = "vagrant-azure"
+  s.version       = VagrantPlugins::WinAzure::VERSION
+  s.authors       = ["MSOpenTech"]
+  s.description   = "Enable Vagrant to manage machines in Azure"
+  s.summary       = "Enable Vagrant to manage machines in Azure"
+  s.homepage      = "https://github.com/MSOpenTech/vagrant-azure"
+  s.license       = "Apache 2.0"
+
+  s.require_paths = ["lib"]
+
+ # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # Note that the entire gitignore(5) syntax is not supported, specifically
+  # the "!" syntax, but it should mostly work correctly.
+  root_path      = File.dirname(__FILE__)
+  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, ".gitignore")
+  gitignore      = File.readlines(gitignore_path)
+  gitignore.map!    { |line| line.chomp.strip }
+  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
+
+  unignored_files = all_files.reject do |file|
+    # Ignore any directories, the gemspec only cares about files
+    next true if File.directory?(file)
+
+    # Ignore any paths that match anything in the gitignore. We do
+    # two tests here:
+    #
+    #   - First, test to see if the entire path matches the gitignore.
+    #   - Second, match if the basename does, this makes it so that things
+    #     like '.DS_Store' will match sub-directories too (same behavior
+    #     as git).
+    #
+    gitignore.any? do |ignore|
+      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+    end
+  end
+
+  s.files         = unignored_files
+  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
+
+  s.add_runtime_dependency "azure", "0.6.4"
+  s.add_runtime_dependency "httpclient", "2.4.0"
+
+  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest-reporters"
+  s.add_development_dependency "mocha"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - MSOpenTech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure
@@ -16,82 +16,96 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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: minitest
   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: minitest-reporters
   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: mocha
   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'
 description: Enable Vagrant to manage machines in Azure
@@ -100,16 +114,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
 - dummy.box
-- example_box/metadata.json
 - example_box/README.md
-- Gemfile
+- example_box/metadata.json
+- lib/vagrant-azure.rb
+- lib/vagrant-azure/action.rb
 - lib/vagrant-azure/action/connect_azure.rb
+- lib/vagrant-azure/action/os_type.rb
+- lib/vagrant-azure/action/powershell_run.rb
 - lib/vagrant-azure/action/provision.rb
 - lib/vagrant-azure/action/rdp.rb
 - lib/vagrant-azure/action/read_ssh_info.rb
 - lib/vagrant-azure/action/read_state.rb
+- lib/vagrant-azure/action/read_winrm_info.rb
 - lib/vagrant-azure/action/restart_vm.rb
 - lib/vagrant-azure/action/run_instance.rb
 - lib/vagrant-azure/action/start_instance.rb
@@ -119,36 +142,22 @@ files:
 - lib/vagrant-azure/action/vagrant_azure_service.rb
 - lib/vagrant-azure/action/wait_for_communicate.rb
 - lib/vagrant-azure/action/wait_for_state.rb
-- lib/vagrant-azure/action.rb
-- lib/vagrant-azure/command/rdp/command.rb
-- lib/vagrant-azure/communication/powershell.rb
+- lib/vagrant-azure/capabilities/winrm.rb
+- lib/vagrant-azure/command/powershell.rb
+- lib/vagrant-azure/command/rdp.rb
 - lib/vagrant-azure/config.rb
 - lib/vagrant-azure/driver.rb
 - lib/vagrant-azure/errors.rb
-- lib/vagrant-azure/monkey_patch/machine.rb
+- lib/vagrant-azure/monkey_patch/azure.rb
+- lib/vagrant-azure/monkey_patch/winrm.rb
 - lib/vagrant-azure/plugin.rb
 - lib/vagrant-azure/provider.rb
 - lib/vagrant-azure/provisioner/chef-solo.rb
 - lib/vagrant-azure/provisioner/puppet.rb
-- lib/vagrant-azure/provisioner/shell.rb
-- lib/vagrant-azure/scripts/check_winrm.ps1
-- lib/vagrant-azure/scripts/export_vm.ps1
-- lib/vagrant-azure/scripts/file_sync.ps1
-- lib/vagrant-azure/scripts/host_info.ps1
-- lib/vagrant-azure/scripts/hyperv_manager.ps1
-- lib/vagrant-azure/scripts/run_in_remote.ps1
-- lib/vagrant-azure/scripts/upload_file.ps1
-- lib/vagrant-azure/scripts/utils/create_session.ps1
-- lib/vagrant-azure/scripts/utils/write_messages.ps1
 - lib/vagrant-azure/version.rb
-- lib/vagrant-azure.rb
-- LICENSE
 - locales/en.yml
-- Rakefile
-- README.md
 - templates/provisioners/chef-solo/solo.erb
 - vagrant-azure.gemspec
-- .gitignore
 homepage: https://github.com/MSOpenTech/vagrant-azure
 licenses:
 - Apache 2.0
@@ -159,18 +168,19 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enable Vagrant to manage machines in Azure
 test_files: []
+has_rdoc: