vagrant-winrm 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njk3N2M1M2U5ZGNjNzM0NDg5YWJmNDhmZjllNDU5ZmY4Mzg4NWI0Nw==
+    ZTU3YTE1ZWZjZGM0YTg5NTYwNTRjYjc4NzJlYmMxMDA4YTAyMDM2YQ==
   data.tar.gz: !binary |-
-    Mzc5MTZlYThlNjk3YWE0NWQ4MzcwMTcxYjBlYTc2MTRmNDExY2ExMA==
+    MTY1NjQwNmZhOWM2MzMwN2ZiYzlhOTkyNTliNjViMjVmNDMyMTI2Yg==
 SHA512:
   metadata.gz: !binary |-
-    OTQ4MDU2MjAwODY1ZGNjNmVmMGI3YTllMjkwYjkzNzZhZDkwNjEzZGIyN2M5
-    NmQwOWJmZGIzNjdlYmVhZDhlYjk4NWNlYjlmODk2NmQwNDE1OGIwZmQ1ZTFk
-    MTBjOWQ1ZmRiZTNlMzcxMTJlNDA3YWZhYzliNWRhYmQzMTI0NDI=
+    MTUwY2I3MTliMWZiYzg3NTAzODVhMjQwYWNmNjQ3NDEzM2FkMDllN2YzYmE1
+    NzYwZmRhN2U0ZmJkZDg0MjU1NzI5MGRiYzI5YmU2ZjAwZWI0N2I5ZjFlZjA4
+    OWIyMmNhNjBkM2VjM2Q0ZmM0NDU4YWRjM2ZlNmQ1NmE4ODY1NDE=
   data.tar.gz: !binary |-
-    OTcyZmIwZmE3Zjc0ODc4YzVhMGRjMzY2ZWY2MTVmOGQ2OTNjOTA2YTAwZjU0
-    NmYxYzkyOTVhNzA2YmJhZjNmODNmMTRlZGViYzg4MjM0YWU3ZTc2ODQwZjc0
-    YjVjMGU3NDRkZGRhNjBlZDg1ZjQwZjVhMjYwMTJlNWI1YTNhMDk=
+    OTZhZjZhMjNiNDA3OGE4M2MyOTY4ODJhMGYzYWM1MmQ3NDY5MzYyMmUxMTZj
+    ZGJlYjdmNjljMDg2MGIxYTZmZjA3MDgyOWMxYTgzYzcwZjU0MjY3ZmYwMjYx
+    NDY4NWYwZmI4Njg0N2Q1YjQyZGYzMjcwZjc3OWYxOTA0ZWMzMzI=

data/lib/vagrant-winrm/commands/winrm_config.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'vagrant/util/safe_puts'
+require 'vagrant/../../plugins/communicators/winrm/helper'
 
 module VagrantPlugins
   module VagrantWinRM
@@ -30,8 +31,8 @@ module VagrantPlugins
 
           variables = {
             host_key: options[:host] || machine.name || 'vagrant',
-            winrm_host: machine.config.winrm.host,
-            winrm_port: machine.config.winrm.port,
+            winrm_host: VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)[:host],
+            winrm_port: VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)[:port],
             winrm_user: machine.config.winrm.username,
             winrm_password: machine.config.winrm.password
           }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantWinRM
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,39 @@ require './lib/vagrant-winrm/commands/winrm.rb'
 require './lib/vagrant-winrm/commands/winrm_config.rb'
 require './lib/vagrant-winrm/commands/winrm_upload.rb'
 
+def mock_env
+  let(:idx) { double('idx') }
+  let(:communicator) { double('communicator') }
+  let(:winrm_config) {
+    double('winrm_config', host: 'winrm_super_host', port: 32424, username: 'usern@me', password: 'p4ssw0rd').tap do |config|
+      allow(config).to receive(:[]) { |key| config.send(key) }
+    end
+  }
+  let(:config_vm) { double('config_vm', communicator: :winrm) }
+  let(:machine_config) { double('machine_config', winrm: winrm_config, vm: config_vm) }
+
+  let(:provider) {
+    double('provider', to_sym: :virtualbox).tap do |provider|
+      allow(provider).to receive(:capability?).and_return(true)
+      allow(provider).to receive(:capability).with(:winrm_info).and_return(winrm_config)
+    end
+  }
+
+  let(:machine) {
+    double(
+      'machine',
+      config: machine_config,
+      name: 'vagrant',
+      provider: provider,
+      config: machine_config,
+      communicate: communicator,
+      ui: double('ui', opts: {}),
+      state: nil
+    )
+  }
+  let(:env) { double('env', root_path: '', home_path: '', ui_class: '', machine_names: [machine.name], active_machines: [machine], machine_index: idx, default_provider: provider) }
+end
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

data/spec/vagrant-winrm/commands/winrm_config_spec.rb

@@ -6,22 +6,7 @@ describe VagrantPlugins::VagrantWinRM::WinRMConfig, :unit => true do
 =begin ############
 # Here we mock!
 =end ##############
-
-  let(:idx) { double('idx') }
-  let(:winrm_config) { double('winrm_config', host: 'winrm_super_host', port: 32424, username: 'usern@me', password: 'p4ssw0rd') }
-  let(:machine_config) { double('machine_config', winrm: winrm_config) }
-  let(:machine) {
-    double(
-      'machine',
-      config: machine_config,
-      name: 'vagrant',
-      provider: 'virtualbox',
-      config: machine_config,
-      ui: double('ui', opts: {}),
-      state: nil
-    )
-  }
-  let(:env) { double('env', root_path: '', home_path: '', ui_class: '', machine_names: [machine.name], active_machines: [machine], machine_index: idx, default_provider: 'virtualbox') }
+  mock_env
 
   before do
     # Mock the local env creation

data/spec/vagrant-winrm/commands/winrm_spec.rb

@@ -6,13 +6,7 @@ describe VagrantPlugins::VagrantWinRM::WinRM, :unit => true do
 =begin ############
 # Here we mock!
 =end ##############
-
-  let(:idx) { double('idx') }
-  let(:communicator) { double('communicator') }
-  let(:config_vm) { double('config_vm', communicator: :winrm) }
-  let(:machine_config) { double('machine_config', vm: config_vm) }
-  let(:machine) { double('machine', config: machine_config, name: 'vagrant', provider: 'virtualbox', config: machine_config, communicate: communicator, ui: double('ui', opts: {})) }
-  let(:env) { double('env', root_path: '', home_path: '', ui_class: '', machine_names: [machine.name], active_machines: [machine], machine_index: idx, default_provider: 'virtualbox') }
+  mock_env
 
   before do
     # Mock the local env creation

data/spec/vagrant-winrm/commands/winrm_upload_spec.rb

@@ -6,13 +6,7 @@ describe VagrantPlugins::VagrantWinRM::WinRMUpload, :unit => true do
 =begin ############
 # Here we mock!
 =end ##############
-
-  let(:idx) { double('idx') }
-  let(:communicator) { double('communicator') }
-  let(:config_vm) { double('config_vm', communicator: :winrm) }
-  let(:machine_config) { double('machine_config', vm: config_vm) }
-  let(:machine) { double('machine', config: machine_config, name: 'vagrant', provider: 'virtualbox', config: machine_config, communicate: communicator, state:nil, ui: double('ui', opts: {})) }
-  let(:env) { double('env', root_path: '', home_path: '', ui_class: '', machine_names: [machine.name], active_machines: [machine], machine_index: idx, default_provider: 'virtualbox') }
+  mock_env
 
   before do
     # Mock the local env creation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-winrm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Baptiste Courtois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar