knife-rackspace 0.8.4 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +9 -9
  2. data/CHANGELOG.md +7 -0
  3. data/README.rdoc +2 -0
  4. data/knife-rackspace.gemspec +1 -1
  5. data/lib/chef/knife/rackspace_base.rb +8 -4
  6. data/lib/chef/knife/rackspace_server_create.rb +12 -1
  7. data/lib/knife-rackspace/version.rb +1 -1
  8. data/spec/cassettes/v1/should_list_images.yml +35 -35
  9. data/spec/cassettes/v1/should_list_server_flavors.yml +246 -248
  10. data/spec/cassettes/v2/should_list_images.yml +1269 -879
  11. data/spec/cassettes/v2/should_list_server_flavors.yml +1289 -287
  12. data/spec/integration/integration_spec.rb +19 -9
  13. data/spec/integration_spec_helper.rb +6 -4
  14. metadata +5 -5
data/spec/integration/integration_spec.rb CHANGED
@@ -8,6 +8,7 @@ require 'chef/knife/rackspace_server_create'
8
8
  describe api do
9
9
  before(:each) do
10
10
  Chef::Config[:knife][:rackspace_version] = api.to_s #v2 by default
11
+ Chef::Config[:knife][:rackspace_region] = :iad
11
12
 
12
13
  Chef::Knife::Bootstrap.any_instance.stub(:run)
13
14
  Chef::Knife::RackspaceServerCreate.any_instance.stub(:tcp_test_ssh).with(anything).and_return(true)
@@ -30,15 +31,24 @@ ID Name Architecture RAM Disk
30
31
  8 30GB server 64-bit 30720 1200 GB
31
32
  """,
32
33
  :v2 => """
33
- ID Name VCPUs RAM Disk
34
- 2 512MB Standard Instance 1 512 20 GB
35
- 3 1GB Standard Instance 1 1024 40 GB
36
- 4 2GB Standard Instance 2 2048 80 GB
37
- 5 4GB Standard Instance 2 4096 160 GB
38
- 6 8GB Standard Instance 4 8192 320 GB
39
- 7 15GB Standard Instance 6 15360 620 GB
40
- 8 30GB Standard Instance 8 30720 1200 GB
41
- """}
34
+ ID Name VCPUs RAM Disk
35
+ 2 512MB Standard Instance 1 512 20 GB
36
+ 3 1GB Standard Instance 1 1024 40 GB
37
+ 4 2GB Standard Instance 2 2048 80 GB
38
+ 5 4GB Standard Instance 2 4096 160 GB
39
+ 6 8GB Standard Instance 4 8192 320 GB
40
+ 7 15GB Standard Instance 6 15360 620 GB
41
+ 8 30GB Standard Instance 8 30720 1200 GB
42
+ performance1-1 1 GB Performance 1 1024 20 GB
43
+ performance1-2 2 GB Performance 2 2048 40 GB
44
+ performance1-4 4 GB Performance 4 4096 40 GB
45
+ performance1-8 8 GB Performance 8 8192 40 GB
46
+ performance2-120 120 GB Performance 32 122880 40 GB
47
+ performance2-15 15 GB Performance 4 15360 40 GB
48
+ performance2-30 30 GB Performance 8 30720 40 GB
49
+ performance2-60 60 GB Performance 16 61440 40 GB
50
+ performance2-90 90 GB Performance 24 92160 40 GB
51
+ """}
42
52
  stdout = ANSI.unansi stdout
43
53
  stdout.should match_output(expected_output[api])
44
54
  end
data/spec/integration_spec_helper.rb CHANGED
@@ -78,9 +78,11 @@ RSpec::Matchers.define :match_output do |expected_output|
78
78
  end
79
79
  # Nice when it works, but has ANSI::Diff has some bugs that prevent it from showing any output
80
80
  failure_message_for_should do |actual_output|
81
- puts clean_output(actual_output)
82
- puts
83
- puts expected_output
81
+ buffer = StringIO.new
82
+ buffer.puts clean_output(actual_output)
83
+ buffer.puts
84
+ buffer.puts expected_output
85
+ buffer.string
84
86
  # output = clean_output actual_output
85
87
  # ANSI::Diff.new(output, expected_output)
86
88
  end
@@ -131,4 +133,4 @@ ensure
131
133
  $stdin = old_stdin
132
134
  $VERBOSE = warn
133
135
  null.close
134
- end
136
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: knife-rackspace
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.4
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-11-14 00:00:00.000000000 Z
13
+ date: 2014-01-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: knife-windows
@@ -32,14 +32,14 @@ dependencies:
32
32
  requirements:
33
33
  - - ~>
34
34
  - !ruby/object:Gem::Version
35
- version: '1.12'
35
+ version: '1.16'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - ~>
41
41
  - !ruby/object:Gem::Version
42
- version: '1.12'
42
+ version: '1.16'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: chef
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
167
167
  version: '0'
168
168
  requirements: []
169
169
  rubyforge_project:
170
- rubygems_version: 2.0.5
170
+ rubygems_version: 2.2.1
171
171
  signing_key:
172
172
  specification_version: 4
173
173
  summary: Rackspace Support for Chef's Knife Command