specinfra 2.64.0 → 2.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb804941b79318209f8ab29b2d903ac67504719
-  data.tar.gz: 3d4017d83c0e2b2dd098d43d645ba984fdc84b2e
+  metadata.gz: c2fde9a2492a2cfe67cb836501170e6de579fadf
+  data.tar.gz: 0059a5a56ad42e5c06fd50994130146020438268
 SHA512:
-  metadata.gz: a9bc30501ffa3cdf8946af6dd78fb2c578907fb614a3aa042dc33f6f2570f39c743ab105a10209dac29d6dfdd1c51901c80a826964f3253db09e89721554b49b
-  data.tar.gz: 441bf4179f7018a365151fbfa088821568c28210a41929ad61aca1ec16cc6c656b959466b196fe58d6fa90575db44d89440c601e41cb7b3ebca9ebd3f3c3d367
+  metadata.gz: eaf784102030267287fd448d36a63a7997cd0ec2225cd81dfb269f110c19133471a39790fe7ca63047651a7cafc434d7900fe715dbe9ea47ce410e151cab46cb
+  data.tar.gz: 88e787ad3bf9cf6c9d06ae199db87f15d699ef20ed4a124410d03ee62ea3409deb3253403ead9ba319bd53e704d30ffc1458b2b2b5b7c55736fd42c473027d3e

data/appveyor.yml

@@ -1,5 +1,5 @@
 version: "{build}"
-image: Previous Visual Studio 2015
+os: Windows Server 2012
 
 platform:
   - x64

data/lib/specinfra/backend/winrm.rb

@@ -11,18 +11,34 @@ module Specinfra
         script = create_script(cmd)
         winrm = get_config(:winrm)
 
-        result = winrm.powershell(script)
-        stdout, stderr = [:stdout, :stderr].map do |s|
-          result[:data].select {|item| item.key? s}.map {|item| item[s]}.join
+        stdout, stderr = ''
+        exitcode = 0
+
+        if Gem.loaded_specs['winrm'].version < Gem::Version.create('2.0')
+          # Use winrm V1 API
+          result = winrm.powershell(script)
+          stdout, stderr = [:stdout, :stderr].map do |s|
+            result[:data].select {|item| item.key? s}.map {|item| item[s]}.join
+          end
+          exitcode = result[:exitcode]
+        else
+          # Use winrm V2 API
+          winrm.shell(:powershell) do |shell|
+            result = shell.run(script)
+            stdout = result.stdout.to_s
+            stderr = result.stderr.to_s
+            exitcode = result.exitcode
+          end
         end
-        result[:exitcode] = 1 if result[:exitcode] == 0 and !stderr.empty?
+
+        exitcode = 1 if exitcode == 0 and !stderr.empty?
 
         if @example
           @example.metadata[:command] = script
           @example.metadata[:stdout]  = stdout + stderr
         end
 
-        CommandResult.new :stdout => stdout, :stderr => stderr, :exit_status => result[:exitcode]
+        CommandResult.new :stdout => stdout, :stderr => stderr, :exit_status => exitcode
       end
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.64.0"
+  VERSION = "2.65.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.64.0
+  version: 2.65.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp