WinRM V2

.gitignore

@@ -4,8 +4,7 @@ pkg/*
 .rvmrc
 .idea
 .bundle
-spec/spec/creds*.json
-spec/config.yml
+tests/integration/config.yml
 traces/
 Gemfile.lock
-.vagrant
+.vagrant

.rubocop.yml

@@ -1,22 +1,26 @@
 AllCops:
   Exclude:
     - 'appveyor.yml'
+    - 'Vagrantfile'
     - 'scripts/**/*'
-    - 'lib/winrm/winrm_service.rb'
-    - 'lib/winrm/http/transport.rb'
 
 Style/Encoding:
   Enabled: true
 
+Style/NumericLiterals:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 100
 
 Metrics/MethodLength:
   Max: 20
 
+ModuleLength:
+  Max: 250
+
 ClassLength:
   Max: 250
 
 Metrics/AbcSize:
   Max: 25
-

.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
 before_install:

Gemfile

@@ -1,9 +1,3 @@
 # encoding: UTF-8
 source 'https://rubygems.org'
 gemspec
-
-group :development do
-  # Use a tighter specification until rubocop issues are fixed.
-  # Then remove this
-  gem 'rubocop', '~> 0.28.0'
-end

Rakefile

@@ -17,16 +17,14 @@ task :console do
 end
 
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = 'spec/*_spec.rb'
-  task.rspec_opts = ['--color', '-f documentation']
-  task.rspec_opts << '-tunit'
+  task.pattern = 'tests/spec/**/*_spec.rb'
+  task.rspec_opts = ['--color', '-f documentation', '-r ./tests/spec/spec_helper']
 end
 
 # Run the integration test suite
 RSpec::Core::RakeTask.new(:integration) do |task|
-  task.pattern = 'spec/*_spec.rb'
-  task.rspec_opts = ['--color', '-f documentation']
-  task.rspec_opts << '-tintegration'
+  task.pattern = 'tests/integration/*_spec.rb'
+  task.rspec_opts = ['--color', '-f documentation', '-r ./tests/integration/spec_helper']
 end
 
 RuboCop::RakeTask.new

Vagrantfile

@@ -1,9 +1,6 @@
-# encoding: UTF-8
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-VAGRANTFILE_API_VERSION = '2'
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'mwrock/Windows2012R2'
+Vagrant.configure("2") do |config|
+  config.vm.box = "mwrock/WindowsNano"
 end

WinrmAppveyor.psm1

@@ -1,5 +1,5 @@
 function New-ClientCertificate {
-  param([String]$username, [String]$basePath = ((Resolve-Parh .).Path))
+  param([String]$username, [String]$basePath = ((Resolve-Path .).Path))
 
   $env:OPENSSL_CONF=[System.IO.Path]::GetTempFileName()
 
@@ -24,7 +24,7 @@ function New-ClientCertificate {
 
 function New-WinrmUserCertificateMapping {
   param([String]$issuer)
-  $secure_pass = ConvertTo-SecureString $env:winrm_pass -AsPlainText -Force
+  $secure_pass = ConvertTo-SecureString $env:winrm_password -AsPlainText -Force
   $cred = New-Object System.Management.Automation.PSCredential ($env:winrm_user, $secure_pass)
   New-Item -Path WSMan:\localhost\ClientCertificate -Subject "$env:winrm_user@localhost" -URI * -Issuer $issuer -Credential $cred -Force
 }

appveyor.yml

@@ -6,7 +6,7 @@ platform:
 
 environment:
   winrm_user: test_user
-  winrm_pass: Pass@word1
+  winrm_password: Pass@word1
   user_cert: c:\projects\winrm\user.pem
   user_key: c:\projects\winrm\key.pem
 
@@ -21,7 +21,7 @@ branches:
     - master
 
 install:
-  - ps: net user /add $env:winrm_user $env:winrm_pass
+  - ps: net user /add $env:winrm_user $env:winrm_password
   - ps: net localgroup administrators $env:winrm_user /add
   - ps: $env:PATH="C:\OpenSSL-Win64\bin;$env:PATH"
   - ps: Import-Module c:\projects\winrm\WinrmAppveyor.psm1

lib/winrm.rb

@@ -14,9 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'date'
 require 'logging'
 require_relative 'winrm/version'
+require_relative 'winrm/connection'
+require_relative 'winrm/exceptions'
 
 # Main WinRM module entry point
 module WinRM
@@ -36,7 +37,3 @@ module WinRM
     end
   end
 end
-
-require 'winrm/output'
-require 'winrm/helpers/iso8601_duration'
-require 'winrm/soap_provider'