vagrant-winrm-s 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmFlZjAxNDM2ZWQ2Y2U0ODI3YzNmZjY3NWMxMTBmNDJlNmY0MTA1Yw==
+    ZjkyOTQ1MTlmNGMzYmE1MThiMTIyNmQ4YTYyZGIyN2Y2YzczM2JhZg==
   data.tar.gz: !binary |-
-    NTQ5NGZjYTUzYTE0MDRjYjYzNDkzN2IwNWVhYmY2MDE5MjI4YTY4ZA==
+    ZWQ5NTZiNmRlZjFmOWJiNDhlNTI0YWRkZWEyYTA0Y2RiZjhmMTc0OA==
 SHA512:
   metadata.gz: !binary |-
-    MjQzOWQ3MGIzNjdhM2YxMTlhMGNlNDVkYTg2ZTgxYWJkZGNiMGM1ODg4MjRh
-    NDJmMzgzYmNiMzQxNDJiZWYyNTc0NzU0MDhiOTM2ZmRlNDQ5ZmIyNzAyMmUy
-    NTc0ZDE5ZWRiMjcwYTIxYTJlNTE2ODY5NTZiYTU1NDQ2OTIwNDc=
+    OTc3NjBkYmYyNWVkYzUwNDIzMDFlNDUzZjhjY2M2OTNkMGQ4YjI1MmFiMjli
+    NTNmZGQyMWIzMWU0OTA0ZjQzYmYwNjJkZDU4OGM2MGJmZjE2Njc2YzEwZDNh
+    NjVhZGVlMGFkOTJkYmYxOTI4YzAxNTU5NTQ3NGFlY2UyMzUzZWY=
   data.tar.gz: !binary |-
-    YjgxMzVjOWUwZTdlNTJjNzAwNzhiNTlmYTUzYmQzM2RmZjZjMzQ5NTg5Njkz
-    NzQ0ZGRmNWQwNTc2NTJkNTE4N2ZiNzZlMTFiNjljMmJhYjJjMDdkMGFlMjhm
-    N2ExNWI0OGIxMmMxZGRiODM3Y2MyN2ExNDA1YWQ1Mjk3ZTRkODE=
+    NTY3MzQyNTdjYjBmZWM3NWYxOWMxOGZjZGFjZjNlNTA0Zjk1ZWE5ZmZmYTU5
+    ZmQzYWFjOTVjYzVhYTVjMjAwZGUxMDYxZjEyNjVlMDIzMTZjY2NmMThlMmZm
+    NjQ0NmIwMDFlM2ZmMzJiMDkzMmI4MzBmZmMxNTczOTI2MGI0YTM=

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant-WinRM-S
 
-Note: This plugin is only compatible with vagrant <= 1.7.2. Future versions
+Note: This plugin is only compatible with vagrant >= 1.7.4. Future versions
 of Vagrant will provide this functionality natively.
 
 A Vagrant communicator that uses the `winrm-s` gem to communicate over winrm. Notably, allows for SSPI authentication of domain accounts when using a Windows host.
@@ -41,9 +41,11 @@ config.winrm.transport = :sspinegotiate
 ### What about the SSL transport?
 
 The `:ssl` transport is available and can be used to authenticate local accounts.
-However, the versions of `WinRM` and `HTTPClient` bundled with Vagrant make it
-difficult to ignore untrusted/self-signed certificates. But users with proper
-certificates should have no problem.
+Vagrant supports SSL with/without self-signed certs out of the box as of 1.7.3.
+`vagrant-winrm-s` is no longer necessary to use this transport.
+
+Just ensure you set `config.winrm.ssl_peer_verification` to false for self-signed
+certs.
 
 ## Setting up your server
 

data/changelog.md

@@ -1,3 +1,9 @@
+## 0.0.4
+
+* Really make it compatible with vagrant 1.7.4, which provides much of the
+  functionality we previously needed to out of the box, thanks to a newer
+  version of winrm gem.
+
 ## 0.0.3
 
 * Rev version of winrm-s that is being used to be compatible with Vagrant 1.7.4

data/lib/vagrant-winrm-s.rb

@@ -1,6 +1,5 @@
 require "vagrant-winrm-s/version"
 require "vagrant-winrm-s/plugin"
-require "vagrant-winrm-s/config"
 
 module VagrantPlugins
   module CommunicatorWinRM

data/lib/vagrant-winrm-s/communicator.rb

@@ -19,12 +19,9 @@ module VagrantPlugins
 
         WinRMSShell.new(
           winrm_info[:host],
-          @machine.config.winrm.username,
-          @machine.config.winrm.password,
-          transport: @machine.config.winrm.transport,
-          port: winrm_info[:port],
-          timeout_in_seconds: @machine.config.winrm.timeout,
-          max_tries: @machine.config.winrm.max_tries)
+          winrm_info[:port],
+          @machine.config.winrm
+        )
       end
 
     end

data/lib/vagrant-winrm-s/plugin.rb

@@ -20,11 +20,6 @@ module VagrantPlugins
         init!
         WinrmSCommunicator
       end
-
-      config("winrm") do
-        require_relative "config"
-        WinrmSConfig
-      end
     end
   end
 end

data/lib/vagrant-winrm-s/shell.rb

@@ -7,7 +7,7 @@ Vagrant::Util::SilenceWarnings.silence! do
   require "winrm-s"
 end
 
-require "vagrant/../../plugins/communicators/winrm/file_manager"
+require "winrm-fs/file_manager"
 require "vagrant/../../plugins/communicators/winrm/shell"
 
 module VagrantPlugins
@@ -15,45 +15,53 @@ module VagrantPlugins
     class WinRMSShell < WinRMShell
       include Vagrant::Util::Retryable
 
-      attr_reader :transport
-      attr_reader :protocol
-
-      def initialize(host, username, password, options = {})
-        super(host, username, password, options)
-
+      def initialize(host, port, options = {})
+        super(host, port, options)
         @logger = Log4r::Logger.new("vagrant::communication::winrmsshell")
-        @transport = options[:transport] || :plaintext
-        @protocol = (options[:transport] == :ssl) ? "https" : "http"
       end
 
       protected
 
+      def endpoint
+        case @config.transport.to_sym
+        when :ssl
+          "https://#{@host}:#{@port}/wsman"
+        when :plaintext
+          "http://#{@host}:#{@port}/wsman"
+        when :sspinegotiate
+          "http://#{@host}:#{@port}/wsman"
+        else
+          # rubocop:disable SignalException
+          # To match base vagrant style
+          raise Errors::WinRMInvalidTransport, transport: @config.transport
+          # rubocop:enable SignalException
+        end
+      end
+
+      # The only reason we're overriding this one is to get rid
+      # of `toggle_nori_type_casting` which is deprecated in new
+      # versions of winrm gem (and the deprecation message seems
+      # to have a bug that throws an exception)
       def new_session
         @logger.info("Attempting to connect to WinRM...")
         @logger.info("  - Host: #{@host}")
         @logger.info("  - Port: #{@port}")
         @logger.info("  - Username: #{@username}")
-        @logger.info("  - Transport: #{@transport}")
-        @logger.info("  - Endpoint: #{endpoint}")
+        @logger.info("  - Transport: #{@config.transport}")
 
-        client = ::WinRM::WinRMWebService.new(endpoint, @transport, endpoint_options)
-        client.set_timeout(@timeout_in_seconds)
-        client.toggle_nori_type_casting(:off)
+        client = ::WinRM::WinRMWebService.new(endpoint, @config.transport.to_sym, endpoint_options)
+        client.set_timeout(@config.timeout)
         client
       end
 
-      def endpoint
-        "#{@protocol}://#{@host}:#{@port}/wsman"
-      end
-
       def endpoint_options
         { user: @username,
           pass: @password,
           host: @host,
           port: @port,
-          operation_timeout: @timeout_in_seconds,
-          basic_auth_only: (@transport == :plaintext) }
+          basic_auth_only: (@config.transport == :plaintext),
+          no_ssl_peer_verification: !@config.ssl_peer_verification }
       end
-    end # WinShell class
+    end
   end
 end

data/lib/vagrant-winrm-s/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module CommunicatorWinRMS
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/vagrant-winrm-s.gemspec

@@ -19,9 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "winrm-s", "~>0.3.1"
-  spec.add_dependency "httpclient", "~>2.4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 2.99"
   spec.add_development_dependency "rubocop", "~> 0.28"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-winrm-s
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Norm MacLennan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm-s
@@ -24,34 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
-- !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.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +84,6 @@ files:
 - changelog.md
 - lib/vagrant-winrm-s.rb
 - lib/vagrant-winrm-s/communicator.rb
-- lib/vagrant-winrm-s/config.rb
 - lib/vagrant-winrm-s/plugin.rb
 - lib/vagrant-winrm-s/shell.rb
 - lib/vagrant-winrm-s/version.rb

data/lib/vagrant-winrm-s/config.rb

@@ -1,40 +0,0 @@
-require "vagrant/../../plugins/communicators/winrm/config"
-
-module VagrantPlugins
-  module CommunicatorWinRM
-    class WinrmSConfig < Config
-
-      attr_accessor :transport
-
-      def initialize
-        super
-        @transport = UNSET_VALUE
-      end
-
-      def finalize!
-        @username = "vagrant"   if @username == UNSET_VALUE
-        @password = "vagrant"   if @password == UNSET_VALUE
-        @host = nil             if @host == UNSET_VALUE
-        @port = 5985            if @port == UNSET_VALUE
-        @guest_port = 5985      if @guest_port == UNSET_VALUE
-        @max_tries = 20         if @max_tries == UNSET_VALUE
-        @timeout = 1800         if @timeout == UNSET_VALUE
-        @transport = :plaintext if @transport == UNSET_VALUE
-      end
-
-      def validate(_machine)
-        errors = []
-
-        errors << "winrm.username cannot be nil."   if @username.nil?
-        errors << "winrm.password cannot be nil."   if @password.nil?
-        errors << "winrm.port cannot be nil."       if @port.nil?
-        errors << "winrm.guest_port cannot be nil." if @guest_port.nil?
-        errors << "winrm.max_tries cannot be nil."  if @max_tries.nil?
-        errors << "winrm.timeout cannot be nil."    if @timeout.nil?
-        errors << "winrm.transport cannot be nil."  if @transport.nil?
-
-        { "WinRM" => errors }
-      end
-    end
-  end
-end