lbspec 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_development_dependency "bundler", "~> 1.5"
22
22
  spec.add_development_dependency "rake"
23
- spec.add_development_dependency "rspec"
24
23
  spec.add_development_dependency "rubocop"
25
24
  spec.add_development_dependency "coveralls"
26
25
  spec.add_development_dependency "debugger"
@@ -39,17 +39,35 @@ RSpec::Matchers.define :transfer do |nodes|
39
39
  .exec_command("echo #{prove} | nc #{addr} #{port}", @request_node)
40
40
  end
41
41
  @http_request_command = lambda do |addr, port, path, prove|
42
- opt = @options[:timeout] ? " -m #{@options[:timeout]}" : ''
42
+ env, opt = '', ''
43
+ opt << (@options[:timeout] ? " -m #{@options[:timeout]}" : '')
44
+ opt << (@options[:proxy] ? %Q(-x "#{@options[:proxy]}") : '')
45
+ if @options[:noproxy]
46
+ opt << %Q( --noproxy "#{@options[:noproxy]}")
47
+ env << %Q( no_proxy="#{@options[:noproxy]}")
48
+ env << %Q( NO_PROXY="#{@options[:noproxy]}")
49
+ end
50
+ opt << (@options[:header] ? %Q(-H '#{@options[:header]}') : '')
43
51
  uri = 'http://' + "#{addr}:#{port}#{path}?#{prove}"
44
52
  Lbspec::Util
45
- .exec_command("curl -o /dev/null -s #{opt} #{uri}", @request_node)
53
+ .exec_command(%Q(#{env} curl -o /dev/null -s #{opt} '#{uri}'),
54
+ @request_node)
46
55
  end
47
56
  @https_request_command = lambda do |addr, port, path, prove|
48
- opt = @options[:timeout] ? " -m #{@options[:timeout]}" : ''
57
+ env, opt = '', ''
58
+ opt << (@options[:timeout] ? " -m #{@options[:timeout]}" : '')
49
59
  opt << (@options[:ignore_valid_ssl] ? ' -k' : '')
60
+ opt << (@options[:proxy] ? %Q( -x "#{@options[:proxy]}") : '')
61
+ if @options[:noproxy]
62
+ opt << %Q( --noproxy "#{@options[:noproxy]}")
63
+ env << %Q( no_proxy="#{@options[:noproxy]}")
64
+ env << %Q( NO_PROXY="#{@options[:noproxy]}")
65
+ end
66
+ opt << (@options[:header] ? %Q( -H '#{@options[:header]}') : '')
50
67
  uri = 'https://' + "#{addr}:#{port}#{path}?#{prove}"
51
68
  Lbspec::Util
52
- .exec_command("curl -o /dev/null -sk #{opt} #{uri}", @request_node)
69
+ .exec_command(%Q(#{env} curl -o /dev/null -s #{opt} '#{uri}'),
70
+ @request_node)
53
71
  end
54
72
 
55
73
  @result = false
@@ -20,7 +20,7 @@ module Lbspec
20
20
  ssh.exec!(command)
21
21
  end
22
22
  else
23
- system(command)
23
+ `#{command}`
24
24
  end
25
25
  end
26
26
  end
@@ -1,5 +1,5 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  # Lbspec is an RSpec plugin for easy Loadbalancer testing.
3
3
  module Lbspec
4
- VERSION = '0.1.0'
4
+ VERSION = '0.1.1'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lbspec
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-03-22 00:00:00.000000000 Z
12
+ date: 2014-03-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -43,22 +43,6 @@ dependencies:
43
43
  - - ! '>='
44
44
  - !ruby/object:Gem::Version
45
45
  version: '0'
46
- - !ruby/object:Gem::Dependency
47
- name: rspec
48
- requirement: !ruby/object:Gem::Requirement
49
- none: false
50
- requirements:
51
- - - ! '>='
52
- - !ruby/object:Gem::Version
53
- version: '0'
54
- type: :development
55
- prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
46
  - !ruby/object:Gem::Dependency
63
47
  name: rubocop
64
48
  requirement: !ruby/object:Gem::Requirement
@@ -200,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
200
184
  version: '0'
201
185
  segments:
202
186
  - 0
203
- hash: -1732435815710576022
187
+ hash: -194371314246007915
204
188
  required_rubygems_version: !ruby/object:Gem::Requirement
205
189
  none: false
206
190
  requirements:
@@ -209,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
209
193
  version: '0'
210
194
  segments:
211
195
  - 0
212
- hash: -1732435815710576022
196
+ hash: -194371314246007915
213
197
  requirements: []
214
198
  rubyforge_project:
215
199
  rubygems_version: 1.8.21