specinfra 2.64.0 → 2.65.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2bb804941b79318209f8ab29b2d903ac67504719
4
- data.tar.gz: 3d4017d83c0e2b2dd098d43d645ba984fdc84b2e
3
+ metadata.gz: c2fde9a2492a2cfe67cb836501170e6de579fadf
4
+ data.tar.gz: 0059a5a56ad42e5c06fd50994130146020438268
5
5
  SHA512:
6
- metadata.gz: a9bc30501ffa3cdf8946af6dd78fb2c578907fb614a3aa042dc33f6f2570f39c743ab105a10209dac29d6dfdd1c51901c80a826964f3253db09e89721554b49b
7
- data.tar.gz: 441bf4179f7018a365151fbfa088821568c28210a41929ad61aca1ec16cc6c656b959466b196fe58d6fa90575db44d89440c601e41cb7b3ebca9ebd3f3c3d367
6
+ metadata.gz: eaf784102030267287fd448d36a63a7997cd0ec2225cd81dfb269f110c19133471a39790fe7ca63047651a7cafc434d7900fe715dbe9ea47ce410e151cab46cb
7
+ data.tar.gz: 88e787ad3bf9cf6c9d06ae199db87f15d699ef20ed4a124410d03ee62ea3409deb3253403ead9ba319bd53e704d30ffc1458b2b2b5b7c55736fd42c473027d3e
data/appveyor.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  version: "{build}"
2
- image: Previous Visual Studio 2015
2
+ os: Windows Server 2012
3
3
 
4
4
  platform:
5
5
  - x64
@@ -11,18 +11,34 @@ module Specinfra
11
11
  script = create_script(cmd)
12
12
  winrm = get_config(:winrm)
13
13
 
14
- result = winrm.powershell(script)
15
- stdout, stderr = [:stdout, :stderr].map do |s|
16
- result[:data].select {|item| item.key? s}.map {|item| item[s]}.join
14
+ stdout, stderr = ''
15
+ exitcode = 0
16
+
17
+ if Gem.loaded_specs['winrm'].version < Gem::Version.create('2.0')
18
+ # Use winrm V1 API
19
+ result = winrm.powershell(script)
20
+ stdout, stderr = [:stdout, :stderr].map do |s|
21
+ result[:data].select {|item| item.key? s}.map {|item| item[s]}.join
22
+ end
23
+ exitcode = result[:exitcode]
24
+ else
25
+ # Use winrm V2 API
26
+ winrm.shell(:powershell) do |shell|
27
+ result = shell.run(script)
28
+ stdout = result.stdout.to_s
29
+ stderr = result.stderr.to_s
30
+ exitcode = result.exitcode
31
+ end
17
32
  end
18
- result[:exitcode] = 1 if result[:exitcode] == 0 and !stderr.empty?
33
+
34
+ exitcode = 1 if exitcode == 0 and !stderr.empty?
19
35
 
20
36
  if @example
21
37
  @example.metadata[:command] = script
22
38
  @example.metadata[:stdout] = stdout + stderr
23
39
  end
24
40
 
25
- CommandResult.new :stdout => stdout, :stderr => stderr, :exit_status => result[:exitcode]
41
+ CommandResult.new :stdout => stdout, :stderr => stderr, :exit_status => exitcode
26
42
  end
27
43
  end
28
44
  end
@@ -1,3 +1,3 @@
1
1
  module Specinfra
2
- VERSION = "2.64.0"
2
+ VERSION = "2.65.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: specinfra
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.64.0
4
+ version: 2.65.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gosuke Miyashita
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-29 00:00:00.000000000 Z
11
+ date: 2016-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-scp