knife-windows 0.5.14.rc.1 → 0.5.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -149,14 +149,18 @@ class Chef
149
149
  # we have to run the remote commands in 2047 char chunks
150
150
  create_bootstrap_bat_command do |command_chunk, chunk_num|
151
151
  begin
152
- run_command("cmd.exe /C echo \"Rendering #{bootstrap_bat_file} chunk #{chunk_num}\" && #{command_chunk}")
152
+ render_command_result = run_command("cmd.exe /C echo \"Rendering #{bootstrap_bat_file} chunk #{chunk_num}\" && #{command_chunk}")
153
+ ui.error("Batch render command returned #{render_command_result}") if render_command_result != 0
154
+ render_command_result
153
155
  rescue SystemExit => e
154
156
  raise unless e.success?
155
157
  end
156
158
  end
157
159
 
158
160
  # execute the bootstrap.bat file
159
- run_command(bootstrap_command)
161
+ bootstrap_command_result = run_command(bootstrap_command)
162
+ ui.error("Bootstrap command returned #{bootstrap_command_result}") if bootstrap_command_result != 0
163
+ bootstrap_command_result
160
164
  end
161
165
 
162
166
  def bootstrap_command
@@ -53,6 +53,12 @@ class Chef
53
53
  :description => "The ssh port",
54
54
  :default => "22",
55
55
  :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
56
+
57
+ option :ssh_gateway,
58
+ :short => "-G GATEWAY",
59
+ :long => "--ssh-gateway GATEWAY",
60
+ :description => "The ssh gateway",
61
+ :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
56
62
 
57
63
  option :identity_file,
58
64
  :short => "-i IDENTITY_FILE",
@@ -75,6 +81,7 @@ class Chef
75
81
  ssh.config[:ssh_user] = locate_config_value(:ssh_user)
76
82
  ssh.config[:ssh_password] = locate_config_value(:ssh_password)
77
83
  ssh.config[:ssh_port] = locate_config_value(:ssh_port)
84
+ ssh.config[:ssh_gateway] = locate_config_value(:ssh_gateway)
78
85
  ssh.config[:identity_file] = config[:identity_file]
79
86
  ssh.config[:manual] = true
80
87
  ssh.config[:host_key_verify] = config[:host_key_verify]
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module Windows
3
- VERSION = "0.5.14.rc.1"
3
+ VERSION = "0.5.14"
4
4
  MAJOR, MINOR, TINY = VERSION.split('.')
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-windows
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.14.rc.1
5
- prerelease: 7
4
+ version: 0.5.14
5
+ prerelease:
6
6
  platform: ruby
7
7
  authors:
8
8
  - Seth Chisamore
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-11-04 00:00:00.000000000 Z
12
+ date: 2013-11-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: em-winrm
@@ -77,9 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
77
77
  required_rubygems_version: !ruby/object:Gem::Requirement
78
78
  none: false
79
79
  requirements:
80
- - - ! '>'
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
- version: 1.3.1
82
+ version: '0'
83
83
  requirements: []
84
84
  rubyforge_project:
85
85
  rubygems_version: 1.8.23